Merge pull request #3318 from tyriis/feature/loki-single-binary

tyriis · Oct 14, 2024 · 36c427d · 36c427d
2 parents b917357 + 4500776
commit 36c427d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 29 deletions.
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml
@@ -18,7 +18,7 @@ datasources:
   - name: Loki
     type: loki
     access: proxy
-    url: http://loki-gateway:80/
+    url: http://loki:3100/
   - name: GitHub
     type: grafana-github-datasource
     jsonData:

diff --git a/kubernetes/talos-flux/apps/observability/loki/app/helm-release.yaml b/kubernetes/talos-flux/apps/observability/loki/app/helm-release.yaml
@@ -29,7 +29,7 @@ spec:
   # https://artifacthub.io/packages/helm/grafana/loki?modal=values
   # https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml
   values:
-    deploymentMode: SimpleScalable
+    deploymentMode: SingleBinary
     loki:
       podAnnotations:
         secret.reloader.stakater.com/reload: loki-s3
@@ -72,32 +72,12 @@ spec:
           insecure: false
           s3ForcePathStyle: true
 
-    gateway:
-      image:
-        registry: ghcr.io
-      replicas: 2
-      ingress:
-        # use dedicated ingress definition
-        enabled: false
-      service:
-        labels:
-          prometheus.io/service-monitor: "false"
-
-    write:
-      replicas: 2
-      persistence:
-        size: 20Gi
-        storageClass: openebs-hostpath
-
-    read:
-      replicas: 2
-      extraVolumes:
-        - name: loki-rules
-          configMap:
-            name: loki-alerting-rules
-
-    backend:
+    singleBinary:
       replicas: 2
+      resources:
+        requests:
+          cpu: 10m
+          memory: 100Mi
       extraVolumes:
         - name: loki-rules
           configMap:
@@ -111,6 +91,18 @@ spec:
         searchNamespace: ALL
         folder: /rules/fake
 
+    backend:
+      replicas: 0
+    read:
+      replicas: 0
+    write:
+      replicas: 0
+    gateway:
+      enabled: false
+    chunksCache:
+      enabled: false
+    resultsCache:
+      enabled: false
     lokiCanary:
       enabled: false
     test:
@@ -126,7 +118,7 @@ spec:
       serviceMonitor:
         enabled: true
         metricsInstance:
-          enabled: false
+          enabled: true
 
   valuesFrom:
     - kind: Secret

diff --git a/kubernetes/talos-flux/apps/observability/promtail/app/helm-release.yaml b/kubernetes/talos-flux/apps/observability/promtail/app/helm-release.yaml
@@ -21,7 +21,7 @@ spec:
 
     config:
       clients:
-        - url: http://loki-gateway/loki/api/v1/push
+        - url: http://loki/loki/api/v1/push
         - url: "https://${SECRET_GRAFANA_CLOUD_INSTANCE_ID}:${SECRET_GRAFANA_CLOUD_API_KEY}@logs-prod-us-central1.grafana.net/loki/api/v1/push"
     serviceMonitor:
       enabled: true