Merge branch 'main' of https://github.com/mariodietner/loki

mariodietner · Jan 15, 2024 · ccf8749 · ccf8749
2 parents 1b035d3 + ed762c8
commit ccf8749
Show file tree

Hide file tree

Showing 3 changed files with 495 additions and 109 deletions.
diff --git a/operator/config/overlays/development/manager_related_image_patch.yaml b/operator/config/overlays/development/manager_related_image_patch.yaml
@@ -9,6 +9,6 @@ spec:
         - name: manager
           env:
           - name: RELATED_IMAGE_LOKI
-            value: lzasirsubacr.azurecr.io/codit/loki:latest
+            value: docker.io/grafana/loki:2.9.3
           - name: RELATED_IMAGE_GATEWAY
             value: quay.io/observatorium/api:latest
diff --git a/operator/hack/lokistack_dev.yaml b/operator/hack/lokistack_dev.yaml
@@ -8,9 +8,6 @@ spec:
     selector:
       matchLabels: 
         app.kubernetes.io/name: loki-alerts
-  alertmanager:
-    Endpoints:
-      - http://promgraf-kube-prometheus-s-alertmanager.monitoring:9093
   size: 1x.demo
   storage:
     schemas: