Merge "Add ability to set the domain name in the Nagios chart"

nagios/templates/deployment.yaml

@@ -109,6 +109,10 @@ spec:
               mountPath: /tmp
             - name: nagios-confd
               mountPath: /opt/nagios/etc/conf.d
+          env:
+{{- if .Values.pod.env }}
+{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env | indent 12 }}
+{{- end }}
       containers:
         - name: apache-proxy
 {{ tuple $envAll "apache_proxy" | include "helm-toolkit.snippets.image" | indent 10 }}
@@ -161,6 +165,9 @@ spec:
             initialDelaySeconds: 60
             periodSeconds: 30
           env:
+{{- if .Values.pod.env }}
+{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env | indent 12 }}
+{{- end }}
             - name: SNMP_NOTIF_PRIMARY_TARGET_WITH_PORT
               value: {{ $envAll.Values.conf.nagios.notification.snmp.primary_target }}
             - name: SNMP_NOTIF_SECONDARY_TARGET_WITH_PORT

nagios/values.yaml

@@ -238,6 +238,14 @@ pod:
     termination_grace_period:
       nagios:
         timeout: 30
+  #env:
+  #
+  # NOTE(megheisler): This value can be used to hold
+  # the domain name. Functionality has been added in
+  # plugins to append the domain to the host name in
+  # the nagios dashboard
+  #
+  #  NODE_DOMAIN:
   replicas:
     nagios: 1
   resources: