[loki] Generate Dashboards from loki-mixin

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

Author: jkroepke

charts/loki/.helmignore

@@ -30,3 +30,4 @@ test/
 scenarios/
 docs/
 *-values.yaml
+hack/

charts/loki/ci/non-default-values.yaml

@@ -3,10 +3,13 @@ nameOverride: '{{ $.Release.Name }}'
 test:
   enabled: true
 loki:
+  auth_enabled: true
   commonConfig:
     replication_factor: 1
   useTestSchema: true
   tenants:
+    - name: "self-monitoring"
+      password: "self-monitoring"
     - name: "test-user-1"
       password: "test-password-1"
     - name: "test-user-2"
@@ -16,9 +19,42 @@ loki:
       - name: ndots
         value: "3"
 ingester:
-  replicas: 0
+  replicas: 1
   zoneAwareReplication:
     enabled: true
+    zoneA:
+      extraAffinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: name
+                    operator: In
+                    values:
+                      - '{{ include "loki.prefixIngesterName" . }}ingester-zone-a'
+              topologyKey: kubernetes.io/hostname
+    zoneB:
+      extraAffinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: name
+                    operator: In
+                    values:
+                      - '{{ include "loki.prefixIngesterName" . }}ingester-zone-b'
+              topologyKey: kubernetes.io/hostname
+    zoneC:
+      extraAffinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: name
+                    operator: In
+                    values:
+                      - '{{ include "loki.prefixIngesterName" . }}ingester-zone-c'
+              topologyKey: kubernetes.io/hostname
   dnsConfig:
     options:
       - name: ndots
@@ -51,6 +87,8 @@ queryScheduler:
 lokiCanary:
   enabled: true
   kind: Deployment
+  tenant:
+    password: "self-monitoring"
 chunksCache:
   suffix: "l1"
   enabled: true
@@ -80,11 +118,17 @@ gateway:
   metrics:
     enabled: false
 monitoring:
+  serviceMonitor:
+    enabled: true
+    labels:
+      release: kube-prometheus-stack
   dashboards:
     enabled: true
   rules:
     enabled: true
     alerting: true
+    labels:
+      release: kube-prometheus-stack
     additionalGroups:
       - name: "additional-rules"
         rules:

charts/loki/hack/sync_grafana_dashboards.py

@@ -37,7 +37,7 @@ def new_representer(dumper, data):
     {
         'git': 'https://github.com/grafana/loki.git',
         'branch': refs['ref.loki'],
-        'content': "(import 'dashboards.libsonnet') + (import 'config.libsonnet') + {_config+:: { horizontally_scalable_compactor_enabled: false, internal_components: true, meta_monitoring+: { enabled: true }, promtail+: { enabled: false }, ssd+: { enabled: false, pod_prefix_matcher: 'loki.*' }}}",
+        'content': "(import 'dashboards.libsonnet') + (import 'config.libsonnet') + {_config+:: { horizontally_scalable_compactor_enabled: false, internal_components: false, meta_monitoring+: { enabled: true }, promtail+: { enabled: false }, ssd+: { enabled: false, pod_prefix_matcher: 'loki.*' }}}",
         'cwd': 'production/loki-mixin',
         'destination': '../templates/monitoring/dashboards',
         'type': 'jsonnet_mixin',
@@ -48,14 +48,62 @@ def new_representer(dumper, data):
 
 # Additional conditions map
 condition_map = {}
-
-replacement_map = {}
+replacement_map = {
+    '($namespace)/(bloom-gateway': {
+        'replacement': '($namespace)/(loki.*-bloom-gateway',
+    },
+    '($namespace)/(distributor': {
+        'replacement': '($namespace)/(loki.*-distributor',
+    },
+    '($namespace)/(querier': {
+        'replacement': '($namespace)/(loki.*-querier',
+    },
+    '($namespace)/(index-gateway': {
+        'replacement': '($namespace)/(loki.*-index-gateway',
+    },
+    '($namespace)/(query-frontend': {
+        'replacement': '($namespace)/(loki.*-query-frontend',
+    },
+    '($namespace)/(partition-ingester.*|ingester.*': {
+        'replacement': '($namespace)/(loki.*-partition-ingester.*|loki.*-ingester.*',
+    },
+    '($namespace)/(partition-ingester-.*|ingester-zone-.*': {
+        'replacement': '($namespace)/(loki.*-partition-ingester-.*|loki.*-ingester-zone-.*',
+    },
+    '($namespace)/bloom-gateway': {
+        'replacement': '($namespace)/loki.*-bloom-gateway',
+    },
+    '($namespace)/query-frontend': {
+        'replacement': '($namespace)/loki.*-query-frontend',
+    },
+    '($namespace)/query-scheduler': {
+        'replacement': '($namespace)/loki.*-query-scheduler',
+    },
+    '($namespace)/distributor': {
+        'replacement': '($namespace)/loki.*-distributor',
+    },
+    '($namespace)/ruler': {
+        'replacement': '($namespace)/loki.*-ruler',
+    },
+    '($namespace)/querier': {
+        'replacement': '($namespace)/loki.*-querier',
+    },
+    '"(.*compactor|loki.*-backend.*|loki-single-binary)"': {
+        'replacement': '".*compactor|loki.*-backend.*|loki-single-binary)',
+    },
+    'cluster=~\\"$cluster\\"': {
+        'replacement': 'cluster=~\\"|$cluster\\"',
+    },
+    '*.index-gateway': {
+        'replacement': '.*index-gateway',
+    },
+}
 
 # standard header
 header = '''{{- /*
 Generated from '%(name)s' from %(url)s
 Do not change in-place! In order to change this file first read following link:
-https://github.com/prometheus-community/helm-charts/tree/main/charts/loki/hack
+https://github.com/grafana-community/helm-charts/tree/main/charts/loki/hack
 */ -}}
 {{- if and .Values.monitoring.dashboards.enabled (dig "%(name)s" "enabled" true .Values.monitoring.dashboards) %(condition)s }}%(init_line)s
 apiVersion: v1