diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index f7329adaf7..2da8c250ca 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -24,7 +24,8 @@ data: file_storage: directory: /var/lib/storage/events timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index 681660238b..92c869c26e 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -20,7 +20,8 @@ data: sending_queue: enabled: true extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml index a38b47c950..9df996dd8a 100644 --- a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml @@ -32,7 +32,8 @@ data: file_storage: directory: /var/lib/storage/events timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml index 7b33f79204..a5b794b791 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml @@ -72,7 +72,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml @@ -135,6 +135,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml index 71f5a99685..9a33da064c 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml @@ -73,7 +73,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml @@ -133,6 +133,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP volumeClaimTemplates: - metadata: name: file-storage diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml index 3da0f71777..78bfcbe49d 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml @@ -119,6 +119,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP volumeClaimTemplates: - metadata: name: file-storage diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml index bb5c25ad4c..318886352b 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml @@ -60,7 +60,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml @@ -124,6 +124,11 @@ spec: value: https://proxy.internal - name: NO_PROXY value: http://non-proxy.internal + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP volumeClaimTemplates: - metadata: name: file-storage diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index 365038aff5..c2083da504 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml index c7d0cb71fa..2dafaea9ca 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml @@ -27,7 +27,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index 1952b2adaf..db3b44342c 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml index 140a1196a2..187515c82c 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otelcol/config.yaml @@ -93,3 +93,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml index a9ddf6b985..05956e4541 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/custom.output.yaml @@ -88,3 +88,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml index 1d7df93bbd..c4c792547e 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml @@ -54,7 +54,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -99,6 +99,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml index c3942b82a9..f1235ca134 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -47,7 +47,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -89,6 +89,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP securityContext: capabilities: drop: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml index f4116fb879..933c7340ad 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -38,7 +38,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -80,6 +80,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP securityContext: capabilities: drop: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml index 68eb711fc0..e888bfaba2 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml @@ -91,6 +91,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 5f206747f7..6a8e98b4bb 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml index 985b1e1285..48edf458be 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml index 366b17c151..c1d42ea7a1 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml @@ -27,7 +27,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml index 34c55b397c..f4cfc75507 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml index ae5dde55d2..f61ba22141 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml @@ -62,7 +62,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -107,6 +107,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml index d9ce35dbe2..9b7cba3b23 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml @@ -52,7 +52,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -94,6 +94,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP securityContext: capabilities: drop: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml index 50732a5630..7d9553de9e 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml @@ -43,7 +43,7 @@ spec: - "otelcol-sumo.exe" args: - --config=etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -85,6 +85,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP securityContext: capabilities: drop: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/complex.output.yaml index 1e0eae3352..17cdb5a19b 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/complex.output.yaml @@ -99,6 +99,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml index e7eb6e5f41..d598080d3b 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml @@ -25,7 +25,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml index 827a0903a7..a9638e9b1f 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml @@ -31,7 +31,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -281,7 +282,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml index bf687c2c40..907f2aaecb 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml @@ -40,7 +40,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -290,7 +291,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml index d4a162115a..11c5b02dec 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml @@ -54,7 +54,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -304,7 +305,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml index ae97ec8dcf..11929eb01c 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml @@ -33,7 +33,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -283,7 +284,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index 45734c54f7..6d728776b3 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -29,7 +29,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -279,7 +280,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing.output.yaml index 3133052e2a..3fea5369be 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing.output.yaml @@ -33,7 +33,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -299,7 +300,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults.output.yaml index b99f3ad98a..0b79dc238f 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults.output.yaml @@ -33,7 +33,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -303,7 +304,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults_http.output.yaml index f533c7e364..714e4d99a3 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_with_defaults_http.output.yaml @@ -40,7 +40,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -310,7 +311,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index dbaccf60ee..f5e49c8d34 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -29,7 +29,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: attributes/extract_systemd_source_fields: @@ -306,7 +307,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml index 34b7f7e30f..1b52fb834b 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml @@ -39,7 +39,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml @@ -104,6 +104,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP volumeClaimTemplates: - metadata: name: file-storage diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.output.yaml index 1033059378..a00a75841c 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.output.yaml @@ -123,6 +123,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: secretKeyRef: diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml index 09da740aea..d956884a69 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml @@ -32,7 +32,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -156,7 +157,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml index 8686c01d69..7168f02a2f 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml @@ -32,7 +32,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -156,7 +157,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml index 18efb0040d..5522ab6b70 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml @@ -32,7 +32,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -156,7 +157,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml index 819bfeee4b..0df6ba27b2 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml @@ -109,7 +109,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -262,7 +263,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml index 025f6dcc93..c1ec269cc2 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml @@ -34,7 +34,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -158,7 +159,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml index 793f902e84..da9261618a 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml @@ -57,7 +57,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -181,7 +182,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml index aac0635f7c..94ba3fd390 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml @@ -134,7 +134,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -305,7 +306,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml index 16e81015a1..05f58ab2d3 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml @@ -32,7 +32,8 @@ data: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -180,7 +181,7 @@ data: otlp: protocols: http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 telegraf: agent_config: | [agent] diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml index f1e633fe9a..d187dabfc9 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml @@ -58,7 +58,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml @@ -161,6 +161,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP volumeClaimTemplates: - metadata: name: file-storage diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/custom.output.yaml index 11e336572c..8e9994b5c9 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/custom.output.yaml @@ -172,6 +172,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: VALUE_FROM_SECRET valueFrom: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index 9b45e036ba..b6eb577d9a 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics @@ -89,7 +89,8 @@ spec: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -263,4 +264,4 @@ spec: logs: level: info metrics: - address: 0.0.0.0:8888 + address: ${env:MY_POD_IP}:8888 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index 2cf99549b8..5746c38da1 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -126,7 +126,8 @@ spec: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -172,4 +173,4 @@ spec: logs: level: info metrics: - address: 0.0.0.0:8888 + address: ${env:MY_POD_IP}:8888 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml index 03300a521e..8ab33a8c25 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics @@ -91,7 +91,8 @@ spec: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -266,4 +267,4 @@ spec: logs: level: info metrics: - address: 0.0.0.0:8888 + address: ${env:MY_POD_IP}:8888 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml index bcf04c4d69..4f509e942f 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics @@ -89,7 +89,8 @@ spec: on_rebound: true directory: /var/lib/storage/otc timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: batch: @@ -263,4 +264,4 @@ spec: logs: level: info metrics: - address: 0.0.0.0:8888 + address: ${env:MY_POD_IP}:8888 diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml index 40846f6bd5..9d701da322 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml @@ -33,7 +33,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -102,27 +103,27 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml index 4218ea4622..82d36d04b3 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml @@ -1,6 +1,5 @@ --- # Source: sumologic/templates/instrumentation/otelcol-instrumentation/configmap.yaml -# Just a part of the config is present here for test purposes. In practice whole config from values.yaml should be a content. apiVersion: v1 kind: ConfigMap metadata: @@ -34,7 +33,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -103,15 +103,15 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: @@ -121,9 +121,9 @@ data: otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml index c04b430eb8..bd942d12ed 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml @@ -45,7 +45,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -114,27 +115,27 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml index b8a41b2155..2f83ac5fe5 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml @@ -47,7 +47,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -116,27 +117,27 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml index fffce13667..fba700ff9c 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml @@ -33,7 +33,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -102,27 +103,27 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml index b8a41b2155..2f83ac5fe5 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml @@ -47,7 +47,8 @@ data: queue_size: 5000 timeout: 5s extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -116,27 +117,27 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${env:MY_POD_IP}:14250 thrift_binary: - endpoint: 0.0.0.0:6832 + endpoint: ${env:MY_POD_IP}:6832 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${env:MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${env:MY_POD_IP}:14268 opencensus: - endpoint: 0.0.0.0:55678 + endpoint: ${env:MY_POD_IP}:55678 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 otlp/deprecated: protocols: http: - endpoint: 0.0.0.0:55681 + endpoint: ${env:MY_POD_IP}:55681 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${env:MY_POD_IP}:9411 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml index 6cda67636d..1dcfb7b7bc 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - "--config=/conf/otelcol.instrumentation.conf.yaml" @@ -117,3 +117,9 @@ spec: secretKeyRef: name: sumologic key: endpoint-metrics + + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/custom.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/custom.output.yaml index fb78e7d4a8..f354ffdc25 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/custom.output.yaml @@ -118,3 +118,9 @@ spec: secretKeyRef: name: sumologic key: endpoint-metrics + + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP diff --git a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml index b8c7f3bc61..6963d5bcf3 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -37,7 +37,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - "--config=/conf/traces.gateway.conf.yaml" @@ -63,6 +63,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP resources: limits: cpu: 1000m diff --git a/tests/helm/testdata/goldenfile/traces-gateway-deployment/custom.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-deployment/custom.output.yaml index e098dad310..52cd5c3bb7 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/custom.output.yaml @@ -59,6 +59,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP resources: limits: cpu: 1000m diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml index bab28f5ba2..b537090b50 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml @@ -28,7 +28,8 @@ data: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic port: 4317 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 256 pprof: {} @@ -45,9 +46,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml index 1bdd38100a..f2d99cedb4 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml @@ -1,6 +1,5 @@ --- # Source: sumologic/templates/instrumentation/traces-gateway/configmap.yaml -# Just a part of the config is present here for test purposes. In practice whole config from values.yaml should be a content. apiVersion: v1 kind: ConfigMap metadata: @@ -29,7 +28,8 @@ data: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic port: 4317 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -46,9 +46,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml index 818b8c4b7a..4b0e008039 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml @@ -30,7 +30,8 @@ data: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic port: 4317 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -47,9 +48,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml index 9344ae44bd..33e3adee0d 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml @@ -28,7 +28,8 @@ data: hostname: RELEASE-NAME-sumologic-traces-sampler-headless.sumologic port: 4317 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -45,9 +46,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml index 3d2365a5bf..b19797d862 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml @@ -32,7 +32,7 @@ spec: kubernetes.io/os: linux containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml @@ -52,6 +52,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP resources: limits: cpu: 2000m diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/custom.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/custom.output.yaml index a65051a830..348a7b4fbf 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/custom.output.yaml @@ -47,6 +47,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP resources: limits: cpu: 2000m diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml index d646fd16bd..8ae1061050 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml @@ -32,7 +32,7 @@ spec: kubernetes.io/os: linux containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml @@ -52,6 +52,11 @@ spec: - name: NO_PROXY value: kubernetes.default.svc + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP resources: limits: cpu: 2000m diff --git a/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml index 06f0d72316..1d1edd7dd5 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml @@ -21,7 +21,8 @@ data: num_consumers: 10 queue_size: 10000 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 512 pprof: {} @@ -40,9 +41,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml index c1682e797e..a4f419f0d3 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml @@ -1,6 +1,5 @@ --- # Source: sumologic/templates/instrumentation/traces-sampler/configmap.yaml -# Just a part of the config is present here for test purposes. In practice whole config from values.yaml should be a content. apiVersion: v1 kind: ConfigMap metadata: @@ -22,7 +21,8 @@ data: num_consumers: 10 queue_size: 10000 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 683 pprof: {} @@ -41,9 +41,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml index 924f8f8f2e..c4adc816a3 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml @@ -21,7 +21,8 @@ data: queue_size: 10000 traces_endpoint: ${SUMO_ENDPOINT_DEFAULT_TRACES_SOURCE} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 683 pprof: {} @@ -40,9 +41,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml index 754a00448c..73a012619c 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml @@ -28,7 +28,8 @@ data: on_rebound: true directory: /var/lib/storage/tracessampler timeout: 10s - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 683 pprof: {} @@ -47,9 +48,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml index 3221c7cf29..72fc82bdbd 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml @@ -21,7 +21,8 @@ data: num_consumers: 10 queue_size: 10000 extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 683 pprof: {} @@ -40,9 +41,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check diff --git a/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml index f71f119a18..ab4856f783 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml @@ -26,7 +26,8 @@ data: compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: size_mib: 683 pprof: {} @@ -45,9 +46,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 service: extensions: - health_check