diff --git a/Chart.yaml b/Chart.yaml index 35eab55..a033d32 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,9 +1,9 @@ --- apiVersion: v2 name: zabbix -version: 3.1.1 +version: 3.1.2 # LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy -appVersion: 6.0.7 +appVersion: 6.0.8 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 diff --git a/README.md b/README.md index a44f3ba..b871b3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Helm Chart For Zabbix. -[![CircleCI](https://circleci.com/gh/cetic/helm-zabbix.svg?style=svg)](https://circleci.com/gh/cetic/helm-zabbix/tree/master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/helm-zabbix.svg?label=release) ![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) +[![CircleCI](https://circleci.com/gh/cetic/helm-zabbix.svg?style=svg)](https://circleci.com/gh/cetic/helm-zabbix/tree/master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/helm-zabbix.svg?label=release) ![Version: 3.1.2](https://img.shields.io/badge/Version-3.1.2-informational?style=flat-square) Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics. @@ -375,7 +375,7 @@ The following tables lists the configurable parameters of the chart and their de | route.hostName | string | `"chart-example.local"` | Host Name for the route. Can be left empty | | route.tls | object | `{"termination":"edge"}` | Openshift Route TLS settings | | tolerations | list | `[]` | Tolerations configurations | -| zabbix_image_tag | string | `"ubuntu-6.0.7"` | Zabbix components (server, agent, web frontend, ...) image tag to use. This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities. But by default this helm chart will install the latest LTS version (example: 6.0.x). See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page When you want use a non-LTS version (example: 6.2.x), you have to set this yourself. You can change version here or overwrite in each component (example: zabbixserver.image.tag, etc). | +| zabbix_image_tag | string | `"ubuntu-6.0.8"` | Zabbix components (server, agent, web frontend, ...) image tag to use. This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities. But by default this helm chart will install the latest LTS version (example: 6.0.x). See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page When you want use a non-LTS version (example: 6.2.x), you have to set this yourself. You can change version here or overwrite in each component (example: zabbixserver.image.tag, etc). | | zabbixagent.ZBX_ACTIVE_ALLOW | bool | `true` | This variable is boolean (true or false) and enables or disables feature of active checks | | zabbixagent.ZBX_JAVAGATEWAY_ENABLE | bool | `false` | The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false. | | zabbixagent.ZBX_PASSIVESERVERS | string | `"127.0.0.1"` | The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. | @@ -406,6 +406,7 @@ The following tables lists the configurable parameters of the chart and their de | zabbixproxy.extraEnv | list | `[]` | Extra environment variables. A list of additional environment variables. See example: https://github.com/cetic/helm-zabbix/blob/master/docs/example/kind/values.yaml | | zabbixproxy.extraInitContainers | list | `[]` | additional init containers to start within the zabbix proxy pod | | zabbixproxy.extraPodSpecs | object | `{}` | additional specifications to the zabbix proxy pod | +| zabbixproxy.extraVolumeClaimTemplate | list | `[]` | extra volumeClaimTemplate for zabbixproxy statefulset | | zabbixproxy.extraVolumeMounts | list | `[]` | additional volumeMounts to the zabbix proxy container | | zabbixproxy.extraVolumes | list | `[]` | additional volumes to make available to the zabbix proxy pod | | zabbixproxy.image.pullPolicy | string | `"IfNotPresent"` | Pull policy of Docker image | diff --git a/docs/example/kind/values.yaml b/docs/example/kind/values.yaml index 9ebd2b8..b717ce5 100644 --- a/docs/example/kind/values.yaml +++ b/docs/example/kind/values.yaml @@ -1,6 +1,6 @@ # Custom values for zabbix. -zabbix_image_tag: alpine-6.2.0 +zabbix_image_tag: alpine-6.2.2 db_access: # central place for all database related parameters (db name, host, user, password) in one secret diff --git a/templates/statefulset-zabbix-proxy.yaml b/templates/statefulset-zabbix-proxy.yaml index 547832b..a06d5cc 100644 --- a/templates/statefulset-zabbix-proxy.yaml +++ b/templates/statefulset-zabbix-proxy.yaml @@ -147,4 +147,8 @@ spec: volumes: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.zabbixproxy.extraVolumeClaimTemplate }} + volumeClaimTemplates: + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} diff --git a/values.yaml b/values.yaml index eac1474..7c422c5 100644 --- a/values.yaml +++ b/values.yaml @@ -8,7 +8,7 @@ #See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page #When you want use a non-LTS version (example: 6.2.x), you have to set this yourself. You can change version #here or overwrite in each component (example: zabbixserver.image.tag, etc). -zabbix_image_tag: ubuntu-6.0.7 +zabbix_image_tag: ubuntu-6.0.8 # **Zabbix DB access / credentials** configurations # with this dict, you can set unified DB access credentials, IP and so on for both Zabbix server and Zabbix web frontend @@ -191,7 +191,6 @@ zabbixproxy: # ZBX_DEBUGLEVEL: 4 # The variable is used to specify timeout for processing checks. By default, value is 4. #ZBX_TIMEOUT: 4 - # -- The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false. ZBX_JAVAGATEWAY_ENABLE: false # -- Cache size @@ -218,6 +217,8 @@ zabbixproxy: extraVolumes: [] # -- additional specifications to the zabbix proxy pod extraPodSpecs: {} + # -- extra volumeClaimTemplate for zabbixproxy statefulset + extraVolumeClaimTemplate: [] # **Zabbix Agent** configurations zabbixagent: