Merge pull request #329 from grafana/three-prom-configmaps

Split prom configmap into three

Author: malcolmholmes

prometheus-ksonnet/lib/prometheus-config.libsonnet

@@ -5,8 +5,8 @@
     },
 
     rule_files: [
-      'alerts.rules',
-      'recording.rules',
+      'alerts/alerts.rules',
+      'recording/recording.rules',
     ],
 
     alerting: {

prometheus-ksonnet/lib/prometheus-configmap.libsonnet

@@ -11,18 +11,27 @@
 
     local configMap = $.core.v1.configMap,
 
-    prometheus_config_map:
+    prometheus_config_maps:
       // Can't reference self.foo below as we're in a map context, so
       // need to capture reference to the configs in scope here.
       local prometheus_config = self.prometheus_config;
       local prometheusAlerts = self.prometheusAlerts;
       local prometheusRules = self.prometheusRules;
+      [
+        configMap.new('%s-config' % self.name) +
+        configMap.withData({
+          'prometheus.yml': $.util.manifestYaml(prometheus_config),
+        }),
 
-      configMap.new('%s-config' % self.name) +
-      configMap.withData({
-        'prometheus.yml': $.util.manifestYaml(prometheus_config),
-        'alerts.rules': $.util.manifestYaml(prometheusAlerts),
-        'recording.rules': $.util.manifestYaml(prometheusRules),
-      }),
+        configMap.new('%s-alerts' % self.name) +
+        configMap.withData({
+          'alerts.rules': $.util.manifestYaml(prometheusAlerts),
+        }),
+
+        configMap.new('%s-recording' % self.name) +
+        configMap.withData({
+          'recording.rules': $.util.manifestYaml(prometheusRules),
+        }),
+      ],
   },
 }

prometheus-ksonnet/lib/prometheus-ha-mixin.libsonnet

@@ -29,7 +29,7 @@ local configMap = k.core.v1.configMap;
     config+:: root.prometheus_config {
       global+: {
         external_labels+: {
-          __replica__: 'zero',
+          __replica__: 'prometheus-0',
         },
       },
     },
@@ -41,32 +41,50 @@ local configMap = k.core.v1.configMap;
     config+:: root.prometheus_config {
       global+: {
         external_labels+: {
-          __replica__: 'one',
+          __replica__: 'prometheus-1',
         },
       },
     },
     alerts+:: root.prometheusAlerts,
     rules+:: root.prometheusRules,
   },
 
-  prometheus_config_map:: {},
-
   prometheus_config_maps: [
-    configMap.new('%s-config-0' % self.name) +
+    configMap.new('%s-0-config' % self.name) +
     configMap.withData({
       'prometheus.yml': k.util.manifestYaml(root.prometheus_zero.config),
+    }),
+    configMap.new('%s-0-alerts' % self.name) +
+    configMap.withData({
       'alerts.rules': k.util.manifestYaml(root.prometheus_zero.alerts),
+    }),
+    configMap.new('%s-0-recording' % self.name) +
+    configMap.withData({
       'recording.rules': k.util.manifestYaml(root.prometheus_zero.rules),
     }),
-    configMap.new('%s-config-1' % self.name) +
+
+    configMap.new('%s-1-config' % self.name) +
     configMap.withData({
       'prometheus.yml': k.util.manifestYaml(root.prometheus_one.config),
+    }),
+    configMap.new('%s-1-alerts' % self.name) +
+    configMap.withData({
       'alerts.rules': k.util.manifestYaml(root.prometheus_one.alerts),
+    }),
+    configMap.new('%s-1-recording' % self.name) +
+    configMap.withData({
       'recording.rules': k.util.manifestYaml(root.prometheus_one.rules),
     }),
   ],
 
-  prometheus_config_mount:: {},
+  prometheus_config_mount::
+    k.util.configVolumeMount('%s-0-config' % self.name, '/etc/prometheus-0')
+    + k.util.configVolumeMount('%s-0-alerts' % self.name, '/etc/prometheus-0/alerts')
+    + k.util.configVolumeMount('%s-0-recording' % self.name, '/etc/prometheus-0/recording')
+    + k.util.configVolumeMount('%s-1-config' % self.name, '/etc/prometheus-1')
+    + k.util.configVolumeMount('%s-1-alerts' % self.name, '/etc/prometheus-1/alerts')
+    + k.util.configVolumeMount('%s-1-recording' % self.name, '/etc/prometheus-1/recording')
+  ,
 
   prometheus_container+:: container.withEnv([
                             container.envType.fromFieldPath('POD_NAME', 'metadata.name'),
@@ -82,7 +100,5 @@ local configMap = k.core.v1.configMap;
   ]),
 
   prometheus_statefulset+:
-    k.util.configVolumeMount('%s-config-0' % self.name, '/etc/prometheus-0') +
-    k.util.configVolumeMount('%s-config-1' % self.name, '/etc/prometheus-1') +
     statefulset.mixin.spec.withReplicas(2),
 }

prometheus-ksonnet/lib/prometheus.libsonnet

@@ -75,7 +75,10 @@
     local volumeMount = $.core.v1.volumeMount,
 
     prometheus_config_mount::
-      $.util.configVolumeMount('%s-config' % self.name, _config.prometheus_config_dir),
+      $.util.configVolumeMount('%s-config' % self.name, _config.prometheus_config_dir)
+      + $.util.configVolumeMount('%s-alerts' % self.name, _config.prometheus_config_dir + '/alerts')
+      + $.util.configVolumeMount('%s-recording' % self.name, _config.prometheus_config_dir + '/recording')
+    ,
 
     prometheus_statefulset:
       statefulset.new(self.name, 1, [