Put mixins + overrides in separate file.

Signed-off-by: Tom Wilkie <[email protected]>

prometheus-ksonnet/lib/prometheus-config.libsonnet

@@ -363,94 +363,92 @@
     ],
   },
 
-  // Extension points for adding alerts, recording rules and prometheus config.
-  prometheus_alerts:: {
-    groups+: [
-      {
-        name: 'prometheus-extra',
-        rules: [
-          {
-            alert: 'PromScrapeFailed',
-            expr: |||
-              up != 1
-            |||,
-            'for': '15m',
-            labels: {
-              severity: 'warning',
-            },
-            annotations: {
-              message: 'Prometheus failed to scrape a target {{ $labels.job }} / {{ $labels.instance }}',
-            },
-          },
-          {
-            alert: 'PromScrapeFlapping',
-            expr: |||
-              avg_over_time(up[5m]) < 1
-            |||,
-            'for': '15m',
-            labels: {
-              severity: 'warning',
-            },
-            annotations: {
-              message: 'Prometheus target flapping {{ $labels.job }} / {{ $labels.instance }}',
+  // Legacy Extension points for adding alerts, recording rules and prometheus config.
+  local emptyMixin = {
+    prometheusAlerts+:: {},
+    prometheusRules+:: {},
+  },
+
+  prometheusAlerts::
+    {
+      groups+: [
+        {
+          name: 'prometheus-extra',
+          rules: [
+            {
+              alert: 'PromScrapeFailed',
+              expr: |||
+                up != 1
+              |||,
+              'for': '15m',
+              labels: {
+                severity: 'warning',
+              },
+              annotations: {
+                message: 'Prometheus failed to scrape a target {{ $labels.job }} / {{ $labels.instance }}',
+              },
             },
-          },
-          {
-            alert: 'PromScrapeTooLong',
-            expr: |||
-              scrape_duration_seconds > 60
-            |||,
-            'for': '15m',
-            labels: {
-              severity: 'warning',
+            {
+              alert: 'PromScrapeFlapping',
+              expr: |||
+                avg_over_time(up[5m]) < 1
+              |||,
+              'for': '15m',
+              labels: {
+                severity: 'warning',
+              },
+              annotations: {
+                message: 'Prometheus target flapping {{ $labels.job }} / {{ $labels.instance }}',
+              },
             },
-            annotations: {
-              message: '{{ $labels.job }} / {{ $labels.instance }} is taking too long to scrape ({{ printf "%.1f" $value }}s)',
+            {
+              alert: 'PromScrapeTooLong',
+              expr: |||
+                scrape_duration_seconds > 60
+              |||,
+              'for': '15m',
+              labels: {
+                severity: 'warning',
+              },
+              annotations: {
+                message: '{{ $labels.job }} / {{ $labels.instance }} is taking too long to scrape ({{ printf "%.1f" $value }}s)',
+              },
             },
-          },
-        ],
-      },
-    ],
-  },
-
-  prometheus_rules:: {
-    groups+: [
-      {
-        // Add mapping from namespace, pod -> node with node name as pod, as
-        // we use the node name as the node-exporter instance label.
-        name: 'instance_override',
-        rules: [
-          {
-            record: 'node_namespace_pod:kube_pod_info:',
-            expr: |||
-              max by(node, namespace, instance) (label_replace(kube_pod_info{job="default/kube-state-metrics"}, "instance", "$1", "node", "(.*)"))
-            |||,
-          },
-        ],
-      },
-    ],
-  },
-
-  // We changes to using camelCase, but here we try and make it backwards compatible.
-  prometheusAlerts+::
-    $.prometheus_alerts +
-    std.foldr(
-      function(m, acc) m + acc,
-      [
-        $.mixins[mixinName].prometheusAlerts
-        for mixinName in std.objectFields($.mixins)
+          ],
+        },
       ],
+    } +
+    std.foldr(
+      function(mixinName, acc)
+      local mixin = $.mixins[mixinName] + emptyMixin;
+      acc + mixin.prometheusAlerts,
+      std.objectFields($.mixins),
       {}
     ),
 
-  prometheusRules+::
-    $.prometheus_rules +
-    std.foldr(
-      function(m, acc) m + acc,
-      [
-        $.mixins[mixinName].prometheusAlerts
-        for mixinName in std.objectFields($.mixins)
+  prometheusRules::
+    {
+      groups+: [
+        {
+          // Add mapping from namespace, pod -> node with node name as pod, as
+          // we use the node name as the node-exporter instance label.
+          name: 'instance_override',
+          rules: [
+            {
+              record: 'node_namespace_pod:kube_pod_info:',
+              expr: |||
+                max by(node, namespace, instance) (label_replace(kube_pod_info{job="default/kube-state-metrics"}, "instance", "$1", "node", "(.*)"))
+              |||,
+            },
+          ],
+        },
       ],
-      {}
+    } +
+    std.foldr(
+      function(mixinName, acc)
+        local mixin = $.mixins[mixinName] + emptyMixin;
+        acc + mixin.prometheusRules,
+      std.objectFields($.mixins),
+      {},
     ),
 }

prometheus-ksonnet/mixins.libsonnet

@@ -0,0 +1,44 @@
+{
+  // Add you mixins here.
+  mixins+:: {
+    kubernetes+:
+      (import 'kubernetes-mixin/mixin.libsonnet') {
+        _config+:: {
+          cadvisorSelector: 'job="kube-system/cadvisor"',
+          kubeletSelector: 'job="kube-system/kubelet"',
+          kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.namespace,
+          nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace,  // Also used by node-mixin.
+          notKubeDnsSelector: 'job!="kube-system/kube-dns"',
+          kubeSchedulerSelector: 'job="kube-system/kube-scheduler"',
+          kubeControllerManagerSelector: 'job="kube-system/kube-controller-manager"',
+          kubeApiserverSelector: 'job="kube-system/kube-apiserver"',
+          podLabel: 'instance',
+        },
+      },
+
+    prometheus+:
+      (import 'prometheus-mixin/mixin.libsonnet') {
+        _config+:: {
+          prometheusSelector: 'job="default/prometheus"',
+        },
+      },
+
+    alertmanager+:
+      (import 'alertmanager-mixin/mixin.libsonnet') {
+        _config+:: {
+          alertmanagerSelector: 'job="default/alertmanager"',
+        },
+      },
+
+    node_exporter+:
+      (import 'node-mixin/mixin.libsonnet') {
+        _config+:: {
+          nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace,  // Also used by node-mixin.
+
+          // Do not page if nodes run out of disk space.
+          nodeCriticalSeverity: 'warning',
+          grafanaPrefix: '/grafana',
+        },
+      },
+  },
+}

prometheus-ksonnet/prometheus-ksonnet.libsonnet

@@ -9,46 +9,4 @@
 (import 'lib/prometheus-config.libsonnet') +
 (import 'lib/prometheus-configmap.libsonnet') +
 (import 'lib/config.libsonnet') +
-{
-  mixins+:: {
-    kubernetes+:
-      (import 'kubernetes-mixin/mixin.libsonnet') {
-        _config+:: {
-          cadvisorSelector: 'job="kube-system/cadvisor"',
-          kubeletSelector: 'job="kube-system/kubelet"',
-          kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.namespace,
-          nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace,  // Also used by node-mixin.
-          notKubeDnsSelector: 'job!="kube-system/kube-dns"',
-          kubeSchedulerSelector: 'job="kube-system/kube-scheduler"',
-          kubeControllerManagerSelector: 'job="kube-system/kube-controller-manager"',
-          kubeApiserverSelector: 'job="kube-system/kube-apiserver"',
-          podLabel: 'instance',
-        },
-      },
-
-    prometheus+:
-      (import 'prometheus-mixin/mixin.libsonnet') {
-        _config+:: {
-          prometheusSelector: 'job="default/prometheus"',
-        },
-      },
-
-    alertmanager+:
-      (import 'alertmanager-mixin/mixin.libsonnet') {
-        _config+:: {
-          alertmanagerSelector: 'job="default/alertmanager"',
-        },
-      },
-
-    node_exporter+:
-      (import 'node-mixin/mixin.libsonnet') {
-        _config+:: {
-          nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace,  // Also used by node-mixin.
-
-          // Do not page if nodes run out of disk space.
-          nodeCriticalSeverity: 'warning',
-          grafanaPrefix: '/grafana',
-        },
-      },
-  },
-}
+(import 'mixins.libsonnet')