Add the ability to set --cluster.name in the Helm chart (#1367)

* Add the ability to set --cluster.name in the Helm chart with alloy.clustering.name Signed-off-by: Pete Wall <pete.wall@grafana.com> * Update helm docs --------- Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Aug 13, 2024 · 800739f · 800739f
1 parent c9a9037
commit 800739f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md
@@ -10,6 +10,10 @@ internal API changes are not present.
 Unreleased
 ----------
 
+### Enhancements
+
+- Add the ability to set --cluster.name in the Helm chart with alloy.clustering.name. (@petewall)
+
 0.6.0 (2024-08-05)
 ------------------
 

diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md
@@ -34,6 +34,7 @@ useful if just using the default DaemonSet isn't sufficient.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | alloy.clustering.enabled | bool | `false` | Deploy Alloy in a cluster to allow for load distribution. |
+| alloy.clustering.name | string | `""` | Name for the Alloy cluster. Used for differentiating between clusters. |
 | alloy.clustering.portName | string | `"http"` | Name for the port used for clustering, useful if running inside an Istio Mesh |
 | alloy.configMap.content | string | `""` | Content to assign to the new ConfigMap.  This is passed into `tpl` allowing for templating from values. |
 | alloy.configMap.create | bool | `true` | Create a new ConfigMap for the config file. |

diff --git a/operations/helm/charts/alloy/templates/containers/_agent.yaml b/operations/helm/charts/alloy/templates/containers/_agent.yaml
@@ -15,6 +15,9 @@
     {{- if $values.clustering.enabled }}
     - --cluster.enabled=true
     - --cluster.join-addresses={{ include "alloy.fullname" . }}-cluster
+    {{- if $values.clustering.name }}
+    - --cluster.name={{ $values.clustering.name | quote }}
+    {{- end}}
     {{- end}}
     {{- if $values.stabilityLevel }}
     - --stability.level={{ $values.stabilityLevel }}

diff --git a/operations/helm/charts/alloy/values.yaml b/operations/helm/charts/alloy/values.yaml
@@ -41,6 +41,9 @@ alloy:
     # -- Deploy Alloy in a cluster to allow for load distribution.
     enabled: false
 
+    # -- Name for the Alloy cluster. Used for differentiating between clusters.
+    name: ""
+
     # -- Name for the port used for clustering, useful if running inside an Istio Mesh
     portName: http