From cd506cd96987042c7298e61a93717184bf4d1863 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Sat, 17 Jun 2023 10:49:16 +0200
Subject: [PATCH] feat: Setup a logging system

Loki + Promtail
---
 badhouseplants/helmfile.yaml                 | 10 ++++++++++
 badhouseplants/values/values.loki.yaml       |  7 +++++++
 badhouseplants/values/values.prometheus.yaml | 13 +++++++++++-
 badhouseplants/values/values.promtail.yaml   |  5 +++++
 releases.yaml                                | 21 ++++++++++++++++++++
 repositories.yaml                            |  4 ++--
 6 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 badhouseplants/values/values.loki.yaml
 create mode 100644 badhouseplants/values/values.promtail.yaml

diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml
index b2af28d..8dcacf1 100644
--- a/badhouseplants/helmfile.yaml
+++ b/badhouseplants/helmfile.yaml
@@ -50,6 +50,16 @@ releases:
   - <<: *prometheus
     installed: false
     namespace: monitoring-system
+    createNamespace: true
+
+  - <<: *loki
+    installed: true
+    namespace: monitoring-system
+    createNamespace: false
+
+  - <<: *promtail
+    installed: true
+    namespace: monitoring-system
     createNamespace: false
 
 bases:
diff --git a/badhouseplants/values/values.loki.yaml b/badhouseplants/values/values.loki.yaml
new file mode 100644
index 0000000..5feead7
--- /dev/null
+++ b/badhouseplants/values/values.loki.yaml
@@ -0,0 +1,7 @@
+---
+singleBinary:
+  replicas: 1
+loki:
+  auth_enabled: false
+  commonConfig:
+    replication_factor: 1
diff --git a/badhouseplants/values/values.prometheus.yaml b/badhouseplants/values/values.prometheus.yaml
index 04336ce..5f849b7 100644
--- a/badhouseplants/values/values.prometheus.yaml
+++ b/badhouseplants/values/values.prometheus.yaml
@@ -78,4 +78,15 @@ grafana:
         gnetId: 14584
         revision: 1
         datasource: Prometheus
-      
+  datasources:
+    loki.yaml:
+      apiVersion: 1
+      datasources:
+      - name: Loki
+        type: loki
+        access: proxy
+        uid: loki
+        editable: false
+        url: http://loki.monitoring-system:3100/
+        jsonData:
+          maxLines: 1000
diff --git a/badhouseplants/values/values.promtail.yaml b/badhouseplants/values/values.promtail.yaml
new file mode 100644
index 0000000..7846cec
--- /dev/null
+++ b/badhouseplants/values/values.promtail.yaml
@@ -0,0 +1,5 @@
+---
+config:
+  clients:
+    #    - url: http://loki.monitoring-system:3100
+    - url: http://loki-gateway/loki/api/v1/push
diff --git a/releases.yaml b/releases.yaml
index 1e4e690..08ed996 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -110,16 +110,37 @@ templates:
       - template: default-env-values
       - template: default-env-secrets
       - template: ext-istio-resource
+  
+  monitoring-common:
+    labels: 
+      bundle: monitoring
 
   prometheus: &prometheus
     name: prometheus
     chart: prometheus-community/kube-prometheus-stack
     version: 47.1.0
     inherit:
+      - template: monitoring-common
       - template: default-env-values
       - template: default-env-secrets
       - template: crd-management-hook
       - template: ext-istio-resource
+ 
+  loki: &loki
+    name: loki
+    chart: grafana/loki
+    version: 5.6.4
+    inherit:
+      - template: monitoring-common
+      - template: default-env-values
+
+  promtail: &promtail
+    name: promtail
+    chart: grafana/promtail
+    version: 6.11.3
+    inherit:
+      - template: monitoring-common
+      - template: default-env-values
   # ----------------------------
   # -- Istio
   # ----------------------------
diff --git a/repositories.yaml b/repositories.yaml
index 52838da..cef712f 100644
--- a/repositories.yaml
+++ b/repositories.yaml
@@ -26,9 +26,9 @@ repositories:
     url: https://argoproj.github.io/argo-helm
   - name: bedag
     url: https://bedag.github.io/helm-charts/
-  # - name: mailu
-    # url: https://mailu.github.io/helm-charts/
   - name: metallb
     url: https://metallb.github.io/metallb
   - name: prometheus-community
     url: https://prometheus-community.github.io/helm-charts
+  - name: grafana
+    url: https://grafana.github.io/helm-charts