Merge pull request #544 from solarwinds/bugfix/NH-71043-fixCollectorO…

…nFargate NH-71043: Fix Node collector when autodiscovery is enabled on Fargate cluster
solarwinds · Jan 23, 2024 · 9ec54f3 · 9ec54f3
2 parents d1284aa + 7abdb88
commit 9ec54f3
Show file tree

Hide file tree

Showing 6 changed files with 1,097 additions and 3 deletions.
diff --git a/deploy/helm/CHANGELOG.md b/deploy/helm/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [3.2.0-alpha.16] - 2024-01-22
+
+### Fixed
+
+- Fixed restarts of the collector when automatic discovery and scraping of prometheus endpoints (`otel.metrics.autodiscovery.prometheusEndpoints.enabled`) was enabled on a Fargate environment
+
 ## [3.2.0-alpha.15] - 2024-01-17
 
 ### Fixed

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 3.2.0-alpha.15
+version: 3.2.0-alpha.16
 appVersion: "0.9.2"
 description: SolarWinds Kubernetes Integration
 keywords:

diff --git a/deploy/helm/node-collector-config.yaml b/deploy/helm/node-collector-config.yaml
@@ -670,6 +670,8 @@ service:
         - resource/all
       receivers:
         - receiver_creator/node
+{{- end }}
+{{- if and .Values.otel.metrics.enabled (or (not .Values.aws_fargate.enabled) .Values.otel.metrics.autodiscovery.prometheusEndpoints.enabled) }}
     metrics:
       exporters:
         - otlp

diff --git a/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap
@@ -24,7 +24,7 @@ Fargate logging ConfigMap spec should include additional filters when they are c
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.2.0-alpha.15"
+          Add sw.k8s.agent.manifest.version "3.2.0-alpha.16"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]
@@ -64,7 +64,7 @@ Fargate logging ConfigMap spec should match snapshot when Fargate logging is ena
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.2.0-alpha.15"
+          Add sw.k8s.agent.manifest.version "3.2.0-alpha.16"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]