Undo changes

grafana · Sep 11, 2024 · d106cf3 · d106cf3
1 parent be05b32
commit d106cf3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/development/mimir-read-write-mode/config/mimir.yaml b/development/mimir-read-write-mode/config/mimir.yaml
@@ -56,7 +56,6 @@ alertmanager:
   data_dir: /data/alertmanager
   fallback_config_file: ./config/alertmanager-fallback-config.yaml
   external_url: http://localhost:8006/alertmanager
-  grafana_alertmanager_compatibility_enabled: true
 
 alertmanager_storage:
   s3:

diff --git a/development/mimir-read-write-mode/docker-compose.jsonnet b/development/mimir-read-write-mode/docker-compose.jsonnet
@@ -6,10 +6,10 @@ std.manifestYamlDoc({
     self.backend +
     self.nginx +
     self.minio +
-    //self.grafana +
-    //self.grafana_agent +
+    self.grafana +
+    self.grafana_agent +
     self.memcached +
-    //self.prometheus +
+    self.prometheus +
     {},
 
   write:: {

diff --git a/development/mimir-read-write-mode/docker-compose.yml b/development/mimir-read-write-mode/docker-compose.yml
@@ -1,4 +1,23 @@
 "services":
+  "grafana":
+    "environment":
+      - "GF_AUTH_ANONYMOUS_ENABLED=true"
+      - "GF_AUTH_ANONYMOUS_ORG_ROLE=Admin"
+    "image": "grafana/grafana:10.4.3"
+    "ports":
+      - "3000:3000"
+    "volumes":
+      - "./config/datasource-mimir.yaml:/etc/grafana/provisioning/datasources/mimir.yaml"
+  "grafana-agent":
+    "command":
+      - "-config.file=/etc/agent-config/grafana-agent.yaml"
+      - "-metrics.wal-directory=/tmp"
+      - "-server.http.address=127.0.0.1:9091"
+    "image": "grafana/agent:v0.37.3"
+    "ports":
+      - "9091:9091"
+    "volumes":
+      - "./config:/etc/agent-config"
   "memcached":
     "image": "memcached:1.6.19-alpine"
   "mimir-backend-1":
@@ -166,4 +185,13 @@
       - "8080:8080"
     "volumes":
       - "../common/config:/etc/nginx/templates"
-"version": "3.4"
+  "prometheus":
+    "command":
+      - "--config.file=/etc/prometheus/prometheus.yaml"
+      - "--enable-feature=exemplar-storage"
+      - "--enable-feature=native-histograms"
+    "image": "prom/prometheus:v2.53.0"
+    "ports":
+      - "9090:9090"
+    "volumes":
+      - "./config:/etc/prometheus"