jsonnet: create function responsible for prometheus objects

Signed-off-by: paulfantom <pawel@krupa.net.pl>

jsonnet/kube-prometheus/kube-prometheus.libsonnet

@@ -5,16 +5,15 @@ local blackboxExporter = import './blackbox-exporter/blackbox-exporter.libsonnet
 local kubeStateMetrics = import './kube-state-metrics/kube-state-metrics.libsonnet';
 local nodeExporter = import './node-exporter/node-exporter.libsonnet';
 local prometheusAdapter = import './prometheus-adapter/prometheus-adapter.libsonnet';
+local prometheus = import './prometheus/prometheus.libsonnet';
 
 local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
 
 (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') +
 (import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet') +
-(import './prometheus/prometheus.libsonnet') +
-
 {
   alertmanager: alertmanager({
-    name: 'main',
+    name: $._config.alertmanagerName,
     namespace: $._config.namespace,
     version: '0.21.0',
     image: 'quay.io/prometheus/alertmanager:v0.21.0',
@@ -34,6 +33,14 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
     version: '1.0.1',
     image: 'quay.io/prometheus/node-exporter:v1.0.1',
   }),
+  prometheus: prometheus({
+    namespace: $._config.namespace,
+    version: '2.24.0',
+    image: 'quay.io/prometheus/prometheus:v2.24.0',
+    name: $._config.prometheusName,
+    alertmanagerName: $._config.alertmanagerName,
+    rules: $.allRules,
+  }),
   prometheusAdapter: prometheusAdapter({
     namespace: $._config.namespace,
     version: '0.8.2',
@@ -42,9 +49,24 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
   }),
   mixins+:: monitoringMixins({
     namespace: $._config.namespace,
-    alertmanagerName: 'main',
-    prometheusName: 'k8s',
+    alertmanagerName: $._config.alertmanagerName,
+    prometheusName: $._config.prometheusName,
   }),
+
+  // FIXME(paulfantom) Remove this variable by moving each mixin to its own component
+  // Example: node_exporter mixin could be added in ./node-exporter/node-exporter.libsonnet
+  allRules::
+    $.mixins.nodeExporter.prometheusRules +
+    $.mixins.kubernetes.prometheusRules +
+    $.mixins.base.prometheusRules +
+    $.mixins.kubeStateMetrics.prometheusAlerts +
+    $.mixins.nodeExporter.prometheusAlerts +
+    $.mixins.alertmanager.prometheusAlerts +
+    $.mixins.prometheusOperator.prometheusAlerts +
+    $.mixins.kubernetes.prometheusAlerts +
+    $.mixins.prometheus.prometheusAlerts +
+    $.mixins.base.prometheusAlerts,
+
   kubePrometheus+:: {
     namespace: {
       apiVersion: 'v1',
@@ -143,6 +165,8 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
 } + {
   _config+:: {
     namespace: 'default',
+    prometheusName: 'k8s',
+    alertmanagerName: 'main',
 
     versions+:: { grafana: '7.3.5', kubeRbacProxy: 'v0.8.0' },
     imageRepos+:: { kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy' },
@@ -187,24 +211,6 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
       },
     },
 
-    local allRules =
-      $.mixins.nodeExporter.prometheusRules +
-      $.mixins.kubernetes.prometheusRules +
-      $.mixins.base.prometheusRules +
-      $.mixins.kubeStateMetrics.prometheusAlerts +
-      $.mixins.nodeExporter.prometheusAlerts +
-      $.mixins.alertmanager.prometheusAlerts +
-      $.mixins.prometheusOperator.prometheusAlerts +
-      $.mixins.kubernetes.prometheusAlerts +
-      $.mixins.prometheus.prometheusAlerts +
-      $.mixins.base.prometheusAlerts,
-
-    local allDashboards =
-      $.mixins.nodeExporter.grafanaDashboards +
-      $.mixins.kubernetes.grafanaDashboards +
-      $.mixins.prometheus.grafanaDashboards,
-
-    prometheus+:: { rules: allRules },
     grafana+:: {
       labels: {
         'app.kubernetes.io/name': 'grafana',
@@ -212,7 +218,12 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
         'app.kubernetes.io/component': 'grafana',
         'app.kubernetes.io/part-of': 'kube-prometheus',
       },
-      dashboards: allDashboards,
+      // FIXME(paulfantom): Same as with rules and alerts.
+      // This should be gathering all dashboards from components without having to enumerate all dashboards.
+      dashboards:
+        $.mixins.nodeExporter.grafanaDashboards +
+        $.mixins.kubernetes.grafanaDashboards +
+        $.mixins.prometheus.grafanaDashboards,
     },
   },
 }

jsonnet/kube-prometheus/prometheus/prometheus.libsonnet

@@ -1,49 +1,48 @@
 local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet';
 
-{
-  _config+:: {
-    namespace: 'default',
+local defaults = {
+  local defaults = self,
+  namespace: error 'must provide namespace',
+  version: error 'must provide version',
+  image: error 'must provide image',
+  resources: {
+    requests: { memory: '400Mi' },
+  },
 
-    versions+:: { prometheus: 'v2.22.1' },
-    imageRepos+:: { prometheus: 'quay.io/prometheus/prometheus' },
-    alertmanager+:: { name: 'main' },
-
-    prometheus+:: {
-      name: 'k8s',
+  name: error 'must provide name',
+  alertmanagerName: error 'must provide alertmanagerName',
+  namespaces: ['default', 'kube-system', defaults.namespace],
   replicas: 2,
-      rules: {},
-      namespaces: ['default', 'kube-system', $._config.namespace],
-      labels: {
+  rules: {
+    groups: [],
+  },
+  commonLabels:: {
     'app.kubernetes.io/name': 'prometheus',
-        'app.kubernetes.io/version': $._config.versions.prometheus,
+    'app.kubernetes.io/version': defaults.version,
     'app.kubernetes.io/component': 'prometheus',
     'app.kubernetes.io/part-of': 'kube-prometheus',
   },
-      selectorLabels: {
-        [labelName]: $._config.prometheus.labels[labelName]
-        for labelName in std.objectFields($._config.prometheus.labels)
+  selectorLabels:: {
+    [labelName]: defaults.commonLabels[labelName]
+    for labelName in std.objectFields(defaults.commonLabels)
     if !std.setMember(labelName, ['app.kubernetes.io/version'])
-      },
-    },
-  },
+  } + { prometheus: defaults.name },
+};
 
-  prometheus+:: {
+
+function(params) {
   local p = self,
-
-    name:: $._config.prometheus.name,
-    namespace:: $._config.namespace,
-    roleBindingNamespaces:: $._config.prometheus.namespaces,
-    replicas:: $._config.prometheus.replicas,
-    prometheusRules:: $._config.prometheus.rules,
-    alertmanagerName:: $.alertmanager.service.metadata.name,
+  config:: defaults + params,
+  // Safety check
+  assert std.isObject(p.config.resources),
 
   serviceAccount: {
     apiVersion: 'v1',
     kind: 'ServiceAccount',
     metadata: {
-        name: 'prometheus-' + p.name,
-        namespace: p.namespace,
-        labels: $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name,
+      namespace: p.config.namespace,
+      labels: p.config.commonLabels,
     },
   },
 
@@ -51,15 +50,15 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     apiVersion: 'v1',
     kind: 'Service',
     metadata: {
-        name: 'prometheus-' + p.name,
-        namespace: p.namespace,
-        labels: { prometheus: p.name } + $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name,
+      namespace: p.config.namespace,
+      labels: { prometheus: p.config.name } + p.config.commonLabels,
     },
     spec: {
       ports: [
         { name: 'web', targetPort: 'web', port: 9090 },
       ],
-        selector: { app: 'prometheus', prometheus: p.name } + $._config.prometheus.selectorLabels,
+      selector: { app: 'prometheus' } + p.config.selectorLabels,
       sessionAffinity: 'ClientIP',
     },
   },
@@ -69,14 +68,14 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'PrometheusRule',
     metadata: {
       labels: {
-          prometheus: p.name,
+        prometheus: p.config.name,
         role: 'alert-rules',
-        } + $._config.prometheus.labels,
-        name: 'prometheus-' + p.name + '-rules',
-        namespace: p.namespace,
+      } + p.config.commonLabels,
+      name: 'prometheus-' + p.config.name + '-rules',
+      namespace: p.config.namespace,
     },
     spec: {
-        groups: p.prometheusRules.groups,
+      groups: p.config.rules.groups,
     },
   },
 
@@ -85,33 +84,33 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       apiVersion: 'rbac.authorization.k8s.io/v1',
       kind: 'RoleBinding',
       metadata: {
-          name: 'prometheus-' + p.name,
+        name: 'prometheus-' + p.config.name,
         namespace: namespace,
-          labels: $._config.prometheus.labels,
+        labels: p.config.commonLabels,
       },
       roleRef: {
         apiGroup: 'rbac.authorization.k8s.io',
         kind: 'Role',
-          name: 'prometheus-' + p.name,
+        name: 'prometheus-' + p.config.name,
       },
       subjects: [{
         kind: 'ServiceAccount',
-          name: 'prometheus-' + p.name,
-          namespace: p.namespace,
+        name: 'prometheus-' + p.config.name,
+        namespace: p.config.namespace,
       }],
     };
     {
       apiVersion: 'rbac.authorization.k8s.io/v1',
       kind: 'RoleBindingList',
-        items: [newSpecificRoleBinding(x) for x in p.roleBindingNamespaces],
+      items: [newSpecificRoleBinding(x) for x in p.config.namespaces],
     },
 
   clusterRole: {
     apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRole',
     metadata: {
-        name: 'prometheus-' + p.name,
-        labels: $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name,
+      labels: p.config.commonLabels,
     },
     rules: [
       {
@@ -130,9 +129,9 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'Role',
     metadata: {
-        name: 'prometheus-' + p.name + '-config',
-        namespace: p.namespace,
-        labels: $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name + '-config',
+      namespace: p.config.namespace,
+      labels: p.config.commonLabels,
     },
     rules: [{
       apiGroups: [''],
@@ -145,19 +144,19 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'RoleBinding',
     metadata: {
-        name: 'prometheus-' + p.name + '-config',
-        namespace: p.namespace,
-        labels: $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name + '-config',
+      namespace: p.config.namespace,
+      labels: p.config.commonLabels,
     },
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'Role',
-        name: 'prometheus-' + p.name + '-config',
+      name: 'prometheus-' + p.config.name + '-config',
     },
     subjects: [{
       kind: 'ServiceAccount',
-        name: 'prometheus-' + p.name,
-        namespace: p.namespace,
+      name: 'prometheus-' + p.config.name,
+      namespace: p.config.namespace,
     }],
   },
 
@@ -165,18 +164,18 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRoleBinding',
     metadata: {
-        name: 'prometheus-' + p.name,
-        labels: $._config.prometheus.labels,
+      name: 'prometheus-' + p.config.name,
+      labels: p.config.commonLabels,
     },
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'ClusterRole',
-        name: 'prometheus-' + p.name,
+      name: 'prometheus-' + p.config.name,
     },
     subjects: [{
       kind: 'ServiceAccount',
-        name: 'prometheus-' + p.name,
-        namespace: p.namespace,
+      name: 'prometheus-' + p.config.name,
+      namespace: p.config.namespace,
     }],
   },
 
@@ -185,9 +184,9 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       apiVersion: 'rbac.authorization.k8s.io/v1',
       kind: 'Role',
       metadata: {
-          name: 'prometheus-' + p.name,
+        name: 'prometheus-' + p.config.name,
         namespace: namespace,
-          labels: $._config.prometheus.labels,
+        labels: p.config.commonLabels,
       },
       rules: [
         {
@@ -205,25 +204,25 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     {
       apiVersion: 'rbac.authorization.k8s.io/v1',
       kind: 'RoleList',
-        items: [newSpecificRole(x) for x in p.roleBindingNamespaces],
+      items: [newSpecificRole(x) for x in p.config.namespaces],
     },
 
   prometheus: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'Prometheus',
     metadata: {
-        name: p.name,
-        namespace: p.namespace,
-        labels: { prometheus: p.name } + $._config.prometheus.labels,
+      name: p.config.name,
+      namespace: p.config.namespace,
+      labels: { prometheus: p.config.name } + p.config.commonLabels,
     },
     spec: {
-        replicas: p.replicas,
-        version: $._config.versions.prometheus,
-        image: $._config.imageRepos.prometheus + ':' + $._config.versions.prometheus,
+      replicas: p.config.replicas,
+      version: p.config.version,
+      image: p.config.image,
       podMetadata: {
-          labels: $._config.prometheus.labels,
+        labels: p.config.commonLabels,
       },
-        serviceAccountName: 'prometheus-' + p.name,
+      serviceAccountName: 'prometheus-' + p.config.name,
       serviceMonitorSelector: {},
       podMonitorSelector: {},
       probeSelector: {},
@@ -234,16 +233,14 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       ruleSelector: {
         matchLabels: {
           role: 'alert-rules',
-            prometheus: p.name,
+          prometheus: p.config.name,
         },
       },
-        resources: {
-          requests: { memory: '400Mi' },
-        },
+      resources: p.config.resources,
       alerting: {
         alertmanagers: [{
-            namespace: p.namespace,
-            name: p.alertmanagerName,
+          namespace: p.config.namespace,
+          name: 'alertmanager-' + p.config.alertmanagerName,
           port: 'web',
         }],
       },
@@ -260,12 +257,12 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'prometheus',
-        namespace: p.namespace,
-        labels: $._config.prometheus.labels,
+      namespace: p.config.namespace,
+      labels: p.config.commonLabels,
     },
     spec: {
       selector: {
-          matchLabels: { prometheus: p.name } + $._config.prometheus.selectorLabels,
+        matchLabels: p.config.selectorLabels,
       },
       endpoints: [{
         port: 'web',
@@ -279,7 +276,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'kube-scheduler',
-        namespace: p.namespace,
+      namespace: p.config.namespace,
       labels: { 'app.kubernetes.io/name': 'kube-scheduler' },
     },
     spec: {
@@ -305,7 +302,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'kubelet',
-        namespace: p.namespace,
+      namespace: p.config.namespace,
       labels: { 'app.kubernetes.io/name': 'kubelet' },
     },
     spec: {
@@ -377,7 +374,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'kube-controller-manager',
-        namespace: p.namespace,
+      namespace: p.config.namespace,
       labels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
     },
     spec: {
@@ -412,7 +409,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'kube-apiserver',
-        namespace: p.namespace,
+      namespace: p.config.namespace,
       labels: { 'app.kubernetes.io/name': 'apiserver' },
     },
     spec: {
@@ -466,7 +463,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
     kind: 'ServiceMonitor',
     metadata: {
       name: 'coredns',
-        namespace: p.namespace,
+      namespace: p.config.namespace,
       labels: { 'app.kubernetes.io/name': 'coredns' },
     },
     spec: {
@@ -484,5 +481,4 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       }],
     },
   },
-  },
 }