Add DB_SERVER_PORT parameter

zabbix-community · Sep 30, 2021 · ee7285c · ee7285c
1 parent dfb5906
commit ee7285c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -208,6 +208,7 @@ The following tables lists the configurable parameters of the chart and their de
 | zabbixproxy.service.port | int | `10051` | Port to expose service |
 | zabbixproxy.service.type | string | `"ClusterIP"` | Type of service for Zabbix proxy |
 | zabbixserver.DB_SERVER_HOST | string | `"zabbix-postgresql"` | Address of database host |
+| zabbixserver.DB_SERVER_PORT | string | `"5432"` | Port of database host |
 | zabbixserver.POSTGRES_DB | string | `"zabbix"` | Name of database |
 | zabbixserver.POSTGRES_PASSWORD | string | `"zabbix_pwd"` | Password of database |
 | zabbixserver.POSTGRES_USER | string | `"zabbix"` | User of database |

diff --git a/docs/example/minikube/values.yaml b/docs/example/minikube/values.yaml
@@ -9,6 +9,7 @@ zabbixserver:
     tag: ubuntu-5.4.5
     pullPolicy: IfNotPresent
   DB_SERVER_HOST: "zabbix-postgresql"
+  DB_SERVER_PORT: "5432"
   POSTGRES_USER: "zabbix"
   POSTGRES_PASSWORD: zabbix
   POSTGRES_DB: "zabbix"

diff --git a/templates/StatefulSet-zabbix-proxy.yaml b/templates/StatefulSet-zabbix-proxy.yaml
@@ -36,7 +36,7 @@ spec:
           imagePullPolicy: {{ .Values.zabbixagent.image.pullPolicy }}
           env:
             - name: ZBX_HOSTNAME
-              value: {{ .Values.zabbixagent.ZBX_HOSTNAME }}
+              value: {{ .Values.zabbixagent.ZBX_HOSTNAME | quote }}
             - name: ZBX_SERVER_HOST
               value: {{ .Values.zabbixagent.ZBX_SERVER_HOST | quote }}
             - name: ZBX_SERVER_PORT
@@ -52,9 +52,9 @@ spec:
             - name: ZBX_DEBUGLEVEL
               value: {{ .Values.zabbixagent.ZBX_DEBUGLEVEL | quote }}
             - name: ZBX_TIMEOUT
-              value: {{ .Values.zabbixagent.ZBX_TIMEOUT }}
+              value: {{ .Values.zabbixagent.ZBX_TIMEOUT | quote }}
             - name: ZBX_LOADMODULE
-              value: {{ .Values.zabbixagent.ZBX_LOADMODULE }}
+              value: {{ .Values.zabbixagent.ZBX_LOADMODULE | quote }}
 {{- range $item := .Values.zabbixagent.extraEnv }}
             - name: {{ $item.name }}
               value: {{ $item.value }}
@@ -81,13 +81,13 @@ spec:
             - name: ZBX_SERVER_PORT
               value: {{ .Values.zabbixproxy.ZBX_SERVER_PORT | quote }}
             - name: ZBX_LOADMODULE
-              value: {{ .Values.zabbixproxy.ZBX_LOADMODULE }}
+              value: {{ .Values.zabbixproxy.ZBX_LOADMODULE | quote }}
             - name: ZBX_DEBUGLEVEL
               value: {{ .Values.zabbixproxy.ZBX_DEBUGLEVEL | quote }}
             - name: ZBX_TIMEOUT
-              value: {{ .Values.zabbixproxy.ZBX_TIMEOUT }}
+              value: {{ .Values.zabbixproxy.ZBX_TIMEOUT | quote }}
             - name: ZBX_JAVAGATEWAY_ENABLE
-              value: {{ .Values.zabbixproxy.ZBX_VMWARECACHESIZE }}
+              value: {{ .Values.zabbixproxy.ZBX_VMWARECACHESIZE | quote }}
 {{- range $item := .Values.zabbixproxy.extraEnv }}
             - name: {{ $item.name }}
               value: {{ $item.value }}

