Merge pull request #94 from qclaogui:loki-3.0.0

Bump Loki to 3.0.0
qclaogui · Apr 10, 2024 · ab0cda0 · ab0cda0
2 parents 419faac + adc1aa4
commit ab0cda0
Show file tree

Hide file tree

Showing 66 changed files with 31,132 additions and 29,471 deletions.
diff --git a/Makefile b/Makefile
@@ -269,6 +269,7 @@ deploy-grafana: deploy-prometheus-operator-crds deploy-minio deploy-gateway
 	$(info ******************** deploy grafana manifests ********************)
 	@kubectl apply -f kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
 delete-grafana:
+	@kubectl delete --ignore-not-found -f monitoring-mixins/k8s-all-in-one.yaml
 	@kubectl delete --ignore-not-found -f kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
 
 define echo_info

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,5 +1,5 @@
 AGENT_IMAGE=grafana/agent:v0.40.3
-LOKI_IMAGE=grafana/loki:2.9.6
+LOKI_IMAGE=grafana/loki:3.0.0
 GRAFANA_IMAGE=grafana/grafana:11.0.0-preview
 TEMPO_IMAGE=grafana/tempo:2.4.1
 MIMIR_IMAGE=grafana/mimir:2.12.0

diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml
@@ -27,7 +27,6 @@ common:
 
 compactor:
   working_directory: /tmp/compactor
-  shared_store: s3
 
 memberlist:
   join_members:

diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml
@@ -27,7 +27,6 @@ common:
 
 compactor:
   working_directory: /tmp/compactor
-  shared_store: s3
 
 memberlist:
   join_members:

diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml
@@ -27,7 +27,6 @@ common:
 
 compactor:
   working_directory: /tmp/compactor
-  shared_store: s3
 
 memberlist:
   join_members: