From fa222c92f5a275f51dffb4f45997a23ef729433c Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Wed, 8 May 2024 15:42:42 +0100 Subject: [PATCH 1/7] Allow to override the cluster service port name This will be needed for an Istio mesh based installation due to this issue with headless services + Istio - https://istio.io/latest/docs/ops/common-problems/network-issues/#503-error-while-accessing-headless-services --- operations/helm/charts/alloy/templates/cluster_service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/helm/charts/alloy/templates/cluster_service.yaml b/operations/helm/charts/alloy/templates/cluster_service.yaml index 1bc940b780..19063d4243 100644 --- a/operations/helm/charts/alloy/templates/cluster_service.yaml +++ b/operations/helm/charts/alloy/templates/cluster_service.yaml @@ -18,7 +18,7 @@ spec: # # This service should only be used for clustering, and not metric # collection. - - name: http + - name: {{ coalesce $values.clustering.portName "http" }} port: {{ $values.listenPort }} targetPort: {{ $values.listenPort }} protocol: "TCP" From 9654accfd3182bd59f9b97cdd100a2a1c3b6b866 Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Fri, 10 May 2024 09:26:04 +0100 Subject: [PATCH 2/7] Update values.yaml --- operations/helm/charts/alloy/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/operations/helm/charts/alloy/values.yaml b/operations/helm/charts/alloy/values.yaml index 5107e9f896..50a031562c 100644 --- 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 port used for clustering, useful if running inside an Istio Mesh + portName: null + # -- Minimum stability level of components and behavior to enable. Must be # one of "experimental", "public-preview", or "generally-available". stabilityLevel: "generally-available" From 252b953a85a229dc63d4ecd67ab8acdb0653d544 Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Fri, 10 May 2024 09:41:31 +0100 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3baa7f3a7..617ddda0d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ Main (unreleased) - Upgrading `pyroscope/ebpf` from 0.4.6 to 0.4.7 (@korniltsev): * detect libc version properly when libc file name is libc-2.31.so and not libc.so.6 * treat elf files with short build id (8 bytes) properly + +- Fix clustering on instances running within Istio mesh by allowing to change the name of the clustering port v1.1.0-rc.0 ----------- From 71172b85164a1866859268152be25394526f0b93 Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Thu, 16 May 2024 14:01:11 +0100 Subject: [PATCH 4/7] Take on board suggestions from upstream --- CHANGELOG.md | 2 -- operations/helm/charts/alloy/CHANGELOG.md | 4 ++++ operations/helm/charts/alloy/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1164b4526..936aed6d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,8 +29,6 @@ Main (unreleased) This port can be configured with `--server.http.listen-addr` or using the default listen address`127.0.0.1:12345`. (@mattdurham) -- Fix clustering on instances running within Istio mesh by allowing to change the name of the clustering port - v1.1.0-rc.0 ----------- diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md index 09bfa9e660..4b9756e4f8 100644 --- 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 ---------- +### Bugfixes + +- Fix clustering on instances running within Istio mesh by allowing to change the name of the clustering port + 0.3.0 (2024-05-14) ------------------ diff --git a/operations/helm/charts/alloy/values.yaml b/operations/helm/charts/alloy/values.yaml index 50a031562c..bd306fc273 100644 --- a/operations/helm/charts/alloy/values.yaml +++ b/operations/helm/charts/alloy/values.yaml @@ -42,7 +42,7 @@ alloy: enabled: false # -- Name for the port used for clustering, useful if running inside an Istio Mesh - portName: null + portName: http # -- Minimum stability level of components and behavior to enable. Must be # one of "experimental", "public-preview", or "generally-available". From 28374d4e86d8f2812b43bb94a35a3d3f68281f82 Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Thu, 16 May 2024 14:02:52 +0100 Subject: [PATCH 5/7] Take on board further suggestions Co-authored-by: Robert Fratto --- operations/helm/charts/alloy/templates/cluster_service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/helm/charts/alloy/templates/cluster_service.yaml b/operations/helm/charts/alloy/templates/cluster_service.yaml index e319dc48fd..a62e8fdda6 100644 --- a/operations/helm/charts/alloy/templates/cluster_service.yaml +++ b/operations/helm/charts/alloy/templates/cluster_service.yaml @@ -19,7 +19,7 @@ spec: # # This service should only be used for clustering, and not metric # collection. - - name: {{ coalesce $values.clustering.portName "http" }} + - name: {{ $values.clustering.portName }} port: {{ $values.listenPort }} targetPort: {{ $values.listenPort }} protocol: "TCP" From 165293c29eabba1f75db63ea3006b49c546cf625 Mon Sep 17 00:00:00 2001 From: josh-thisisbud Date: Thu, 16 May 2024 14:05:42 +0100 Subject: [PATCH 6/7] Fix changelog bits coming from the rc period --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 936aed6d7b..e748832655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,9 +29,6 @@ Main (unreleased) This port can be configured with `--server.http.listen-addr` or using the default listen address`127.0.0.1:12345`. (@mattdurham) -v1.1.0-rc.0 ------------ - ### Other changes - `prometheus.exporter.snmp`: Updating SNMP exporter from v0.24.1 to v0.26.0. From 2e49aaa50098a1063d8c9d1c97eae577369bb479 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Thu, 16 May 2024 09:07:49 -0400 Subject: [PATCH 7/7] `make generate-helm-docs` --- operations/helm/charts/alloy/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md index 4323ce39ac..a10ef1f097 100644 --- 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.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. | | alloy.configMap.key | string | `nil` | Key in ConfigMap to get config from. |