refactored loki play

Author: wtripp180901

ansible/roles/grafana-dashboards/files/loki-pod-logs-dashboard.json

@@ -16,7 +16,7 @@
     ]
   },
   "description": "Search pod logs stored in Loki",
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 31,

ansible/roles/grafana-dashboards/files/loki-systemd-logs-dashboard.json

@@ -16,7 +16,7 @@
       ]
     },
     "description": "Search systemd logs stored in Loki",
-    "editable": false,
+    "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
     "id": 33,

ansible/roles/kube_prometheus_stack/defaults/main/helm.yml

@@ -193,3 +193,45 @@ kube_prometheus_stack_release_values: >-
     kube_prometheus_stack_release_defaults |
       combine(kube_prometheus_stack_release_overrides, recursive = True)
   }}
+
+kube_prometheus_stack_loki_release_values:
+  loki:
+    nodeSelector:
+      clusterrole: server
+    image:
+      tag: "{{ kube_prometheus_stack_loki_image_tag }}"
+  grafana:
+    sidecar:
+      datasources:
+        enabled: false
+  promtail:
+    config:
+      snippets:
+        extraScrapeConfigs: |
+          - job_name: journal
+            journal:
+              path: /var/log/journal
+              max_age: 12h
+              labels:
+                job: systemd-journal
+            relabel_configs:
+              - source_labels: ['__journal__systemd_unit']
+                target_label: 'unit'
+              - source_labels: ['__journal__hostname']
+                target_label: 'hostname'
+              - source_labels: ['__journal_priority_keyword']
+                target_label: level
+    extraVolumes:
+      - name: journal
+        hostPath:
+          path: /var/log/journal
+      - name: machine-id
+        hostPath:
+          path: /etc/machine-id
+    extraVolumeMounts:
+      - name: journal
+        mountPath: /var/log/journal
+        readOnly: true
+      - name: machine-id
+        mountPath: /etc/machine-id
+        readOnly: true

ansible/roles/kube_prometheus_stack/defaults/main/main.yml

@@ -20,6 +20,9 @@ kube_prometheus_stack_wait_timeout: 5m
 kube_prometheus_stack_metrics_image_tag: v2.12.0
 kube_prometheus_stack_patch_image_tag: v20221220-controller-v1.5.1-58-g787ea74b6
 
+kube_prometheus_stack_loki_chart_version: 2.10.2
+kube_prometheus_stack_loki_image_tag: 2.9.3
+
 control_ip: "{{ hostvars[groups['control'].0].ansible_host }}"
 
 grafana_auth_anonymous: false

ansible/roles/kube_prometheus_stack/tasks/main.yml

@@ -180,50 +180,10 @@
   kubernetes.core.helm:
     chart_ref: loki-stack
     chart_repo_url: https://grafana.github.io/helm-charts
-    chart_version: 2.10.2
+    chart_version: "{{ kube_prometheus_stack_loki_chart_version }}"
     release_name: loki
     release_namespace: "{{ kube_prometheus_stack_release_namespace }}"
-    release_values:
-      loki:
-        nodeSelector:
-          clusterrole: server
-        image:
-          tag: 2.9.3
-      grafana:
-        sidecar:
-          datasources:
-            enabled: false
-      promtail:
-        config:
-          snippets:
-            extraScrapeConfigs: |
-              - job_name: journal
-                journal:
-                  path: /var/log/journal
-                  max_age: 12h
-                  labels:
-                    job: systemd-journal
-                relabel_configs:
-                  - source_labels: ['__journal__systemd_unit']
-                    target_label: 'unit'
-                  - source_labels: ['__journal__hostname']
-                    target_label: 'hostname'
-                  - source_labels: ['__journal_priority_keyword']
-                    target_label: level
-        extraVolumes:
-          - name: journal
-            hostPath:
-              path: /var/log/journal
-          - name: machine-id
-            hostPath:
-              path: /etc/machine-id
-        extraVolumeMounts:
-          - name: journal
-            mountPath: /var/log/journal
-            readOnly: true
-          - name: machine-id
-            mountPath: /etc/machine-id
-            readOnly: true
+    release_values: "{{ kube_prometheus_stack_loki_release_values }}"
     wait: yes
 
 - name: Install kube-prometheus-stack on target Kubernetes cluster