helm: rename charts/grafana-agent to charts/alloy

.github/workflows/helm-release.yml.disabled

@@ -130,7 +130,7 @@ jobs:
 
       # Note that this creates a release in grafana/helm-charts with a new tag.
       # The tag name in grafana/helm-charts is <package>-<version>, while the
-      # tag name for grafana/agent is helm-chart/<version>.
+      # tag name for grafana/alloy is helm-chart/<version>.
       - name: Make github release
         uses: softprops/action-gh-release@v1
         with:

.github/workflows/helm-test.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Regenerate docs
         run: |
           docker run --rm \
-            -v "$(pwd)/operations/helm/charts/grafana-agent:/helm-docs" \
+            -v "$(pwd)/operations/helm/charts/alloy:/helm-docs" \
             -u "$(id -u)" \
             jnorwood/helm-docs
           if ! git diff --exit-code; then

Makefile

@@ -229,7 +229,7 @@ generate-helm-docs:
 ifeq ($(USE_CONTAINER),1)
 	$(RERUN_IN_CONTAINER)
 else
-	cd operations/helm/charts/grafana-agent && helm-docs
+	cd operations/helm/charts/alloy && helm-docs
 endif
 
 generate-helm-tests:

docs/sources/tasks/configure/configure-kubernetes.md

@@ -19,7 +19,7 @@ To configure {{< param "PRODUCT_NAME" >}} on Kubernetes, perform the following s
 1. Run the following command in a terminal to upgrade your {{< param "PRODUCT_NAME" >}} installation:
 
    ```shell
-   helm upgrade RELEASE_NAME grafana/grafana-agent -f VALUES_PATH
+   helm upgrade RELEASE_NAME grafana/alloy -f VALUES_PATH
    ```
 
    1. Replace `RELEASE_NAME` with the name you used for your {{< param "PRODUCT_NAME" >}} installation.
@@ -38,12 +38,12 @@ The following is an example snippet of a `kustomization` that disables this beha
 
 ```yaml
 configMapGenerator:
-  - name: grafana-agent
+  - name: alloy
     files:
       - config.river
     options:
       disableNameSuffixHash: true
 ```
-[values.yaml]: https://raw.githubusercontent.com/grafana/agent/main/operations/helm/charts/grafana-agent/values.yaml
-[Helm chart]: https://github.com/grafana/agent/tree/main/operations/helm/charts/grafana-agent
+[values.yaml]: https://raw.githubusercontent.com/grafana/alloy/main/operations/helm/charts/alloy/values.yaml
+[Helm chart]: https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy
 [Kustomize]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/

docs/sources/tasks/migrate/from-operator.md

@@ -279,7 +279,7 @@ However, all static mode integrations have an equivalent component in the [`prom
 The [reference documentation][component documentation] should help convert those integrations to their {{< param "PRODUCT_NAME" >}} equivalent.
 
 <!-- ToDo: Validate path -->
-[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/grafana-agent/values.yaml
+[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml
 [clustering]: ../../../concepts/clustering/
 [deployment guide]: ../../../get-started/deploy-alloy
 <!-- ToDo: check link syntax -->

internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2/doc.go

@@ -2,6 +2,6 @@
 // +groupName=monitoring.grafana.com
 
 //go:generate controller-gen object paths=.
-//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/grafana-agent/crds
+//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/alloy/crds
 
 package v1alpha2

operations/helm/Makefile

@@ -1,6 +1,6 @@
 # Docs generated by https://github.com/norwoodj/helm-docs
 docs:
-	cd charts/grafana-agent && helm-docs
+	cd charts/alloy && helm-docs
 
 rebuild-tests:
 	bash ./scripts/rebuild-tests.sh

operations/helm/README.md

@@ -11,7 +11,7 @@ correctness of the templates emitted by the Helm chart. To regenerate this
 folder, call `make rebuild-tests` from the root of the repository.
 
 `make generate-helm-tests` will iterate through the value.yaml files in
-`charts/grafana-agent/ci` and generate each one as a separate directory under `charts/grafana-agent/tests`.
+`charts/alloy/ci` and generate each one as a separate directory under `charts/alloy/tests`.
 
 When modifying the Helm charts, `make rebuild-tests` must be run before
 submitting a PR, as a linter check will ensure that this directory is

operations/helm/charts/grafana-agent/Chart.yaml → operations/helm/charts/alloy/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: grafana-agent
+name: alloy
 description: 'Grafana Alloy'
 type: application
 version: 0.36.0

operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/configmap.yaml → operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml

@@ -1,13 +1,13 @@
 ---
-# Source: grafana-agent/templates/configmap.yaml
+# Source: alloy/templates/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 data:

operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml → operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml

@@ -1,30 +1,30 @@
 ---
-# Source: grafana-agent/templates/controllers/daemonset.yaml
+# Source: alloy/templates/controllers/daemonset.yaml
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 spec:
   minReadySeconds: 10
   selector:
     matchLabels:
-      app.kubernetes.io/name: grafana-agent
-      app.kubernetes.io/instance: grafana-agent
+      app.kubernetes.io/name: alloy
+      app.kubernetes.io/instance: alloy
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: alloy
       labels:
-        app.kubernetes.io/name: grafana-agent
-        app.kubernetes.io/instance: grafana-agent
+        app.kubernetes.io/name: alloy
+        app.kubernetes.io/instance: alloy
     spec:
-      serviceAccountName: grafana-agent
+      serviceAccountName: alloy
       containers:
         - name: alloy
           image: docker.io/grafana/alloy:v0.40.2
@@ -71,4 +71,4 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: grafana-agent
+            name: alloy

operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml → operations/helm/tests/additional-serviceaccount-label/alloy/templates/rbac.yaml

@@ -1,13 +1,13 @@
 ---
-# Source: grafana-agent/templates/rbac.yaml
+# Source: alloy/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 rules:
@@ -96,22 +96,22 @@ rules:
     resources: ["replicasets"]
     verbs: ["get", "list", "watch"]
 ---
-# Source: grafana-agent/templates/rbac.yaml
+# Source: alloy/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: grafana-agent
+  name: alloy
 subjects:
   - kind: ServiceAccount
-    name: grafana-agent
+    name: alloy
     namespace: default

operations/helm/tests/clustering/grafana-agent/templates/service.yaml → operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml

@@ -1,20 +1,20 @@
 ---
-# Source: grafana-agent/templates/service.yaml
+# Source: alloy/templates/service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
   selector:
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
   internalTrafficPolicy: Cluster
   ports:
     - name: http-metrics

operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml

@@ -0,0 +1,14 @@
+---
+# Source: alloy/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: alloy
+  namespace: default
+  labels:
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
+    app.kubernetes.io/version: "vX.Y.Z"
+    app.kubernetes.io/managed-by: Helm
+    test: "true"

operations/helm/tests/clustering/grafana-agent/templates/cluster_service.yaml → operations/helm/tests/clustering/alloy/templates/cluster_service.yaml

@@ -1,21 +1,21 @@
 ---
-# Source: grafana-agent/templates/cluster_service.yaml
+# Source: alloy/templates/cluster_service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: grafana-agent-cluster
+  name: alloy-cluster
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
   clusterIP: 'None'
   selector:
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
   ports:
     # Do not include the -metrics suffix in the port name, otherwise metrics
     # can be double-collected with the non-headless Service if it's also

operations/helm/tests/controller-volumes-extra/grafana-agent/templates/configmap.yaml → operations/helm/tests/clustering/alloy/templates/configmap.yaml

@@ -1,13 +1,13 @@
 ---
-# Source: grafana-agent/templates/configmap.yaml
+# Source: alloy/templates/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 data:

operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml → operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml

@@ -1,33 +1,33 @@
 ---
-# Source: grafana-agent/templates/controllers/statefulset.yaml
+# Source: alloy/templates/controllers/statefulset.yaml
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: grafana-agent
+  name: alloy
   labels:
-    helm.sh/chart: grafana-agent
-    app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/instance: grafana-agent
+    helm.sh/chart: alloy
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 3
   podManagementPolicy: Parallel
   minReadySeconds: 10
-  serviceName: grafana-agent
+  serviceName: alloy
   selector:
     matchLabels:
-      app.kubernetes.io/name: grafana-agent
-      app.kubernetes.io/instance: grafana-agent
+      app.kubernetes.io/name: alloy
+      app.kubernetes.io/instance: alloy
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: alloy
       labels:
-        app.kubernetes.io/name: grafana-agent
-        app.kubernetes.io/instance: grafana-agent
+        app.kubernetes.io/name: alloy
+        app.kubernetes.io/instance: alloy
     spec:
-      serviceAccountName: grafana-agent
+      serviceAccountName: alloy
       containers:
         - name: alloy
           image: docker.io/grafana/alloy:v0.40.2
@@ -39,7 +39,7 @@ spec:
             - --server.http.listen-addr=0.0.0.0:80
             - --server.http.ui-path-prefix=/
             - --cluster.enabled=true
-            - --cluster.join-addresses=grafana-agent-cluster
+            - --cluster.join-addresses=alloy-cluster
           env:
             - name: AGENT_DEPLOY_MODE
               value: "helm"
@@ -76,4 +76,4 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: grafana-agent
+            name: alloy