diff --git a/templates/StatefulSet-zabbix-server.yaml b/templates/StatefulSet-zabbix-server.yaml
@@ -48,13 +48,15 @@ spec:
               {{- end}}
           env:
             - name: DB_SERVER_HOST
-              value: {{ .Values.zabbixserver.DB_SERVER_HOST }}
+              value: {{ .Values.zabbixserver.DB_SERVER_HOST | quote }}
+            - name: DB_SERVER_PORT
+              value: {{ .Values.zabbixserver.DB_SERVER_PORT | quote }}
             - name: POSTGRES_USER
-              value: {{ .Values.zabbixserver.POSTGRES_USER }}
+              value: {{ .Values.zabbixserver.POSTGRES_USER | quote }}
             - name: POSTGRES_PASSWORD
-              value: {{ .Values.zabbixserver.POSTGRES_PASSWORD }}
+              value: {{ .Values.zabbixserver.POSTGRES_PASSWORD | quote }}
             - name: POSTGRES_DB
-              value: {{ .Values.zabbixserver.POSTGRES_DB }}
+              value: {{ .Values.zabbixserver.POSTGRES_DB | quote }}
 {{- range $item := .Values.zabbixserver.extraEnv }}
             - name: {{ $item.name }}
               value: {{ $item.value }}
@@ -69,7 +71,7 @@ spec:
           imagePullPolicy: {{ .Values.zabbixagent.image.pullPolicy }}
           env:
             - name: ZBX_HOSTNAME
-              value: {{ .Values.zabbixagent.ZBX_HOSTNAME }}
+              value: {{ .Values.zabbixagent.ZBX_HOSTNAME | quote }}
             - name: ZBX_SERVER_HOST
               value: {{ .Values.zabbixagent.ZBX_SERVER_HOST | quote }}
             - name: ZBX_SERVER_PORT
@@ -85,7 +87,7 @@ spec:
             - name: ZBX_DEBUGLEVEL
               value: {{ .Values.zabbixagent.ZBX_DEBUGLEVEL | quote }}
             - name: ZBX_TIMEOUT
-              value: {{ .Values.zabbixagent.ZBX_TIMEOUT }}
+              value: {{ .Values.zabbixagent.ZBX_TIMEOUT | quote }}
             - name: ZBX_LOADMODULE
               value: {{ .Values.zabbixagent.ZBX_LOADMODULE }}
 {{- range $item := .Values.zabbixagent.extraEnv }}

diff --git a/templates/Web-deployment.yaml b/templates/Web-deployment.yaml
@@ -45,11 +45,11 @@ spec:
           - name: POSTGRES_PASSWORD
             value: {{ .Values.zabbixweb.POSTGRES_PASSWORD | quote }}
           - name: POSTGRES_DB
-            value: {{ .Values.zabbixweb.POSTGRES_DB }}
+            value: {{ .Values.zabbixweb.POSTGRES_DB | quote }}
           # - name: POSTGRES_USER_FILE
-          #  value: value: {{ .Values.zabbixweb.POSTGRES_USER_FILE }}
+          #  value: value: {{ .Values.zabbixweb.POSTGRES_USER_FILE | quote }}
           #- name: POSTGRES_PASSWORD_FILE
-          #  value: value: {{ .Values.zabbixweb.POSTGRES_PASSWORD_FILE }}
+          #  value: value: {{ .Values.zabbixweb.POSTGRES_PASSWORD_FILE | quote }}
 {{- range $item := .Values.zabbixweb.extraEnv }}
           - name: {{ $item.name }}
             value: {{ $item.value }}

diff --git a/values.yaml b/values.yaml
@@ -22,6 +22,8 @@ zabbixserver:
     pullSecrets: []
   # -- Address of database host
   DB_SERVER_HOST: "zabbix-postgresql"
+  # -- Port of database host
+  DB_SERVER_PORT: "5432"
   # -- User of database
   POSTGRES_USER: "zabbix"
   # -- Password of database