Loki Prometheus mixin: Fix incorrect selectors and simplify mixin usa…

…ge (grafana#6189) * fix(dashboards): fix matchers and selectors Signed-off-by: irizzant <i.rizzante@gmail.com> * doc: add entry in CHANGELOG * feat(dashboards): add kube-prometheus mixin Signed-off-by: irizzant <i.rizzante@gmail.com> * doc: update CHANGELOG * fix(mixins): fix wrong job selectors Signed-off-by: irizzant <i.rizzante@gmail.com> * Revert "fix(mixins): fix wrong job selectors" This reverts commit f819a0b. * fix(dashboards): add ServiceMonitor object Signed-off-by: Ivan Rizzante <i.rizzante@gmail.com> * fix(jsonnet): format jsonnet Signed-off-by: irizzant <i.rizzante@gmail.com> * fix(dashboards): add ServiceMonitor to Loki Simple Scalable Signed-off-by: irizzant <i.rizzante@gmail.com> * Revert "fix(dashboards): add ServiceMonitor to Loki Simple Scalable" This reverts commit ba24006. * doc: add details about create_service_monitor` parameter Signed-off-by: irizzant <i.rizzante@gmail.com>
esev · Jun 28, 2022 · 002dd8a · 002dd8a
1 parent 27477bf
commit 002dd8a
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## Main
-
+* [6189](https://github.com/grafana/loki/pull/6189) **irizzant**: Add creation of a `ServiceMonitor` object for Prometheus scraping through configuration parameter `create_service_monitor`. Simplify mixin usage by adding (https://github.com/prometheus-operator/kube-prometheus) library.
 * [6444](https://github.com/grafana/loki/pull/6444) **aminesnow** Add TLS config to query frontend.
 * [6372](https://github.com/grafana/loki/pull/6372) **splitice**: Add support for numbers in JSON fields.
 * [6105](https://github.com/grafana/loki/pull/6105) **rutgerke** Export metrics for the Promtail journal target.

diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet
@@ -4,6 +4,8 @@
     cluster: error 'must define cluster',
     http_listen_port: 3100,
 
+    create_service_monitor: false,
+
     replication_factor: 3,
     memcached_replicas: 3,
 
@@ -386,4 +388,5 @@
     deployment.mixin.spec.template.metadata.withAnnotationsMixin({
       config_hash: std.md5(std.toString($._config.loki)),
     }),
+
 }
diff --git a/production/ksonnet/loki/loki.libsonnet b/production/ksonnet/loki/loki.libsonnet
@@ -31,4 +31,7 @@
 (import 'boltdb_shipper.libsonnet') +
 
 // Memberlist related deployment configuration, mostly migration related
-(import 'memberlist.libsonnet')
+(import 'memberlist.libsonnet') +
+
+// Prometheus ServiceMonitor
+(import 'servicemonitor.libsonnet')
diff --git a/production/ksonnet/loki/servicemonitor.libsonnet b/production/ksonnet/loki/servicemonitor.libsonnet
@@ -0,0 +1,50 @@
+{
+  local this = self,
+
+  serviceMonitor: if $._config.create_service_monitor then {
+    apiVersion: 'monitoring.coreos.com/v1',
+    kind: 'ServiceMonitor',
+    metadata: {
+      name: 'loki-servicemonitor',
+      namespace: $._config.namespace,
+    },
+    spec: {
+      namespaceSelector: {
+        matchNames: [$._config.namespace],
+      },
+      servicesToRelabel:: [
+        'compactor',
+        'distributor',
+        'ingester',
+        'querier',
+        'ruler',
+      ],
+      endpoints: [
+        {
+          port: port.name,
+          path: '/metrics',
+          [if std.member(self.servicesToRelabel, this[name].spec.selector.name) then 'relabelings']: [{
+            sourceLabels: ['job'],
+            action: 'replace',
+            replacement: $._config.namespace + '/$1',
+            targetLabel: 'job',
+          }],
+        }
+        for name in std.objectFields(this)
+        if std.isObject($[name]) && std.objectHas(this[name], 'kind') && this[name].kind == 'Service'
+        for port in std.filter(function(x) std.length(std.findSubstr('http-metrics', x.name)) > 0, this[name].spec.ports)
+      ],
+      selector: {
+        matchExpressions: [{
+          key: 'name',
+          operator: 'In',
+          values: [
+            this[name].spec.selector.name
+            for name in std.objectFields(this)
+            if std.isObject(this[name]) && std.objectHas(this[name], 'kind') && this[name].kind == 'Service'
+          ],
+        }],
+      },
+    },
+  } else {},
+}
diff --git a/production/loki-mixin/jsonnetfile.json b/production/loki-mixin/jsonnetfile.json
@@ -27,6 +27,15 @@
         }
       },
       "version": "master"
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/prometheus-operator/kube-prometheus.git",
+          "subdir": "jsonnet/kube-prometheus/lib"
+        }
+      },
+      "version": "main"
     }
   ],
   "legacyImports": true