Rename from load-rules-to-mimir.yaml to mimirtool.yaml

Signed-off-by: Weifeng Wang <[email protected]> update .gitignore Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Apr 1, 2024 · 1487327 · 1487327
1 parent 204da64
commit 1487327
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 12 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -16,7 +16,7 @@ version: '3.9'
 include:
   - path: ./docker-compose/common/compose-include/minio.yaml
   - path: ./docker-compose/common/compose-include/memcached.yaml
-  - path: ./docker-compose/common/compose-include/load-rules-to-mimir.yaml
+  - path: ./docker-compose/common/compose-include/mimirtool.yaml
   #  Grafana LGTMP Stack Components
   - path: ./docker-compose/common/compose-include/loki.yaml
   - path: ./docker-compose/common/compose-include/grafana-agent.yaml

diff --git a/docker-compose/common/compose-include/mimir.yaml b/docker-compose/common/compose-include/mimir.yaml
@@ -2,7 +2,7 @@
 # Note: 
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
 include:
-  - path: load-rules-to-mimir.yaml
+  - path: ./mimirtool.yaml
 
 services:
   mimir:

diff --git a/.../compose-include/load-rules-to-mimir.yaml → ...ose/common/compose-include/mimirtool.yaml b/.../compose-include/load-rules-to-mimir.yaml → ...ose/common/compose-include/mimirtool.yaml
@@ -1,5 +1,5 @@
 services:
-  load-rules-to-mimir:
+  mimirtool:
     # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
     labels:
       metrics.agent.grafana.com/scrape: false

diff --git a/docker-compose/common/config/agent-flow/.gitignore b/docker-compose/common/config/agent-flow/.gitignore
@@ -0,0 +1,8 @@
+*
+!.gitignore
+!modules
+!logs.river
+!metrics.river
+!monolithic-mode-all.river
+!profiles.river
+!traces.river
diff --git a/docker-compose/common/config/grafana/provisioning/alerting/.gitignore b/docker-compose/common/config/grafana/provisioning/alerting/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!cp-wangweifeng.yaml
+!mti_wangweifeng.yaml
+!np-wangweifeng.yaml
diff --git a/docker-compose/common/config/grafana/provisioning/alerting/cp-wangweifeng.yaml b/docker-compose/common/config/grafana/provisioning/alerting/cp-wangweifeng.yaml
@@ -7,14 +7,20 @@ contactPoints:
   - orgId: 1
     name: cp_wangweifeng
     receivers:
-      # - uid: cp_slack_wangweifeng
+      # - uid: slack_wangweifeng
       #   type: slack
       #   disableResolveMessage: false
       #   settings:
       #     url: ${SLACK_WEBHOOK_URL}
-      - uid: cp_email_wangweifeng
+      - uid: email_wangweifeng
         type: email
         disableResolveMessage: false
         settings:
           singleEmail: false
-          addresses: [email protected];[email protected]
+          addresses: [email protected]
+      - uid: email_team_infra
+        type: email
+        disableResolveMessage: false
+        settings:
+          singleEmail: false
+          addresses: [email protected];[email protected]
diff --git a/docker-compose/common/config/grafana/provisioning/dashboards/.gitignore b/docker-compose/common/config/grafana/provisioning/dashboards/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!dashboards.yaml
diff --git a/docker-compose/microservices-mode/metrics/compose.yaml b/docker-compose/microservices-mode/metrics/compose.yaml
@@ -9,7 +9,7 @@ version: '3.9'
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
-  - path: ../../common/compose-include/load-rules-to-mimir.yaml
+  - path: ../../common/compose-include/mimirtool.yaml
   - path: ../../common/compose-include/grafana-agent.yaml
   - path: ../../common/compose-include/grafana.yaml
 

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -9,7 +9,7 @@ version: '3.9'
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
-  - path: ../../common/compose-include/load-rules-to-mimir.yaml
+  - path: ../../common/compose-include/mimirtool.yaml
   - path: ../../common/compose-include/inbucket.yaml
 
 # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md

diff --git a/docker-compose/monolithic-mode/metrics/compose.yaml b/docker-compose/monolithic-mode/metrics/compose.yaml
@@ -9,7 +9,7 @@ version: '3.9'
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
-  - path: ../../common/compose-include/load-rules-to-mimir.yaml
+  - path: ../../common/compose-include/mimirtool.yaml
   - path: ../../common/compose-include/grafana.yaml
 
 services:

diff --git a/docker-compose/read-write-mode/metrics/compose.yaml b/docker-compose/read-write-mode/metrics/compose.yaml
@@ -9,7 +9,7 @@ version: '3.9'
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
-  - path: ../../common/compose-include/load-rules-to-mimir.yaml
+  - path: ../../common/compose-include/mimirtool.yaml
   - path: ../../common/compose-include/grafana-agent.yaml
   - path: ../../common/compose-include/grafana.yaml
 

diff --git a/examples/grafana-oncall/config/grafana/provisioning/datasources/redis.yaml b/examples/grafana-oncall/config/grafana/provisioning/datasources/redis.yaml
@@ -9,8 +9,7 @@ datasources:
   type: redis-datasource
   access: proxy
   orgId: 1
-  isDefault: true
-  version: 1
+  isDefault: false
   # url: redis://host.docker.internal:6379
   url: redis://redis:6379/0
   jsonData: