feat!: use OTLP sources by default

SumoLogic · Sep 22, 2023 · 4539a2e · 4539a2e
1 parent f4679bd
commit 4539a2e
Show file tree

Hide file tree

Showing 30 changed files with 191 additions and 422 deletions.
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -272,7 +272,7 @@ sumologic:
         pvcLabels: {}
         # storageClass:
 
-    sourceType: http
+    sourceType: otlp
 
   ### Logs configuration
   ## Set the enabled flag to false for disabling logs ingestion altogether.
@@ -435,7 +435,7 @@ sumologic:
     ## https://help.sumologic.com/docs/manage/fields/#manage-fields
     additionalFields: []
 
-    sourceType: http
+    sourceType: otlp
 
   ### Metrics configuration
   ## Set the enabled flag to false for disabling metrics ingestion altogether.
@@ -666,7 +666,7 @@ sumologic:
 
     ## The type of source we send to in Sumo. The possible values are http and otlp.
     ## Consult the documentation for more information.
-    sourceType: http
+    sourceType: otlp
 
   ### Traces configuration
   ## Set the enabled flag to false to disable traces ingestion.
@@ -675,7 +675,7 @@ sumologic:
     ## How many spans per request should be send to receiver
     spans_per_request: 100
 
-    sourceType: http
+    sourceType: otlp
 
 ## Configure metrics-server
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/metrics-server/values.yaml
@@ -1583,7 +1583,7 @@ tracesSampler:
       # logging:
       #   loglevel: debug
       otlphttp:
-        traces_endpoint: ${SUMO_ENDPOINT_DEFAULT_TRACES_SOURCE}
+        traces_endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_TRACES_SOURCE}/v1/traces
         compression: gzip
     service:
       extensions: [health_check, memory_ballast, pprof]

diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml
@@ -15,8 +15,8 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_EVENTS_SOURCE}
-        log_format: json
+        endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
+        log_format: otlp
         sending_queue:
           enabled: true
           storage: file_storage

diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml
@@ -15,8 +15,8 @@ data:
     exporters:
       sumologic:
         clear_logs_timestamp: false
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_EVENTS_SOURCE}
-        log_format: json
+        endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
+        log_format: otlp
         sending_queue:
           enabled: true
     extensions:

diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml
@@ -126,6 +126,11 @@ spec:
                 secretKeyRef:
                   name: sumologic
                   key: endpoint-events
+            - name: SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE
+              valueFrom:
+                secretKeyRef:
+                  name: sumologic
+                  key: endpoint-events-otlp
 
             - name: NO_PROXY
               value: kubernetes.default.svc

diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.input.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.input.yaml
@@ -1,6 +1,6 @@
 sumologic:
   events:
-    sourceType: otlp
+    sourceType: http
   podAnnotations:
     sumoAnnotation: sumoValue
   podLabels:

diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/custom.output.yaml
@@ -114,11 +114,6 @@ spec:
                 secretKeyRef:
                   name: sumologic
                   key: endpoint-events
-            - name: SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE
-              valueFrom:
-                secretKeyRef:
-                  name: sumologic
-                  key: endpoint-events-otlp
 
             - name: NO_PROXY
               value: kubernetes.default.svc

diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml
@@ -110,6 +110,11 @@ spec:
                 secretKeyRef:
                   name: sumologic
                   key: endpoint-events
+            - name: SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE
+              valueFrom:
+                secretKeyRef:
+                  name: sumologic
+                  key: endpoint-events-otlp
 
             - name: HTTP_PROXY
               value: http://proxy.internal

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml
@@ -13,21 +13,10 @@ metadata:
 data:
   config.yaml: |
     exporters:
-      sumologic/containers:
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
-        json_logs:
-          add_timestamp: false
-        log_format: json
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-      sumologic/systemd:
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
-        json_logs:
-          add_timestamp: false
-        log_format: json
+      sumologic:
+        clear_logs_timestamp: false
+        endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
+        log_format: otlp
         sending_queue:
           enabled: true
           num_consumers: 10
@@ -291,7 +280,7 @@ data:
       pipelines:
         logs/otlp/containers:
           exporters:
-          - sumologic/containers
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_containers
@@ -311,7 +300,7 @@ data:
           - otlp
         logs/otlp/kubelet:
           exporters:
-          - sumologic/systemd
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_fluent_tag_host
@@ -333,7 +322,7 @@ data:
           - otlp
         logs/otlp/systemd:
           exporters:
