feat(opentelemetry): send information about k8s version (#3460)

* feat(opentelemetry): send information about k8s version Signed-off-by: Dominik Rosiek <[email protected]> * chore(changelog): update Signed-off-by: Dominik Rosiek <[email protected]> * Rename 3461.changed.txt to 3460.changed.txt --------- Signed-off-by: Dominik Rosiek <[email protected]>
SumoLogic · Dec 21, 2023 · 3ff661e · 3ff661e
1 parent aefa731
commit 3ff661e
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 0 deletions.
diff --git a/.changelog/3460.changed.txt b/.changelog/3460.changed.txt
@@ -0,0 +1 @@
+feat(opentelemetry): send information about k8s version
diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml
@@ -1,5 +1,6 @@
 exporters:
   sumologic:
+    client: {{ include "sumologic.sumo_client" . }}
     endpoint: {{ include "sumologic.events.exporter.endpoint" . }}
     log_format: {{ include "sumologic.events.exporter.format" . }}
     clear_logs_timestamp: false # this only affects the otlp format

diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml
@@ -32,6 +32,7 @@ exporters:
 
 {{ else }}
   sumologic:
+    client: {{ include "sumologic.sumo_client" . }}
     endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
     log_format: otlp
     clear_logs_timestamp: false

diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml
@@ -1,6 +1,7 @@
 ## Configuration for Sumo Logic Exporter
 ## ref: https://github.com/SumoLogic/sumologic-otel-collector/blob/main/pkg/exporter/sumologicexporter
 sumologic/default:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: {{ include "metrics.otelcol.exporter.format" . }}
   endpoint: {{ include "metrics.otelcol.exporter.endpoint" . }}
   ## Sumo doesn't yet natively support OTLP Histograms
@@ -21,6 +22,7 @@ sumologic/default:
   timeout: 30s
 {{- if eq .Values.sumologic.metrics.sourceType "http" }}
 sumologic/apiserver:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE}
   sending_queue:
@@ -34,6 +36,7 @@ sumologic/apiserver:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/control_plane:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE}
   sending_queue:
@@ -47,6 +50,7 @@ sumologic/control_plane:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/controller:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE}
   sending_queue:
@@ -60,6 +64,7 @@ sumologic/controller:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/kubelet:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE}
   sending_queue:
@@ -73,6 +78,7 @@ sumologic/kubelet:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/node:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE}
   sending_queue:
@@ -86,6 +92,7 @@ sumologic/node:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/scheduler:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE}
   sending_queue:
@@ -99,6 +106,7 @@ sumologic/scheduler:
   ## set timeout to 30s due to big requests
   timeout: 30s
 sumologic/state:
+  client: {{ include "sumologic.sumo_client" . }}
   metric_format: prometheus
   endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE}
   sending_queue:

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -1478,6 +1478,7 @@ otelcolInstrumentation:
       pprof: {}
     exporters:
       sumologic/metrics:
+        client: '{{ include "sumologic.sumo_client" . }}'
         endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
         ## Compression encoding format, either empty string (""), gzip or deflate (default gzip).
         ## Empty string means no compression

diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml
@@ -15,6 +15,7 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
         log_format: otlp
         sending_queue:

diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml
@@ -15,6 +15,7 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
         log_format: otlp
         sending_queue:

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml
@@ -15,6 +15,7 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
         log_format: otlp
         sending_queue:

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml
@@ -15,6 +15,7 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
         log_format: otlp
         sending_queue:

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
@@ -14,6 +14,7 @@ data:
   config.yaml: |
     exporters:
       sumologic/default:
+        client: k8s_%CURRENT_CHART_VERSION%
         decompose_otlp_histograms: true
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE}
         max_request_body_size: 16777216

diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml
@@ -14,6 +14,7 @@ data:
   config.yaml: |
     exporters:
       sumologic/default:
+        client: k8s_%CURRENT_CHART_VERSION%
         decompose_otlp_histograms: true
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE}
         max_request_body_size: 16777216

diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml
@@ -14,6 +14,7 @@ data:
   config.yaml: |
     exporters:
       sumologic/apiserver:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -24,6 +25,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/control_plane:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -34,6 +36,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/controller:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -44,6 +47,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/default:
+        client: k8s_%CURRENT_CHART_VERSION%
         decompose_otlp_histograms: true
         endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
         max_request_body_size: 16777216
@@ -55,6 +59,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/kubelet:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -65,6 +70,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/node:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -75,6 +81,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/scheduler:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus
@@ -85,6 +92,7 @@ data:
           storage: file_storage
         timeout: 30s
       sumologic/state:
+        client: k8s_%CURRENT_CHART_VERSION%
         endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE}
         max_request_body_size: 16777216
         metric_format: prometheus

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
@@ -14,6 +14,7 @@ data:
   config.yaml: |
     exporters:
       sumologic/default:
+        client: k8s_%CURRENT_CHART_VERSION%
         decompose_otlp_histograms: true
         endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE}
         max_request_body_size: 16777216

diff --git a/...lm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml b/...lm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml
@@ -16,6 +16,7 @@ data:
       otlphttp/traces:
         endpoint: http://RELEASE-NAME-sumologic-traces-sampler.sumologic:4318
       sumologic/metrics:
+        client: k8s_%CURRENT_CHART_VERSION%
         compress_encoding: gzip
         endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
         log_format: text

diff --git a/...elm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml b/...elm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml
@@ -16,6 +16,7 @@ data:
       otlphttp/traces:
         endpoint: http://RELEASE-NAME-sumologic-traces-gateway.sumologic:4318
       sumologic/metrics:
+        client: k8s_%CURRENT_CHART_VERSION%
         compress_encoding: gzip
         endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
         log_format: text
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		feat(opentelemetry): send information about k8s version