Merge branch 'develop'

meysamhadeli · Dec 8, 2023 · 39626a2 · 39626a2
2 parents 2f604ae + 8c50440
commit 39626a2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -436,4 +436,4 @@ fabric.properties
 *.jwk
 
 # Monitoring
-*.db
+.grafana-data
diff --git a/...yments/docker-compose/infrastracture.yaml → ...yments/docker-compose/infrastructure.yaml b/...yments/docker-compose/infrastracture.yaml → ...yments/docker-compose/infrastructure.yaml
diff --git a/deployments/docker-compose/monitoring/grafana-data/data/alerting/1/__default__.tmpl b/deployments/docker-compose/monitoring/grafana-data/data/alerting/1/__default__.tmpl
diff --git a/deployments/docker-compose/monitoring/grafana-data/data/grafana.db b/deployments/docker-compose/monitoring/grafana-data/data/grafana.db
-Original file line number
+Diff line change
@@ Expand Up / @@ -436,4 +436,4 @@ fabric.properties @@
     *.jwk
     # Monitoring
-    *.db
+    .grafana-data