Merge branch 'grafana-main' into feat/zone-redundancy

grafana · Oct 6, 2024 · c718a84 · c718a84
2 parents 78013e5 + 3a7614f
commit c718a84
Show file tree

Hide file tree

Showing 696 changed files with 44,436 additions and 16,703 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "grafana/loki-build-image:0.33.6",
+  "image": "grafana/loki-build-image:0.34.0",
   "containerEnv": {
     "BUILD_IN_CONTAINER": "false"
   },

diff --git a/.drone/docker-manifest-build-image.tmpl b/.drone/docker-manifest-build-image.tmpl
diff --git a/.drone/docker-manifest-ecr.tmpl b/.drone/docker-manifest-ecr.tmpl
diff --git a/.drone/docker-manifest-operator.tmpl b/.drone/docker-manifest-operator.tmpl
diff --git a/.drone/docker-manifest.tmpl b/.drone/docker-manifest.tmpl