Merge branch 'monitoring' into 'master'

ensure monitoring values is subbed under kubePrometheusStack

See merge request platform-one/big-bang/umbrella!30

chart/templates/monitoring/monitoring.yaml

@@ -38,18 +38,21 @@ spec:
       valuesKey: "monitoring.yaml"
 
   values:
+    hostname: {{ .Values.hostname }}
+
     global:
       imagePullSecrets:
         - name: private-registry
 
-    grafana:
-      image:
-        pullSecrets:
-        - private-registry
+    kubePrometheusStack:
+      grafana:
+        image:
+          pullSecrets:
+          - private-registry
 
-    prometheusOperator:
-      createCustomResource: true
-      manageCrds: true
+      prometheusOperator:
+        createCustomResource: true
+        manageCrds: true
 
   # TODO: DRY this up
   {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}

chart/templates/twistlock/twistlock-helmrelease.yaml

@@ -54,5 +54,9 @@ spec:
     - name: istio
       namespace: {{ .Release.Namespace }}
     {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
   {{- end }}
 {{- end }}
\ No newline at end of file