Merge pull request #1958 from nrobert13/objectify_alertmanager_config

objectify alertmanager config

jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet

@@ -14,22 +14,31 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
 
     alertmanager+:: {
       name: $._config.alertmanager.name,
-      config: |||
+      config: {
-        global:
+        global: {
-          resolve_timeout: 5m
+          resolve_timeout: '5m',
-        route:
+        },
-          group_by: ['job']
+        route: {
-          group_wait: 30s
+          group_by: ['job'],
-          group_interval: 5m
+          group_wait: '30s',
-          repeat_interval: 12h
+          group_interval: '5m',
-          receiver: 'null'
+          repeat_interval: '12h',
-          routes:
+          receiver: 'null',
-          - match:
+          routes: [
-              alertname: DeadMansSwitch
+            { 
-            receiver: 'null'
+              receiver: 'null',
-        receivers:
+              match: {
-        - name: 'null'
+                alertname: 'DeadMansSwitch',
-      |||,
+              },
+            },
+          ],
+        },
+        receivers: [
+          {
+             name: 'null',
+          },
+        ],
+      },
       replicas: 3,
     },
   },
@@ -38,7 +47,11 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     secret:
       local secret = k.core.v1.secret;
 
-      secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64($._config.alertmanager.config) }) +
+      if std.type($._config.alertmanager.config) == "object" then
+        secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64(std.manifestYamlDoc($._config.alertmanager.config)) })
+      else
+        secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64($._config.alertmanager.config) })
+      + 
       secret.mixin.metadata.withNamespace($._config.namespace),
 
     serviceAccount: