update README.md

Signed-off-by: Weifeng Wang <[email protected]> Fix(all-in-one): Load rules to mimir Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Mar 8, 2024 · 90de7e8 · 90de7e8
1 parent 6b04954
commit 90de7e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ These instructions will get you through the deploying samples with Docker Compos
 ```shell
 git clone https://github.com/qclaogui/codelab-monitoring.git && cd "$(basename "$_" .git)"
 
-make up-monolithic-mode-metrics
+make up-monolithic-mode-all-in-one
 ```
 
 That's it.
@@ -72,7 +72,7 @@ Navigate to [http://localhost:3000/explore](http://localhost:3000/explore) and s
 ### Clean up(docker-compose)
 
 ```shell
-make down-monolithic-mode-metrics
+make down-monolithic-mode-all-in-one
 ```
 
 ## Kubernetes

diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
@@ -58,19 +58,23 @@ services:
         aliases:
           - mimir-memberlist
 
-  load-mimir-rules:
+  load-rules-to-mimir:
     depends_on:
       mimir:
         condition: service_healthy
     image: grafana/mimirtool:2.11.0
     volumes:
       - ../../../monitoring-mixins/mimir-mixin/deploy/rules.yaml:/mimir-mixin/rules.yaml
       - ../../../monitoring-mixins/mimir-mixin/deploy/alerts.yaml:/mimir-mixin/alerts.yaml
+      - ../../../monitoring-mixins/loki-mixin/deploy/rules.yaml:/loki-mixin/rules.yaml
+      - ../../../monitoring-mixins/loki-mixin/deploy/alerts.yaml:/loki-mixin/alerts.yaml
+      # - ../../../monitoring-mixins/tempo-mixin/deploy/rules.yaml:/tempo-mixin/rules.yaml
+      # - ../../../monitoring-mixins/tempo-mixin/deploy/alerts.yaml:/tempo-mixin/alerts.yaml
     environment:
       - MIMIR_ADDRESS=http://mimir:8080
       - MIMIR_TENANT_ID=anonymous
     command: >-
-      rules load /mimir-mixin/rules.yaml /mimir-mixin/alerts.yaml
+      rules load /mimir-mixin/rules.yaml /mimir-mixin/alerts.yaml /loki-mixin/rules.yaml /loki-mixin/alerts.yaml
 
   loki:
     depends_on:
@@ -95,20 +99,6 @@ services:
         aliases:
           - loki-memberlist
 
-  load-loki-rules:
-    depends_on:
-      loki:
-        condition: service_healthy
-    image: grafana/mimirtool:2.11.0
-    volumes:
-      - ../../../monitoring-mixins/loki-mixin/deploy/rules.yaml:/loki-mixin/rules.yaml
-      - ../../../monitoring-mixins/loki-mixin/deploy/alerts.yaml:/loki-mixin/alerts.yaml
-    environment:
-      - MIMIR_ADDRESS=http://mimir:8080
-      - MIMIR_TENANT_ID=anonymous
-    command: >-
-      rules load /loki-mixin/rules.yaml /loki-mixin/alerts.yaml
-
   tempo:
     depends_on:
       minio:
@@ -134,20 +124,6 @@ services:
       timeout: 5s
       retries: 5
 
-  load-tempo-rules:
-    depends_on:
-      tempo:
-        condition: service_healthy
-    image: grafana/mimirtool:2.11.0
-    volumes:
-      - ../../../monitoring-mixins/tempo-mixin/deploy/rules.yaml:/tempo-mixin/rules.yaml
-      - ../../../monitoring-mixins/tempo-mixin/deploy/alerts.yaml:/tempo-mixin/alerts.yaml
-    environment:
-      - MIMIR_ADDRESS=http://mimir:8080
-      - MIMIR_TENANT_ID=anonymous
-    command: >-
-      rules load /tempo-mixin/rules.yaml /tempo-mixin/alerts.yaml
-
   pyroscope:
     depends_on:
       minio: