Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3f8a1b9
feat: ipv6 compatibilty changes
jagan2221 Jun 20, 2025
78d6d5b
Update README.md
jagan2221 Jun 20, 2025
9abccbe
Update values.yaml
jagan2221 Jun 20, 2025
44bd9f3
yaml lint
jagan2221 Jun 22, 2025
0d6888b
readme fix
jagan2221 Jun 22, 2025
cbbd058
Update .markdownlint.jsonc
jagan2221 Jun 22, 2025
732aa7b
Update .markdownlint.jsonc
jagan2221 Jun 22, 2025
073630a
test fixes
jagan2221 Jun 22, 2025
dfd5db0
test fix
jagan2221 Jun 22, 2025
5c144e1
test fix-1
jagan2221 Jun 22, 2025
e802a46
update new regex
jagan2221 Jun 22, 2025
65f951b
test fixes
jagan2221 Jun 23, 2025
c9c6a75
test fix
jagan2221 Jun 23, 2025
1b583a6
Create 3949.added.txt
jagan2221 Jun 23, 2025
8dda2a0
Delete .changelog/.changelog/3949.added.txt
jagan2221 Jun 23, 2025
625747d
Create 3939.added.txt
jagan2221 Jun 23, 2025
56f3804
Rename 3939.added.txt to 3949.added.txt
jagan2221 Jun 23, 2025
044bfbb
Update secret.yaml
jagan2221 Jun 29, 2025
ce9359c
Update secret.yaml
jagan2221 Jun 29, 2025
cfeff9c
Update values.yaml
jagan2221 Jul 1, 2025
e7bf327
Update config.yaml
jagan2221 Jul 2, 2025
6aa18b2
Add ipv6 scrape regex behind feature flag
jagan2221 Jul 2, 2025
536999c
Update config.yaml
jagan2221 Jul 2, 2025
fe227b9
Add Integration tests for ipv6 cluster and refactoring (#3957)
jagan2221 Jul 3, 2025
362ea56
Update secret.yaml
jagan2221 Jul 3, 2025
40977c4
Update receiver_mock.go
jagan2221 Jul 3, 2025
a728b42
Update values_common.yaml
jagan2221 Jul 3, 2025
1479b5d
Update values_helm_default_ot_fips.yaml
jagan2221 Jul 3, 2025
c3e355d
Update cluster-ipv6.yaml
jagan2221 Jul 3, 2025
d4257f9
Update values_helm_default_ot_ipv6.yaml
jagan2221 Jul 3, 2025
642643c
Update README.md
jagan2221 Jul 3, 2025
5ab3d9f
gofmt
jagan2221 Jul 3, 2025
ad1afac
Create 3949.changed.txt
jagan2221 Jul 3, 2025
9ae7f3c
Merge branch 'main' into j_ipv6_compatibility_fixes
jagan2221 Sep 2, 2025
f575ef7
refactor optional/testSpecific metrics exclusion flow
jagan2221 Sep 3, 2025
30734f6
Update helm_ot_default_ipv6_test.go
jagan2221 Sep 3, 2025
af2b6c6
Update helm_ot_default_ipv6_test.go
jagan2221 Sep 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3949.added.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(config): ipv6 compatibiilty for otel collector pods
1 change: 1 addition & 0 deletions .changelog/3949.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: upgrade sumologic-kubernetes-tools and sumologic-mock images to 2.26.0
15 changes: 8 additions & 7 deletions .markdownlint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* Note: Configuration for https://github.com/igorshubovych/markdownlint-cli
*/
{
"default": true,
"MD004": { "style": "dash" },
"MD013": { "line_length": 360, "code_blocks": false, "tables": false },
"MD024": false, // no-duplicate-heading/no-duplicate-header
"MD033": false, // no-inline-html
"MD034": false, // no-bare-urls
"MD040": false // fenced-code-language
"default": true,
"MD004": { "style": "dash" },
"MD013": { "line_length": 360, "code_blocks": false, "tables": false },
"MD024": false, // no-duplicate-heading/no-duplicate-header
"MD033": false, // no-inline-html
"MD034": false, // no-bare-urls
"MD040": false, // fenced-code-language
"MD059": false // disable checks for descriptive link text
}
7 changes: 4 additions & 3 deletions deploy/helm/sumologic/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/events/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extensions:
timeout: 10s
{{- end }}
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,27 @@ receivers:
jaeger:
protocols:
thrift_compact:
endpoint: "${env:MY_POD_IP}:6831"
endpoint: {{ template "sumologic.thrift_compact_endpoint" . }}
thrift_binary:
endpoint: "${env:MY_POD_IP}:6832"
endpoint: {{ template "sumologic.thrift_binary_endpoint" . }}
grpc:
endpoint: "${env:MY_POD_IP}:14250"
endpoint: {{ template "sumologic.jaeger_grpc_endpoint" . }}
thrift_http:
endpoint: "${env:MY_POD_IP}:14268"
endpoint: {{ template "sumologic.jaeger_http_thrift_endpoint" . }}
opencensus:
endpoint: "${env:MY_POD_IP}:55678"
endpoint: {{ template "sumologic.opencensus_endpoint" . }}
otlp:
protocols:
grpc:
endpoint: "${env:MY_POD_IP}:4317"
endpoint: {{ template "sumologic.otlp_grpc_endpoint" . }}
http:
endpoint: "${env:MY_POD_IP}:4318"
endpoint: {{ template "sumologic.otlp_http_endpoint" . }}
otlp/deprecated:
protocols:
http:
endpoint: "${env:MY_POD_IP}:55681"
endpoint: {{ template "sumologic.otlphttp_deprecated_endpoint" . }}
zipkin:
endpoint: "${env:MY_POD_IP}:9411"
endpoint: {{ template "sumologic.zipkin_endpoint" . }}

processors:
## Source processor adds Sumo Logic related metadata
Expand Down Expand Up @@ -174,7 +174,7 @@ processors:
timeout: 5s
extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}
service:
extensions: [health_check, pprof]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "${env:MY_POD_IP}:4317"
endpoint: {{ template "sumologic.otlp_grpc_endpoint" . }}
http:
endpoint: "${env:MY_POD_IP}:4318"
endpoint: {{ template "sumologic.otlp_http_endpoint" . }}
processors:
## The memory_limiter processor is used to prevent out of memory situations on the collector.
memory_limiter:
Expand Down Expand Up @@ -56,7 +56,7 @@ processors:
# send_batch_max_size: 512
extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "${env:MY_POD_IP}:4317"
endpoint: {{ template "sumologic.otlp_grpc_endpoint" . }}
http:
endpoint: "${env:MY_POD_IP}:4318"
endpoint: {{ template "sumologic.otlp_http_endpoint" . }}
processors:
## The memory_limiter processor is used to prevent out of memory situations on the collector.
memory_limiter:
Expand Down Expand Up @@ -71,7 +71,7 @@ processors:

extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
{{- if .Values.tracesSampler.persistence.enabled }}
## Configuration for File Storage extension
file_storage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extensions:
timeout: 10s
{{ end }}
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extensions:
directory: /var/lib/storage/otc
timeout: 10s
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extensions:
directory: /var/lib/storage/otc
timeout: 10s
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/conf/logs/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ exporters:

extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
{{ if .Values.metadata.persistence.enabled }}
## Configuration for File Storage extension
file_storage:
Expand Down Expand Up @@ -552,7 +552,7 @@ receivers:
otlp:
protocols:
http:
endpoint: ${env:MY_POD_IP}:4318
endpoint: {{ template "sumologic.otlp_http_endpoint" . }}
{{ end }}

service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exporters:

extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}
file_storage:
directory: /var/lib/storage/otc
Expand Down Expand Up @@ -123,11 +123,19 @@ receivers:
action: replace
target_label: __metrics_path__
regex: (.+)
{{- if eq .Values.sumologic.ipv6mode true }}
- source_labels: [__meta_kubernetes_pod_ip, __meta_kubernetes_pod_annotation_prometheus_io_port]
action: replace
regex: (.*);(.*)
replacement: "[$1]:$2"
target_label: __address__
{{- else }}
- source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
action: replace
regex: ([^:]+)(?::\d+)?;(\d+)
replacement: $1:$2
target_label: __address__
{{- end }}
- source_labels: [__metrics_path__]
separator: ;
regex: (.*)
Expand Down Expand Up @@ -229,4 +237,3 @@ receivers:
target_label: instance
action: replace
{{- end }}

4 changes: 2 additions & 2 deletions deploy/helm/sumologic/conf/metrics/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extensions:
timeout: 10s
{{ end }}
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
Expand Down Expand Up @@ -41,7 +41,7 @@ receivers:
otlp:
protocols:
http:
endpoint: ${env:MY_POD_IP}:4318
endpoint: {{ template "sumologic.otlp_http_endpoint" . }}

service:
extensions:
Expand Down
80 changes: 80 additions & 0 deletions deploy/helm/sumologic/templates/_helpers/_common.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,86 @@ Example usage:
{{- template "sumologic.fullname" . }}-mock
{{- end -}}

{{- define "sumologic.healthEndpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:13133"
{{- else -}}
${env:MY_POD_IP}:13133
{{- end -}}
{{- end }}

{{- define "sumologic.thrift_compact_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:6831"
{{- else -}}
"${env:MY_POD_IP}:6831"
{{- end -}}
{{- end }}

{{- define "sumologic.otlp_http_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:4318"
{{- else -}}
"${env:MY_POD_IP}:4318"
{{- end -}}
{{- end }}

{{- define "sumologic.otlp_grpc_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:4317"
{{- else -}}
"${env:MY_POD_IP}:4317"
{{- end -}}
{{- end }}

{{- define "sumologic.thrift_binary_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:6832"
{{- else -}}
"${env:MY_POD_IP}:6832"
{{- end -}}
{{- end }}

{{- define "sumologic.jaeger_grpc_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:14250"
{{- else -}}
"${env:MY_POD_IP}:14250"
{{- end -}}
{{- end }}

{{- define "sumologic.jaeger_http_thrift_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:14268"
{{- else -}}
"${env:MY_POD_IP}:14268"
{{- end -}}
{{- end }}

{{- define "sumologic.opencensus_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:55678"
{{- else -}}
"${env:MY_POD_IP}:55678"
{{- end -}}
{{- end }}

{{- define "sumologic.zipkin_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:9411"
{{- else -}}
"${env:MY_POD_IP}:9411"
{{- end -}}
{{- end }}

{{- define "sumologic.otlphttp_deprecated_endpoint" -}}
{{- if .Values.sumologic.ipv6mode -}}
"[${env:MY_POD_IP}]:55681"
{{- else -}}
"${env:MY_POD_IP}:55681"
{{- end -}}
{{- end }}

{{- define "useDefaultConfig" }}
{{/*
This function checks if any keys other than 'merge' and 'override' exist in a given map.
Expand Down
9 changes: 6 additions & 3 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ sumologic:
## If enabled, a pre-delete hook will destroy Collector in Sumo Logic
cleanupEnabled: false

## If enabled, configures the chart to be compatible with ipv6 single stack clusters
ipv6mode: false

## If enabled, accessId and accessKey will be sourced from Secret Name given
## Be sure to include at least the following env variables in your secret
## (1) SUMOLOGIC_ACCESSID, (2) SUMOLOGIC_ACCESSKEY
Expand Down Expand Up @@ -2579,7 +2582,7 @@ pvcCleaner:
job:
image:
repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
tag: 2.24.0
tag: 2.26.0
pullPolicy: IfNotPresent

resources:
Expand Down Expand Up @@ -2620,7 +2623,7 @@ instrumentation:
instrumentationJobImage:
image:
repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
tag: 2.24.0
tag: 2.26.0

createDefaultInstrumentation: false
instrumentationNamespaces: ""
Expand Down Expand Up @@ -2676,7 +2679,7 @@ debug:
enabled: false
image:
repository: public.ecr.aws/sumologic/sumologic-mock
tag: 2.24.0
tag: 2.26.0
pullPolicy: IfNotPresent
deployment:
nodeSelector: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ otelevents:
metricsLevel: detailed

sumologic:
ipv6mode: true
clusterName: testCluster
collectorName: testCollector
events:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ data:
enabled: true
extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: '[${env:MY_POD_IP}]:13133'
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
sumologic:
ipv6mode: true
logs:
collector:
otelcol:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data:
directory: /var/lib/storage/otc
timeout: 10s
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: '[${env:MY_POD_IP}]:13133'
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
sumologic:
ipv6mode: true
logs:
collector:
otellogswindows:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data:
directory: /var/lib/storage/otc
timeout: 10s
health_check:
endpoint: ${env:MY_POD_IP}:13133
endpoint: '[${env:MY_POD_IP}]:13133'
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
sumologic:
ipv6mode: true
logs:
collector:
otelcol:
Expand Down
Loading
Loading