Merge pull request #82 from aeciopires/aeciopires-some-adjusts

Fix bugs and many improvements

charts/zabbix/Chart.yaml

@@ -1,9 +1,9 @@
 ---
 apiVersion: v2 # Don't change this
 name: zabbix
-version: 4.2.2 # helm chart version
+version: 4.3.0 # helm chart version
 # LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
-appVersion: 6.0.28 # zabbix version
+appVersion: 6.0.27 # zabbix version
 description: Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics.
 keywords:
   - zabbix

charts/zabbix/Makefile

@@ -5,8 +5,8 @@
 #---------------------------
 
 URL=https://github.com/zabbix-community/helm-zabbix/
-HELM_IMAGE=alpine/helm:3.14.0
-HELM_DOCS_IMAGE=jnorwood/helm-docs:v1.12.0
+HELM_IMAGE=alpine/helm:3.14.3
+HELM_DOCS_IMAGE=jnorwood/helm-docs:v1.13.1
 KNOWN_TARGETS=helm
 
 #----------------------------------------------------------------------------------------------------------

charts/zabbix/README.md.gotmpl

@@ -1,6 +1,7 @@
 # Helm chart for Zabbix.
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) {{ template "chart.versionBadge" . }} [![Download All Releases](https://img.shields.io/github/downloads/zabbix-community/helm-zabbix/total.svg)]()
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) {{ template "chart.versionBadge" . }} [![Downloads](https://img.shields.io/github/downloads/zabbix-community/helm-zabbix/total?label=Downloads%20All%20Releases
+)](https://tooomm.github.io/github-release-stats/?username=zabbix-community&repository=helm-zabbix)
 
 
 {{ template "chart.description" . }}
@@ -43,7 +44,7 @@ helm search repo zabbix-community/zabbix -l
 Set the helm chart version you want to use. Example:
 
 ```bash
-export ZABBIX_CHART_VERSION='4.1.0'
+export ZABBIX_CHART_VERSION='4.3.0'
 ```
 
 Export default values of ``zabbix`` chart to ``$HOME/zabbix_values.yaml`` file:

charts/zabbix/artifacthub-pkg.yml

@@ -5,13 +5,13 @@
 # https://github.com/kedacore/external-scalers/blob/main/artifacthub/azure-cosmos-db/0.1.0/artifacthub-pkg.yml
 # https://artifacthub.io/packages/keda-scaler/keda-official-external-scalers/external-scaler-azure-cosmos-db?modal=install
 
-version: 4.2.2 # helm chart version
+version: 4.3.0 # helm chart version
 # LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
 appVersion: 6.0.27 # zabbix version
 name: zabbix
 category: monitoring, networking, metrics
 displayName: Zabbix - The Enterprise-Class Open Source Network Monitoring Solution
-createdAt: 2023-08-06T23:46:30Z # Command Linux: date +%Y-%m-%dT%TZ
+createdAt: 2024-03-23T20:38:35Z # Command Linux: date +%Y-%m-%dT%TZ
 description: Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics.
 logoURL: https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png
 license: Apache-2.0
@@ -53,7 +53,7 @@ install: |
   Set the helm chart version you want to use. Example:
 
   ```bash
-  export ZABBIX_CHART_VERSION='4.1.0'
+  export ZABBIX_CHART_VERSION='4.3.0'
   ```
 
   Export default values of ``zabbix`` chart to ``$HOME/zabbix_values.yaml`` file:

charts/zabbix/docs/requirements.md

@@ -57,7 +57,7 @@ Simple shell function for Kubectl installation in Linux 64 bits. Copy and paste
 ```bash
 sudo su
 
-VERSION=v1.29.1
+VERSION=v1.29.3
 KUBECTL_BIN=kubectl
 
 function install_kubectl {
@@ -94,7 +94,7 @@ https://github.com/peelmicro/learn-devops-the-complete-kubernetes-course
 Run the following commands to install ``helm-docs``.
 
 ```bash
-HELM_DOCS_VERSION=1.12.0
+HELM_DOCS_VERSION=1.13.1
 HELM_DOCS_PACKAGE=helm-docs_``$HELM_DOCS_VERSION``_Linux_x86_64.tar.gz
 
 cd /tmp
@@ -121,7 +121,7 @@ Execute these commands to install helm.
 ```bash
 sudo su
 
-HELM_TAR_FILE=helm-v3.14.0-linux-amd64.tar.gz
+HELM_TAR_FILE=helm-v3.14.3-linux-amd64.tar.gz
 HELM_URL=https://get.helm.sh
 HELM_BIN=helm3
 

charts/zabbix/templates/clusterrole-binding.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.rbac.create -}}
+# Copied and adapted from:
+# https://git.zabbix.com/projects/ZT/repos/kubernetes-helm/browse/templates/clusterrole-binding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "zabbix.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "zabbix.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "zabbix.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end -}}

charts/zabbix/templates/clusterrole.yaml

@@ -0,0 +1,54 @@
+{{- if .Values.rbac.create }}
+# Copied and adapted from:
+# https://git.zabbix.com/projects/ZT/repos/kubernetes-helm/browse/templates/cluster-role.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ template "zabbix.fullname" . }}
+  labels:
+    {{- include "zabbix.labels" . | nindent 4 }}
+rules:
+  - nonResourceURLs:
+      - "/metrics"
+      - "/metrics/cadvisor"
+      - "/version"
+      - "/healthz"
+      - "/readyz"
+    verbs: ["get"]
+  - apiGroups: [""]
+    resources:
+      - nodes/metrics
+      - nodes/spec
+      - nodes/proxy
+      - nodes/stats
+    verbs: ["get"]
+  - apiGroups: [""]
+    resources:
+      - namespaces
+      - pods
+      - services
+      - componentstatuses
+      - nodes
+      - endpoints
+      - events
+    verbs: ["get", "list"]
+  - apiGroups: ["batch"]
+    resources:
+      - jobs
+      - cronjobs
+    verbs: ["get", "list"]
+  - apiGroups: ["extensions"]
+    resources:
+      - deployments
+      - daemonsets
+    verbs: ["get", "list"]
+  - apiGroups: ["apps"]
+    resources:
+      - statefulsets
+      - deployments
+      - daemonsets
+    verbs: ["get", "list"]
+{{- if .Values.rbac.additionalRulesForClusterRole }}
+{{ toYaml .Values.rbac.additionalRulesForClusterRole | indent 0 }}
+{{- end }}
+{{- end }}

charts/zabbix/templates/daemonset-zabbix-agent.yaml

@@ -75,21 +75,18 @@ spec:
             - name: zabbix-agent
               containerPort: 10050
               protocol: TCP
-          startupProbe:
-            tcpSocket:
-              port: zabbix-agent
-            initialDelaySeconds: 15
-            periodSeconds: 5
-            timeoutSeconds: 3
-            failureThreshold: 5
-            successThreshold: 1
+          {{- with .Values.zabbixAgent.livenessProbe }}
           livenessProbe:
-            tcpSocket:
-              port: zabbix-agent
-            timeoutSeconds: 3
-            failureThreshold: 3
-            periodSeconds: 10
-            successThreshold: 1
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.zabbixAgent.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.zabbixAgent.startupProbe }}
+          startupProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.zabbixAgent.securityContext | nindent 12 }}
           env: