Feature/add probes

charts/icinga-stack/charts/icinga2/templates/statefulset.yaml

@@ -49,6 +49,24 @@ spec:
               mountPath: /etc/icinga2
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              scheme: HTTPS
+              path: /v1
+              port: {{ .Values.service.port }}
+              httpHeaders:
+                - name: Authorization
+                  value: Basic {{ printf "%s:%s" "icingaweb" .Values.global.api.users.icingaweb.password | b64enc }}
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTPS
+              path: /v1
+              port: {{ .Values.service.port }}
+              httpHeaders:
+                - name: Authorization
+                  value: Basic {{ printf "%s:%s" "icingaweb" .Values.global.api.users.icingaweb.password | b64enc }}
       initContainers:
         - name: {{ .Chart.Name }}-bootstrapper
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -122,4 +140,4 @@ spec:
           matchExpressions:
             {{- toYaml .Values.persistence.matchExpressions | nindent 12 }}
         {{- end }}
-  {{- end }}
+  {{- end }}

charts/icinga-stack/charts/icingaweb2/templates/_icingaweb-config.tpl

@@ -22,10 +22,8 @@
   value: {{ .Values.auth.resource | default .Values.global.databases.icingaweb2.database | quote }}
 - name: "icingaweb.passwords.icingaweb2.{{ .Values.auth.admin_user}}"
   value: {{ $auth_admin_password | quote }}
-- name: icingaweb.config.global.config_backend
-  value: {{ .Values.auth.resource | default .Values.global.databases.icingaweb2.database | quote }}
 - name: icingaweb.config.global.config_resource
-  value: {{ .Values.auth.type | quote }}
+  value: {{ .Values.auth.resource | default .Values.global.databases.icingaweb2.database | quote }}
 - name: icingaweb.groups.icingaweb2.backend
   value: {{ .Values.auth.type | quote }}
 - name: icingaweb.groups.icingaweb2.resource

charts/icinga-stack/charts/icingaweb2/templates/deployment.yaml

@@ -45,7 +45,19 @@ spec:
               mountPath: /data
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-        {{- if .Values.modules.director.enabled }}      
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              scheme: HTTP
+              path: /img/favicon.png
+              port: {{ .Values.service.port }}
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTP
+              path: /img/favicon.png
+              port: {{ .Values.service.port }}
+        {{- if .Values.modules.director.enabled }}
         - name: {{ .Chart.Name }}-director
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}

charts/icinga-stack/charts/icingaweb2/values.yaml

@@ -32,6 +32,7 @@ ingress:
 
 auth:
   type: db
+  #resource: # Add the name of the db resource used by Icinga Web 2 here
   admin_user: icingaweb
   admin_password:  # Add a password here
 
@@ -74,7 +75,7 @@ modules:
 
   icingadb:
     enabled: true
-  
+
   incubator:
     enabled: true
 
@@ -100,7 +101,7 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
-    
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: false

charts/icinga-stack/templates/internal-databases.yaml

@@ -46,6 +46,18 @@ spec:
               subPath: {{ $settings.persistence.subPath }}
               {{- end }}
             {{- end }}
+          livenessProbe:
+            failureThreshold: 5
+            exec:
+              command:
+                - /usr/local/bin/healthcheck.sh
+                - --connect
+          readinessProbe:
+            failureThreshold: 3
+            exec:
+              command:
+                - /usr/local/bin/healthcheck.sh
+                - --connect
   {{- if $settings.persistence.enabled }}
   volumeClaimTemplates:
     - metadata:

charts/icinga-stack/values.yaml

@@ -253,7 +253,7 @@ icinga2:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-  
+
   nodeSelector: {}
 
   tolerations: []
@@ -305,7 +305,7 @@ icingadb:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-  
+
   nodeSelector: {}
 
   tolerations: []
@@ -368,9 +368,10 @@ icingaweb2:
 
   auth:
     type: db
+    #resource: # Add the name of the db resource used by Icinga Web 2 here
     admin_user: icingaweb
     admin_password:  # Add a password here
-  
+
   modules:
     audit:
       enabled: false
@@ -430,13 +431,13 @@ icingaweb2:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-  
+
   nodeSelector: {}
 
   tolerations: []
 
   affinity: {}
-      
+
   serviceAccount:
     # Specifies whether a service account should be created
     create: false
@@ -458,7 +459,7 @@ icingaweb2:
     # readOnlyRootFilesystem: true
     # runAsNonRoot: true
     # runAsUser: 1000
-  
+
 global:
   api:
     # host:  # only needed if Icinga2 runs out of cluster
@@ -491,7 +492,7 @@ global:
         # subPath: ""
         matchLabels: {}
         matchExpressions: []
-        
+
     icingadb:
       database: icingadb
       username: icingadb