Merge remote-tracking branch 'upstream/main' into helm-ui

grafana · Feb 17, 2025 · 4d39816 · 4d39816
2 parents 5537884 + 96b4e8f
commit 4d39816
Show file tree

Hide file tree

Showing 4 changed files with 445 additions and 278 deletions.
diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
@@ -6400,7 +6400,6 @@ null
       "bucket_name": null,
       "service_account": null
     },
-    "prefix": null,
     "s3": {
       "access_key_id": null,
       "endpoint": null,
@@ -6410,6 +6409,7 @@ null
       "secret_access_key": null,
       "sse": {}
     },
+    "storage_prefix": null,
     "type": "s3"
   },
   "s3": {