-          - sumologic/systemd
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_fluent_tag_host

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml
@@ -13,21 +13,10 @@ metadata:
 data:
   config.yaml: |
     exporters:
-      sumologic/containers:
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
-        json_logs:
-          add_timestamp: false
-        log_format: json
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-      sumologic/systemd:
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
-        json_logs:
-          add_timestamp: false
-        log_format: json
+      sumologic:
+        clear_logs_timestamp: false
+        endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
+        log_format: otlp
         sending_queue:
           enabled: true
           num_consumers: 10
@@ -318,7 +307,7 @@ data:
       pipelines:
         logs/otlp/containers:
           exporters:
-          - sumologic/containers
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_containers
@@ -340,7 +329,7 @@ data:
           - otlp
         logs/otlp/kubelet:
           exporters:
-          - sumologic/systemd
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_fluent_tag_host
@@ -364,7 +353,7 @@ data:
           - otlp
         logs/otlp/systemd:
           exporters:
-          - sumologic/systemd
+          - sumologic
           processors:
           - memory_limiter
           - filter/include_fluent_tag_host

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
@@ -98,6 +98,11 @@ spec:
                 secretKeyRef:
                   name: sumologic
                   key: endpoint-logs
+            - name: SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE
+              valueFrom:
+                secretKeyRef:
+                  name: sumologic
+                  key: endpoint-logs-otlp
 
             - name: NO_PROXY
               value: kubernetes.default.svc

diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.input.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/custom.input.yaml
@@ -1,6 +1,6 @@
 sumologic:
   logs:
-    sourceType: otlp
+    sourceType: http
 
 metadata:
   image:

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
@@ -122,11 +122,6 @@ spec:
                 secretKeyRef:
                   name: sumologic
                   key: endpoint-logs
-            - name: SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE
-              valueFrom:
-                secretKeyRef:
-                  name: sumologic
-                  key: endpoint-logs-otlp
 
             - name: NO_PROXY
               value: kubernetes.default.svc

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
@@ -13,81 +13,11 @@ metadata:
 data:
   config.yaml: |
     exporters:
-      sumologic/apiserver:
-        endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/control_plane:
-        endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/controller:
-        endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
       sumologic/default:
         decompose_otlp_histograms: true
-        endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/kubelet:
-        endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE}
+        endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE}
         max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/node:
-        endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/scheduler:
-        endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
-        sending_queue:
-          enabled: true
-          num_consumers: 10
-          queue_size: 10000
-          storage: file_storage
-        timeout: 30s
-      sumologic/state:
-        endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE}
-        max_request_body_size: 16777216
-        metric_format: prometheus
+        metric_format: otlp
         sending_queue:
           enabled: true
           num_consumers: 10
@@ -201,35 +131,6 @@ data:
         attributes:
         - action: delete
           key: k8s.pod.pod_name
-      routing:
-        default_exporters:
-        - sumologic/default
-        error_mode: ignore
-        table:
-        - exporters:
-          - sumologic/apiserver
-          statement: route() where resource.attributes["job"] == "apiserver"
-        - exporters:
-          - sumologic/control_plane
-          statement: route() where resource.attributes["job"] == "coredns"
-        - exporters:
-          - sumologic/control_plane
-          statement: route() where resource.attributes["job"] == "kube-etcd"
-        - exporters:
-          - sumologic/controller
-          statement: route() where resource.attributes["job"] == "kube-controller-manager"
-        - exporters:
-          - sumologic/kubelet
-          statement: route() where resource.attributes["job"] == "kubelet"
-        - exporters:
-          - sumologic/node
-          statement: route() where resource.attributes["job"] == "node-exporter"
-        - exporters:
-          - sumologic/scheduler
-          statement: route() where resource.attributes["job"] == "kube-scheduler"
-        - exporters:
-          - sumologic/state
-          statement: route() where resource.attributes["job"] == "kube-state-metrics"
       source:
         collector: kubernetes
         exclude:
@@ -279,13 +180,6 @@ data:
         metrics:
           exporters:
           - sumologic/default
-          - sumologic/apiserver
-          - sumologic/control_plane
-          - sumologic/controller
-          - sumologic/kubelet
-          - sumologic/node
-          - sumologic/scheduler
-          - sumologic/state
           processors:
           - memory_limiter
           - metricstransform
@@ -301,7 +195,6 @@ data:
           - transform/remove_name
           - filter/drop_unnecessary_metrics
           - batch
-          - routing
           receivers:
           - telegraf
           - otlp