Add zabbix to FADI

Chart.yaml

@@ -1,6 +1,6 @@
 name: fadi
-version: 0.1.21
-appVersion: 0.1.21
+version: 0.1.22
+appVersion: 0.1.22
 description: FADI is a Cloud Native platform for Big Data based on mature open source tools. 
 keywords:
   - fadi

README.md

@@ -62,7 +62,7 @@ Each requirement is configured with the options provided by that Chart. Please c
 | `minio.enabled`                                                             | Enable [Minio](https://github.com/helm/charts/tree/master/stable/minio)                                            | `true`                          |
 | `grafana.enabled`                                                           | Enable [Grafana](https://github.com/helm/charts/tree/master/stable/grafana)                                        | `true`                          |
 | `jupyterhub.enabled`                                                        | Enable [JupyterHub](https://github.com/jupyterhub/helm-chart)                                                      | `true`                          |
-| `nifi.enabled`                                                              | Enable [Nifi](https://github.com/cetic/helm-nifi)                                                                  | `true`                          |                          |
+| `nifi.enabled`                                                              | Enable [Nifi](https://github.com/cetic/helm-nifi)                                                                  | `true`                          | 
 | `openldap.enabled`                                                          | Enable [Openldap](https://github.com/helm/charts/tree/master/stable/openldap)                                      | `true`                          |
 | `phpldapadmin.enabled`                                                      | Enable [PhpLDAPadmin](https://github.com/cetic/helm-phpLDAPadmin)                                                  | `true`                          |
 | `kafka.enabled`                                                             | Enable [Kafka](https://github.com/helm/charts/tree/master/incubator/kafka)                                         | `false`                         |
@@ -75,8 +75,10 @@ Each requirement is configured with the options provided by that Chart. Please c
 | `tsaas.enabled`                                                             | Enable [Tsimulus-saas](https://github.com/cetic/helm-tsimulus-saas)                                                | `false`                         |
 | `swaggerui.enabled`                                                         | Enable [Swaggerui](https://github.com/cetic/helm-swagger-ui)                                                       | `false`                         |
 | `node-red.enabled`                                                          | Enable [Node-red](https://github.com/helm/charts/tree/master/stable/node-red)                                      | `false`                         |
-| `adminer.enabled`                                                           | Enable [Adminer](https://github.com/cetic/helm-adminer)                                                            | `true`                         |
-| `mlflow.enabled`                                                           | Enable [MLFlow](https://github.com/cetic/helm-mlflow)                                                            | `false`                         |
+| `adminer.enabled`                                                           | Enable [Adminer](https://github.com/cetic/helm-adminer)                                                            | `true`                          |
+| `mlflow.enabled`                                                            | Enable [MLFlow](https://github.com/cetic/helm-mlflow)                                                              | `false`                         |
+| `zabbix.enabled`                                                            | Enable [Zabbix](https://github.com/cetic/helm-zabbix)                                                              | `false`                         |
+
 ## Contributing
 
 Feel free to contribute by making a [pull request](https://github.com/cetic/helm-fadi/pull/new/master).

requirements.yaml

@@ -84,3 +84,7 @@ dependencies:
   version: ~1.4.0
   repository: https://cetic.github.io/helm-charts/
   condition: mlflow.enabled
+- name: zabbix
+  version: ~0.1.2
+  repository: https://cetic.github.io/helm-charts/
+  condition: zabbix.enabled

templates/NOTES.txt

@@ -318,6 +318,30 @@ Kibana can be accessed:
   echo "swagger-ui URL: http://127.0.0.1:8080"
   kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "swagger-ui.fullname" . }} 8080:{{ .Values.service.port }}
 {{- end }}
+
+{{- if .Values.zabbix.enabled }}
+|*Zabbix*|
+
+1. Get the application URL by running these commands:
+{{- if .Values.zabbix.zabbixweb.ingress.enabled }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ if $.Values.ingress.host }}{{.Values.ingress.host}}{{else}}your-cluster-ip{{end}}{{ $.Values.ingress.path }}
+  {{if not $.Values.ingress.host}}
+{{- end }}
+{{- else if contains "NodePort" .Values.zabbix.zabbixweb.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services zabbix-web)
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w zabbix-web'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} zabbix-web -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.zabbix.zabbixweb.service.port }}
+{{- else if contains "ClusterIP" .Values.zabbix.zabbixweb.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name=zabbix-web,app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:80
+{{- end }}
+{{- end }}
 {{- end }}
 
 CONGRATULATIONS! FADI is being installed.

values.yaml

@@ -385,3 +385,29 @@ adminer:
 mlflow:
   enabled: false
   backend_store_uri: "postgresql://admin:[email protected]:5432"
+
+zabbix:
+  enabled: false
+  postgresql:
+    enabled: false
+  zabbixServer:
+    DB_SERVER_HOST: "fadi-postgresql"
+    POSTGRES_USER: "admin"
+    POSTGRES_PASSWORD: "password1"
+    POSTGRES_DB: "postgres"
+  zabbixagent:
+    enabled: true
+    ZBX_SERVER_HOST: 127.0.01
+    ZBX_SERVER_PORT: 10051
+    ZBX_PASSIVE_ALLOW: true
+    ZBX_PASSIVESERVERS: 127.0.0.1
+    ZBX_ACTIVE_ALLOW: true
+  zabbixweb:
+    enabled: true
+    ZBX_SERVER_HOST: zabbix-server
+    ZBX_SERVER_PORT: 10051
+    DB_SERVER_HOST: fadi-postgresql
+    DB_SERVER_PORT: 5432
+    POSTGRES_USER: admin
+    POSTGRES_PASSWORD: password1
+    POSTGRES_DB: postgres