Merge branch 'main' into sync-grafana-agent

.drone/pipelines/build_images.jsonnet

@@ -17,6 +17,10 @@ local locals = {
 };
 
 [
+  // TODO(rfratto): The following are temporarily diasbled as grafana/alloy
+  // gets set up.
+
+  /*
   pipelines.linux('Create Linux build image') {
     trigger: locals.on_build_image_tag,
     steps: [{
@@ -88,4 +92,5 @@ local locals = {
       host: { path: '//./pipe/docker_engine/' },
     }],
   },
+  */
 ]

.drone/pipelines/publish.jsonnet

@@ -91,6 +91,12 @@ local windows_containers_jobs = std.map(function(container) (
   }
 ), windows_containers);
 
+// TODO(rfratto): The following are TEMPORARILY disabled as grafana/alloy gets
+// set up. Remove the line below in favor of the comment block to reenable the
+// publish jobs.
+[]
+
+/*
 linux_containers_jobs + windows_containers_jobs + [
   pipelines.linux('Deploy to deployment_tools') {
     trigger: {
@@ -196,3 +202,4 @@ linux_containers_jobs + windows_containers_jobs + [
     }],
   },
 ]
+*/

Makefile

@@ -340,7 +340,7 @@ endif
 .PHONY: drone
 drone: generate-drone
 	drone lint .drone/drone.yml --trusted
-	drone --server https://drone.grafana.net sign --save grafana/agent .drone/drone.yml
+	drone --server https://drone.grafana.net sign --save grafana/alloy .drone/drone.yml
 
 .PHONY: clean
 clean: clean-dist clean-build-container-cache

docs/developer/release/1-create-release-branch.md

@@ -14,13 +14,13 @@ Patch Releases for that major pr minor version of the agent.
 
 2. Create and push the release branch from the selected base commit:
 
-    The name of the release branch should be `release-VERSION_PREFIX`
-    defined above, such as `release-v0.31`.
+    The name of the release branch should be `release/VERSION_PREFIX`
+    defined above, such as `release/v0.31`.
 
-        > **NOTE**: Branches are only made for VERSION_PREFIX; do not create branches for the full VERSION such as `release-v0.31-rc.0` or `release-v0.31.0`.
+        > **NOTE**: Branches are only made for VERSION_PREFIX; do not create branches for the full VERSION such as `release/v0.31-rc.0` or `release/v0.31.0`.
 
     - If the consensus commit is the latest commit from main you can branch from main.
     - If the consensus commit is not the latest commit from main, branch from that instead.
 
     > **NOTE**: Don't create any other branches that are prefixed with `release` when creating PRs or
-    those branches will collide with our automated release build publish rules.
+    those branches will collide with our automated release build publish rules.

docs/developer/release/3-update-version-in-code.md

@@ -40,7 +40,7 @@ The project must be updated to reference the upcoming release tag whenever a new
     - Stable Release example PR [here](https://github.com/grafana/agent/pull/3119)
     - Patch Release example PR [here](https://github.com/grafana/agent/pull/3191)
 
-4. Create a branch from `release-VERSION_PREFIX` for [grafana/agent](https://github.com/grafana/agent).
+4. Create a branch from `release/VERSION_PREFIX` for [grafana/agent](https://github.com/grafana/agent).
 
 5. Cherry pick the commit on main from the merged PR in Step 3 from main into the new branch from Step 4:
 
@@ -50,9 +50,9 @@ The project must be updated to reference the upcoming release tag whenever a new
 
     Delete the `Main (unreleased)` header and anything underneath it as part of the cherry-pick. Alternatively, do it after the cherry-pick is completed.
 
-6. Create a PR to merge to `release-VERSION_PREFIX` (must be merged before continuing).
+6. Create a PR to merge to `release/VERSION_PREFIX` (must be merged before continuing).
 
     - Release Candidate example PR [here](https://github.com/grafana/agent/pull/3066)
     - Stable Release example PR [here](https://github.com/grafana/agent/pull/3123)
     - Patch Release example PR [here](https://github.com/grafana/agent/pull/3193)
-        - The `CHANGELOG.md` was updated in cherry-pick commits prior for this example. Make sure it is all set on this PR.
+        - The `CHANGELOG.md` was updated in cherry-pick commits prior for this example. Make sure it is all set on this PR.