diff --git a/.chloggen/useseparatedcomponentnames-k8s_attributes.yaml b/.chloggen/useseparatedcomponentnames-k8s_attributes.yaml new file mode 100644 index 0000000000..d4d45245e0 --- /dev/null +++ b/.chloggen/useseparatedcomponentnames-k8s_attributes.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: chart +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Rename all `k8sattributes` processor references to `k8s_attributes` +# One or more tracking issues related to the change +issues: [2326] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The `k8sattributes` alias has been deprecated in favor of `k8s_attributes` in the chart-generated configuration. + Any Helm values or overrides that reference `k8sattributes` (for example, `*.config.processors.k8sattributes` + or pipelines that list `k8sattributes` as a processor) must be updated to use `k8s_attributes`. + The chart will fail to be installed or upgraded if the deprecated alias is still referenced. diff --git a/.chloggen/useseparatedcomponentnames-otlp_grpc.yaml b/.chloggen/useseparatedcomponentnames-otlp_grpc.yaml new file mode 100644 index 0000000000..7256fd30e4 --- /dev/null +++ b/.chloggen/useseparatedcomponentnames-otlp_grpc.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: chart +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Rename all `otlp` exporter references to `otlp_grpc` +# One or more tracking issues related to the change +issues: [2326] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The `otlp` alias has been deprecated in favor of `otlp_grpc` in the chart-generated configuration. + Any Helm values or overrides that reference `otlp` (for example, `*.config.exporters.otlp` + or pipelines that list `otlp` as an exporter) must be updated to use `otlp_grpc`. + The chart will fail to be installed or upgraded if the deprecated alias is still referenced. diff --git a/.chloggen/useseparatedcomponentnames-otlp_http.yaml b/.chloggen/useseparatedcomponentnames-otlp_http.yaml new file mode 100644 index 0000000000..78941272d5 --- /dev/null +++ b/.chloggen/useseparatedcomponentnames-otlp_http.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: chart +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Rename all `otlphttp` exporter references to `otlp_http` +# One or more tracking issues related to the change +issues: [2326] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The `otlphttp` alias has been deprecated in favor of `otlp_http` in the chart-generated configuration. + Any Helm values or overrides that reference `otlphttp` (for example, `*.config.exporters.otlphttp` + or pipelines that list `otlphttp` as an exporter) must be updated to use `otlp_http`. + The chart will fail to be installed or upgraded if the deprecated alias is still referenced. diff --git a/README.md b/README.md index 1f6668dff1..1e649a3d01 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ however, only the Splunk distributions are in scope for official Splunk support This distribution currently supports: - [Splunk APM](https://www.splunk.com/en_us/products/apm-application-performance-monitoring.html) via the - [`otlphttp` + [`otlp_http` exporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter). - [Splunk Infrastructure Monitoring](https://www.splunk.com/en_us/products/infrastructure-monitoring.html) diff --git a/examples/add-filter-processor/add-filter-processor-values.yaml b/examples/add-filter-processor/add-filter-processor-values.yaml index ad86102db4..7b91ad380a 100644 --- a/examples/add-filter-processor/add-filter-processor-values.yaml +++ b/examples/add-filter-processor/add-filter-processor-values.yaml @@ -76,7 +76,7 @@ agent: logs: processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index 6b0508f431..1c4a8272ce 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -139,7 +139,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -525,7 +525,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -538,7 +538,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -583,11 +583,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 6dde929d52..810d66321e 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1409e95ed8cd5e9ef7ee6cd7c551c4c59f4f09dc91dcddfa285deeef75cf7a75 + checksum/config: 8201306741fe9ec8ccfb7d291494f773684944c30f0a8787e8eddb7d5ca14678 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index 539b3ba07e..6edaf03310 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -88,7 +88,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -481,7 +481,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -492,7 +492,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -535,11 +535,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 1e94262229..287d4b3cf4 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ed9154e1482c53297bf5dcc0d3631ef22575e7b96acdebb52d50c44664357e3d + checksum/config: 3ee68539a7880ab213fbcf3cfc9f62ec8274ef523a4939b6f42b138c29ff9d61 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index 97706cd4c5..c13a3edfa1 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -351,7 +351,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -396,11 +396,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 7fd2ddf35c..f77eed3ed6 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2321609f4f7972ed5f4fc5cc13241eb5ad3f2dde2b93281bc24e9722569008df + checksum/config: d3a5f74894f4036d0cbb97dcc70a31d04d818d5c4bdc66ca09402e07dcf217f4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-sampler/add-sampler-values.yaml b/examples/add-sampler/add-sampler-values.yaml index 86d18beb40..9988a3660e 100644 --- a/examples/add-sampler/add-sampler-values.yaml +++ b/examples/add-sampler/add-sampler-values.yaml @@ -15,7 +15,7 @@ agent: processors: - memory_limiter - probabilistic_sampler - - k8sattributes + - k8s_attributes - batch - resource - resourcedetection diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index 7bfb30ff4f..7cddc6d91b 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -339,7 +339,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -384,12 +384,12 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - probabilistic_sampler - - k8sattributes + - k8s_attributes - batch - resource - resourcedetection diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index fa461d3fc3..183852b9a5 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d664c52c8eee7ebcc5c4d642ae2ef022418cb63de6b3d04d83dbb75cc8269600 + checksum/config: 11195ab051933eacad91d9fe3d77db6faf83424c5254d93c895e17af81774de5 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index 7700b08a18..4bcca74562 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -106,7 +106,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -529,7 +529,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -541,7 +541,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -587,11 +587,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 9a4ac72672..d24a1fc86d 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: release: default sidecar.istio.io/inject: "false" annotations: - checksum/config: 94a646dbaae578adad52bce39c8ad33d2d2d4629d4a0441cb16373f20a2cb7cd + checksum/config: 72d8d81cc8c2c761b8b3bcb34c837d3c3a0efb6b0e11db9bfbb8c950bb3af047 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index 752cb9bc49..1c3d1589b6 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index fa391bcece..b7edfa1f1c 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 378eb91f0da4c4c3592a69cedb4427637db0201717a29ef7aad37b5b84aea950 + checksum/config: 84154622378471196763c5f4a76aa0d9efd8b1964ba152e3bb5686455db7a8ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index 1ed2282faa..b580fee45d 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -17,13 +17,13 @@ metadata: data: relay: | exporters: - otlp: + otlp_grpc: auth: authenticator: headers_setter endpoint: default-splunk-otel-collector:4317 tls: insecure: true - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter endpoint: http://default-splunk-otel-collector:4318 @@ -65,7 +65,7 @@ data: batch: metadata_keys: - X-SF-Token - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -331,7 +331,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -341,7 +341,7 @@ data: - nop metrics: exporters: - - otlp + - otlp_grpc - signalfx/host_metadata processors: - memory_limiter @@ -354,7 +354,7 @@ data: - otlp metrics/agent: exporters: - - otlp + - otlp_grpc processors: - memory_limiter - batch @@ -377,11 +377,11 @@ data: - receiver_creator traces: exporters: - - otlp + - otlp_grpc - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml index f798e767fc..68249c4a4d 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml @@ -17,14 +17,14 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -197,7 +197,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -226,11 +226,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resource/add_cluster_name receivers: diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 891274a387..e9738b40f9 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 16bff775aacc4d504219b060cb3ac92187147cea609d140ce941d42cc75bca44 + checksum/config: 48fbb7011452d9225cae6089bcb817652427e957622bc1bd4f48790d08036e27 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 9dce4c47d3..9be9049f34 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: c840c313803f7aa51eb26e8afa149544580508dc846e9e31585ede512aecf035 + checksum/config: 90b9696f685054e272b317ad791524d9e2c2d00e182e8cca0a588858e8294aee spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml index f798e767fc..68249c4a4d 100644 --- a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml @@ -17,14 +17,14 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -197,7 +197,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -226,11 +226,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resource/add_cluster_name receivers: diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index c05699d463..bcbb72b8c8 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: c840c313803f7aa51eb26e8afa149544580508dc846e9e31585ede512aecf035 + checksum/config: 90b9696f685054e272b317ad791524d9e2c2d00e182e8cca0a588858e8294aee spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index 752cb9bc49..1c3d1589b6 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index fa391bcece..b7edfa1f1c 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 378eb91f0da4c4c3592a69cedb4427637db0201717a29ef7aad37b5b84aea950 + checksum/config: 84154622378471196763c5f4a76aa0d9efd8b1964ba152e3bb5686455db7a8ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index 752cb9bc49..1c3d1589b6 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index fa391bcece..b7edfa1f1c 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 378eb91f0da4c4c3592a69cedb4427637db0201717a29ef7aad37b5b84aea950 + checksum/config: 84154622378471196763c5f4a76aa0d9efd8b1964ba152e3bb5686455db7a8ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index cbb74a2b46..ded36fe830 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -113,7 +113,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -154,7 +154,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -432,7 +432,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -449,7 +449,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -464,7 +464,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent traces: @@ -472,7 +472,7 @@ data: - splunk_hec/platform_traces processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml index 625fb4e883..f03063daaa 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -79,7 +79,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -275,7 +275,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -289,7 +289,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 70070ac066..f890feff28 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 4b9a88188e96d04f30f4cd9002e81903685c5a807b46159c5cf1781b21b8208c + checksum/config: 94fe051b9aa433188ad2a3ca5f83041cf95ae231b0d60fe404a3a2b0f1737a23 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index ba2554b3d6..bcdf3f5406 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f8b597fb38c3edd9843111b1eaed7eeec8b476dc0330bdb330585a7404a79cbc + checksum/config: b0209bf54e7bd921e58018167a8cd78d093dddd64a234cfdc6cb6fcf5c097bc5 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index bd2e5a885d..59e29f3f01 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index baa24712ab..c746beaf6c 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e23f4007060262140da9c1cfce8ccb0659897df24d521189ef1c98f2ee809931 + checksum/config: e546681fe22e6a31958422056d4d48aede64f7fdd3bfb3e2112b69264cccd8b8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index ca65dedbcb..eba0d21c2c 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -338,7 +338,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -383,11 +383,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 6c4334fc70..83786b64d4 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d3568c1b75ce5b7258c171461853af627ac3ca96f313cc2dfb9b9de50e408624 + checksum/config: 7d7aaa65b7ef5e5752ee5defad1356ffb9d9331c8cfda6ae842df82795bdde27 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks-auto-mode/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks-auto-mode/rendered_manifests/configmap-agent.yaml index 4e01e441e1..a2c5bd7221 100644 --- a/examples/distribution-eks-auto-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks-auto-mode/rendered_manifests/configmap-agent.yaml @@ -17,13 +17,13 @@ metadata: data: relay: | exporters: - otlp: + otlp_grpc: auth: authenticator: headers_setter endpoint: default-splunk-otel-collector:4317 tls: insecure: true - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter endpoint: http://default-splunk-otel-collector:4318 @@ -65,7 +65,7 @@ data: batch: metadata_keys: - X-SF-Token - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -362,7 +362,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -372,7 +372,7 @@ data: - nop metrics: exporters: - - otlp + - otlp_grpc - signalfx/host_metadata processors: - memory_limiter @@ -385,7 +385,7 @@ data: - otlp metrics/agent: exporters: - - otlp + - otlp_grpc processors: - memory_limiter - batch @@ -408,11 +408,11 @@ data: - receiver_creator traces: exporters: - - otlp + - otlp_grpc - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-eks-auto-mode/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-auto-mode/rendered_manifests/configmap-gateway.yaml index 377fece24f..6c81e03736 100644 --- a/examples/distribution-eks-auto-mode/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-auto-mode/rendered_manifests/configmap-gateway.yaml @@ -17,14 +17,14 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -231,7 +231,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -259,11 +259,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection/k8s_cluster_name receivers: diff --git a/examples/distribution-eks-auto-mode/rendered_manifests/daemonset.yaml b/examples/distribution-eks-auto-mode/rendered_manifests/daemonset.yaml index 813d1d0056..047ed7e4cc 100644 --- a/examples/distribution-eks-auto-mode/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks-auto-mode/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 14c62883d07f2e3ff641c23bfe38f8b41a8a538f06644f9652465e58257c509f + checksum/config: 63a29765edd716f8e0956d800ca2803bfcdeb0faa00a848af22ad9446a2477c1 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks-auto-mode/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-auto-mode/rendered_manifests/deployment-gateway.yaml index 4c9834a1d5..37ae970b0b 100644 --- a/examples/distribution-eks-auto-mode/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-auto-mode/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: c057367e4c91b555c3bb0a78289a2001ed5c60c2108555f17592ac5cf28b9384 + checksum/config: 69f8ebec634483b47c5cfead1c69ebe0c332b0aef7bebadcc282a5fb653444c9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml index f798e767fc..68249c4a4d 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml @@ -17,14 +17,14 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -197,7 +197,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -226,11 +226,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resource/add_cluster_name receivers: diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 9dce4c47d3..9be9049f34 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: c840c313803f7aa51eb26e8afa149544580508dc846e9e31585ede512aecf035 + checksum/config: 90b9696f685054e272b317ad791524d9e2c2d00e182e8cca0a588858e8294aee spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index 3396093bac..935ddab3b2 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -354,7 +354,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -399,11 +399,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 39b3b24974..4697e768f2 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 90f9ed726f51b201299b0a9e29a2b2e963b307cd1eafb2b98bcc3b5f049cff50 + checksum/config: 84e077a5d10f2aa0330e7ed0abb07e5a9385508774ea5e8971cfef52b1152b74 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index bd05214756..27ec643795 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -377,7 +377,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -422,11 +422,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index d5c6003798..d82ab23166 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 81e1dba84c07245dae3a7dee4745a512f304c17ce673810af55799009df1924c + checksum/config: 6dbe0f9c1494723a77a1f3ea6734a4cead79c844a5ab1b3258e36d89504749bc kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index 0d6e56703a..21a8c68a5d 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -375,7 +375,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -420,11 +420,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index b0d71da0ba..1d7b07777a 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b3b6a4a547e8bd834ca335d2dcbd83a42c164d5906cc94508391b7117f8bb243 + checksum/config: 3fbf442357186cac970c6a8b7f8197cb53e071196892de91b13990e98044ca8d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index 85a4839b83..510d434ae7 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -350,7 +350,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -395,11 +395,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 49723a35b5..7c5d934566 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: dc83bd8c776d052e99a56059e662b006ea49495536000ae73aed876f0f80157d + checksum/config: ac58956a0255a45d3ea62964e05c9d6de6475b54ccdba0e110a8566fb5400b03 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/ebpf-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/ebpf-instrumentation/rendered_manifests/configmap-agent.yaml index 752cb9bc49..1c3d1589b6 100644 --- a/examples/ebpf-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/ebpf-instrumentation/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/ebpf-instrumentation/rendered_manifests/daemonset.yaml b/examples/ebpf-instrumentation/rendered_manifests/daemonset.yaml index fa391bcece..b7edfa1f1c 100644 --- a/examples/ebpf-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/ebpf-instrumentation/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 378eb91f0da4c4c3592a69cedb4427637db0201717a29ef7aad37b5b84aea950 + checksum/config: 84154622378471196763c5f4a76aa0d9efd8b1964ba152e3bb5686455db7a8ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index c1f775509e..73011f5eb2 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.us0.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.us0.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.us0.signalfx.com/v3/event @@ -88,7 +88,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -479,7 +479,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -491,7 +491,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -536,11 +536,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 982c26378f..99980b03ad 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d6ff175f372d891fb487710679799bc7446054ea1298efb4f0b4b81bcd8650c0 + checksum/config: f3598a6d66f60bba3f9570629bab98498d0f201e431fbc34808952034d13c599 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 983f8eafa1..0a434008e5 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -113,7 +113,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -154,7 +154,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -432,7 +432,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -449,7 +449,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -464,7 +464,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent traces: @@ -472,7 +472,7 @@ data: - splunk_hec/platform_traces processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index 625fb4e883..f03063daaa 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -79,7 +79,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -275,7 +275,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -289,7 +289,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index a1546a2ce6..dbc89dc8e7 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 11ace201c8021f27d32b5b75e36efae3dc524301a25dd9964fce926e41118322 + checksum/config: 42b2246726e16a0aadd76268b2cf476a0a9ae1e5fb65d9652f53470b86f01f31 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index ba2554b3d6..bcdf3f5406 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f8b597fb38c3edd9843111b1eaed7eeec8b476dc0330bdb330585a7404a79cbc + checksum/config: b0209bf54e7bd921e58018167a8cd78d093dddd64a234cfdc6cb6fcf5c097bc5 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-trace-sampling/enable-trace-sampling-values.yaml b/examples/enable-trace-sampling/enable-trace-sampling-values.yaml index ad31becf11..19192d8695 100644 --- a/examples/enable-trace-sampling/enable-trace-sampling-values.yaml +++ b/examples/enable-trace-sampling/enable-trace-sampling-values.yaml @@ -17,7 +17,7 @@ agent: processors: - memory_limiter - probabilistic_sampler - - k8sattributes + - k8s_attributes - batch - resource - resourcedetection diff --git a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml index f3de324389..da95d79261 100644 --- a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -60,7 +60,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -203,7 +203,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -225,11 +225,11 @@ data: - prometheus/agent traces: exporters: - - otlphttp + - otlp_http processors: - memory_limiter - probabilistic_sampler - - k8sattributes + - k8s_attributes - batch - resource - resourcedetection diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index ed28486f72..522b91ee23 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c73b1b453c4ee4f2a31806b08b844b1a1d8e842ace23a57a03bb3d0733060f72 + checksum/config: 026dcb13d9f4cd512184fdcac96d5fe4fb9fbda9f5b5901e258fa333997c0afd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 7a8f812207..c25622d941 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -63,7 +63,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -337,7 +337,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -382,11 +382,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index b8844e94cf..e5e1b91587 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 8bf351d6d81ca68532019717c74546d112d991c39fce1097c956fe98c26a0f96 + checksum/config: 696f51ee15c459aff96665db9f6754f2a954fd5102afeaa585365e721f64a39d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/histograms-disabled/rendered_manifests/configmap-agent.yaml b/examples/histograms-disabled/rendered_manifests/configmap-agent.yaml index 354a7e98ce..b83b6ea427 100644 --- a/examples/histograms-disabled/rendered_manifests/configmap-agent.yaml +++ b/examples/histograms-disabled/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -106,7 +106,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -147,7 +147,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -475,7 +475,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -486,7 +486,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -503,7 +503,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -520,16 +520,16 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/histograms-disabled/rendered_manifests/configmap-cluster-receiver.yaml b/examples/histograms-disabled/rendered_manifests/configmap-cluster-receiver.yaml index 0395087b60..3fb29b5ff9 100644 --- a/examples/histograms-disabled/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/histograms-disabled/rendered_manifests/configmap-cluster-receiver.yaml @@ -85,7 +85,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -300,7 +300,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -315,7 +315,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/histograms-disabled/rendered_manifests/daemonset.yaml b/examples/histograms-disabled/rendered_manifests/daemonset.yaml index fd1860d368..e2fb9e8a85 100644 --- a/examples/histograms-disabled/rendered_manifests/daemonset.yaml +++ b/examples/histograms-disabled/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1ce09034c5de933f19c84ee6420a15f5890346ad6e8d04dbf9c9949a4df68823 + checksum/config: 97f36def5c51a691b5bc00bfa8fabd2d82fb46c585c2ed7efafb12c4400d5e4b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/histograms-disabled/rendered_manifests/deployment-cluster-receiver.yaml b/examples/histograms-disabled/rendered_manifests/deployment-cluster-receiver.yaml index 1f36c85d6e..a135193dff 100644 --- a/examples/histograms-disabled/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/histograms-disabled/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f52ca1c8e37a906e501c9dfa33984f52ad5225934ee52a38f1dcd431bb07bbd8 + checksum/config: 0ab1a4edbf61d56267a2074834a0fad69246612b40ff8c3abb6a223cc649b5e1 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/histograms-with-splunk-platform/rendered_manifests/configmap-agent.yaml b/examples/histograms-with-splunk-platform/rendered_manifests/configmap-agent.yaml index 6570443d62..610e0bcfcf 100644 --- a/examples/histograms-with-splunk-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/histograms-with-splunk-platform/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -109,7 +109,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -150,7 +150,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -533,7 +533,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -544,7 +544,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -560,7 +560,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -576,7 +576,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent metrics/histograms: @@ -592,10 +592,10 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/histograms-with-splunk-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/histograms-with-splunk-platform/rendered_manifests/configmap-cluster-receiver.yaml index 5b7019dd50..98beb87494 100644 --- a/examples/histograms-with-splunk-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/histograms-with-splunk-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -79,7 +79,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -275,7 +275,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -289,7 +289,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/histograms-with-splunk-platform/rendered_manifests/daemonset.yaml b/examples/histograms-with-splunk-platform/rendered_manifests/daemonset.yaml index 31afa4f978..102098733d 100644 --- a/examples/histograms-with-splunk-platform/rendered_manifests/daemonset.yaml +++ b/examples/histograms-with-splunk-platform/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ca0ef1d39b93f224bb3435e9e9987af6e93870937f02b816769bcdd1cd886b27 + checksum/config: b880bc989079a97098d5d7db372bcf35e5c4490715462af7ece3da9513c02fc8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/histograms-with-splunk-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/histograms-with-splunk-platform/rendered_manifests/deployment-cluster-receiver.yaml index dce4a650f7..f29e63e9a6 100644 --- a/examples/histograms-with-splunk-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/histograms-with-splunk-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 53bcc0e432cbd700937f0615b94bb0a4b1729dfa3fcc4505fc2a7a426f4ca0b2 + checksum/config: 07aa05181d8db542691bfa1ebd534110301c445f9ac3124f711168a0adc498dd spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/host-journalctl-logs/rendered_manifests/configmap-agent.yaml b/examples/host-journalctl-logs/rendered_manifests/configmap-agent.yaml index d44af3fa04..1411bb2869 100644 --- a/examples/host-journalctl-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/host-journalctl-logs/rendered_manifests/configmap-agent.yaml @@ -63,7 +63,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -338,7 +338,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/host-journalctl-logs/rendered_manifests/daemonset.yaml b/examples/host-journalctl-logs/rendered_manifests/daemonset.yaml index b07245da13..b7f50f0823 100644 --- a/examples/host-journalctl-logs/rendered_manifests/daemonset.yaml +++ b/examples/host-journalctl-logs/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 62e88891c0de92511e89e7c7ff3a8b0c35ef925087b5a0a8828c1cf20c65db30 + checksum/config: 0d62a96b18c4d7955a4397797fb9eb479a6808c5af64a27a946f0fd007bb4839 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/k8s-events-o11y-pipeline/README.md b/examples/k8s-events-o11y-pipeline/README.md index ceba921c56..288c5ab3bd 100644 --- a/examples/k8s-events-o11y-pipeline/README.md +++ b/examples/k8s-events-o11y-pipeline/README.md @@ -4,7 +4,7 @@ This configuration enables the `sendK8sEventsToSplunkO11y` feature gate, which configures the existing `logs` pipeline in the cluster receiver to route Kubernetes events to the -Splunk Observability `/v3/event` endpoint. It adds an additional `otlphttp/o11y_events` +Splunk Observability `/v3/event` endpoint. It adds an additional `otlp_http/o11y_events` exporter to the pipeline that collects events via the `k8s_events` receiver and sends them with the `o11yevents` routing header. diff --git a/examples/k8s-events-o11y-pipeline/k8s-events-o11y-pipeline-values.yaml b/examples/k8s-events-o11y-pipeline/k8s-events-o11y-pipeline-values.yaml index addbe41d0a..59ce46afc1 100644 --- a/examples/k8s-events-o11y-pipeline/k8s-events-o11y-pipeline-values.yaml +++ b/examples/k8s-events-o11y-pipeline/k8s-events-o11y-pipeline-values.yaml @@ -14,5 +14,5 @@ clusterReceiver: featureGates: # Enable sending Kubernetes events to the Splunk Observability events/v3 endpoint. # Configures the existing logs pipeline to route k8s events through an additional - # otlphttp/o11y_events exporter with the "o11yevents" routing header. + # otlp_http/o11y_events exporter with the "o11yevents" routing header. sendK8sEventsToSplunkO11y: true diff --git a/examples/k8s-events-o11y-pipeline/rendered_manifests/configmap-cluster-receiver.yaml b/examples/k8s-events-o11y-pipeline/rendered_manifests/configmap-cluster-receiver.yaml index bd8dcc6054..e824a83777 100644 --- a/examples/k8s-events-o11y-pipeline/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/k8s-events-o11y-pipeline/rendered_manifests/configmap-cluster-receiver.yaml @@ -17,7 +17,7 @@ metadata: data: relay: | exporters: - otlphttp/o11y_events: + otlp_http/o11y_events: headers: X-SF-TOKEN: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} X-Splunk-Instrumentation-Library: o11yevents @@ -177,7 +177,7 @@ data: pipelines: logs: exporters: - - otlphttp/o11y_events + - otlp_http/o11y_events processors: - memory_limiter - batch diff --git a/examples/k8s-events-o11y-pipeline/rendered_manifests/deployment-cluster-receiver.yaml b/examples/k8s-events-o11y-pipeline/rendered_manifests/deployment-cluster-receiver.yaml index 31012bb50c..c2a78ae230 100644 --- a/examples/k8s-events-o11y-pipeline/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/k8s-events-o11y-pipeline/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f61483417a5af2f0ba7c5c98699d4c1c26129ad3dbc9143a821d5b738026a278 + checksum/config: 84e5cece2d3f648e41077aa68a6e556baa85934b9e487cfb89ed8da5f30c93a9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml index 686971ed9d..2f2d3844e8 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -87,7 +87,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -477,7 +477,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -488,7 +488,7 @@ data: - otlp logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -534,11 +534,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 80730770e5..c6577b6b15 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ef299a325198aaa55820d3a23b6421455451cad8b399e87d6e3aff94a5939e35 + checksum/config: 646ae08eb6f88190ea4b9bc2e4e63a3dce0b8a0f747852cafc72fd9f2fd65db1 kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index fba608e534..a04f4b11de 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -85,7 +85,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -126,7 +126,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -395,7 +395,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -412,7 +412,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -427,7 +427,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent telemetry: diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index d84799d7ac..44d9411f4a 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -79,7 +79,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -275,7 +275,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -289,7 +289,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 71d3db8abd..c342553008 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 228bb6163e57bf5fe88de9dbc900231365507285748ab0d523941fd419c9b08d + checksum/config: fe505e0f3955533fe2c44ec2d53de9c11c35d3cfe206a9c4be68f92d8ce79d78 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 11325f6854..c72c5b9735 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 27c9a27bd0a25199dce3f61b425b3c6841261c2c1af348abec619ad3a9eb59d1 + checksum/config: 19989b4bce7a8cf7a22e05103fd5dfdcb35a669635e944b7416d00b76f12e199 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/multiline-logs/rendered_manifests/configmap-agent.yaml b/examples/multiline-logs/rendered_manifests/configmap-agent.yaml index 9e4c4e6211..407069056d 100644 --- a/examples/multiline-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/multiline-logs/rendered_manifests/configmap-agent.yaml @@ -61,7 +61,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -338,7 +338,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/multiline-logs/rendered_manifests/daemonset.yaml b/examples/multiline-logs/rendered_manifests/daemonset.yaml index 378d6f2281..3adab0176d 100644 --- a/examples/multiline-logs/rendered_manifests/daemonset.yaml +++ b/examples/multiline-logs/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 12584b241af16614c59a93ceabe2be98a7a2a644bce2b0d1885224a728e0b515 + checksum/config: 7f6672961be26237ab3401c47abc6c8d3929e83ed9fde70243624a6f27778e86 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml index b59e59fae2..222604a283 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml @@ -61,7 +61,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -331,7 +331,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 31568573de..f0ee525b15 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9e03144dac5d7228ee5e97d56957496263b87731413abe578805501139a37042 + checksum/config: 15a7f6d89a19712010eb0f37e951afc2c9b4478d47db58e05018c051ecbd6703 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index fec4d385e9..4d6b4e7121 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -99,7 +99,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -262,7 +262,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - hostmetrics - kubeletstats @@ -277,7 +277,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/agent telemetry: diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index 1aa1623439..713e0a8c5b 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -46,7 +46,7 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -183,7 +183,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/k8s_cluster receivers: - k8s_cluster @@ -197,7 +197,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics receivers: - prometheus/k8s_cluster_receiver telemetry: diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index cc68d8abab..f46b03823b 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5a37c0b0cc99d62c22e5ae179a1c925084610f6c3e340a3579aec7a48cb1b2d5 + checksum/config: 9d37bfb56746cfeaaf5dc5f9166d18fe7923181d48a98770280b50b8baf225d8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index 2c421f8548..4a7d7a31c0 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 96d6e33737935645366989464dc76950f79177550357804ad87113037723179e + checksum/config: 8111fbdc20aec9095e8151bf4824eae9a3bfcdccec9bab50380f456bec57225f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index 05b03f8bc4..a8d7aaffcd 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -17,7 +17,7 @@ metadata: data: relay: | exporters: - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -57,7 +57,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -323,7 +323,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 15f6472462..30e5cfc1b3 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 17dbae630441a7a077e00c5e7e3ecb337b0442b8d8a5f7de2ed32b05face5e1b + checksum/config: 03f2d4f0bf5b1d0da6893a40d8ac7bf3579bbb2fc51624b25061b89dbbea64e3 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-traces/rendered_manifests/configmap-agent.yaml b/examples/only-traces/rendered_manifests/configmap-agent.yaml index 07998eddd8..b001f3725b 100644 --- a/examples/only-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/only-traces/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -60,7 +60,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -200,7 +200,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -222,10 +222,10 @@ data: - prometheus/agent traces: exporters: - - otlphttp + - otlp_http processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 6866876702..a0181c401c 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: f2028fcac01d45f314a925a8536f3104fb77312e02e34d164b410d391d0f8fa5 + checksum/config: aa6431683987f54d175959097c2586edbd652c9efcd1825b3ece2b8b5935a99c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/otlp-token-passthrough/rendered_manifests/configmap-agent.yaml b/examples/otlp-token-passthrough/rendered_manifests/configmap-agent.yaml index c0da8307fa..02776e559d 100644 --- a/examples/otlp-token-passthrough/rendered_manifests/configmap-agent.yaml +++ b/examples/otlp-token-passthrough/rendered_manifests/configmap-agent.yaml @@ -17,13 +17,13 @@ metadata: data: relay: | exporters: - otlp: + otlp_grpc: auth: authenticator: headers_setter endpoint: default-splunk-otel-collector:4317 tls: insecure: true - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter endpoint: http://default-splunk-otel-collector:4318 @@ -65,7 +65,7 @@ data: batch: metadata_keys: - X-SF-Token - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -333,7 +333,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -343,7 +343,7 @@ data: - nop metrics: exporters: - - otlp + - otlp_grpc - signalfx/host_metadata processors: - memory_limiter @@ -356,7 +356,7 @@ data: - otlp metrics/agent: exporters: - - otlp + - otlp_grpc processors: - memory_limiter - batch @@ -379,11 +379,11 @@ data: - receiver_creator traces: exporters: - - otlp + - otlp_grpc - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/otlp-token-passthrough/rendered_manifests/configmap-gateway.yaml b/examples/otlp-token-passthrough/rendered_manifests/configmap-gateway.yaml index f798e767fc..68249c4a4d 100644 --- a/examples/otlp-token-passthrough/rendered_manifests/configmap-gateway.yaml +++ b/examples/otlp-token-passthrough/rendered_manifests/configmap-gateway.yaml @@ -17,14 +17,14 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -58,7 +58,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -197,7 +197,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -226,11 +226,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resource/add_cluster_name receivers: diff --git a/examples/otlp-token-passthrough/rendered_manifests/daemonset.yaml b/examples/otlp-token-passthrough/rendered_manifests/daemonset.yaml index 18e2bb39f0..ba6f5e3a9b 100644 --- a/examples/otlp-token-passthrough/rendered_manifests/daemonset.yaml +++ b/examples/otlp-token-passthrough/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c71f646d450ab55ef18142c2b725ddb4db27d9140398a491da514dd1d9ac0597 + checksum/config: a915e29a380f73a4fb12bca8b101d5773dbd2958fc6804141cee0bdc62e490ec kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/otlp-token-passthrough/rendered_manifests/deployment-gateway.yaml b/examples/otlp-token-passthrough/rendered_manifests/deployment-gateway.yaml index c05699d463..bcbb72b8c8 100644 --- a/examples/otlp-token-passthrough/rendered_manifests/deployment-gateway.yaml +++ b/examples/otlp-token-passthrough/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: c840c313803f7aa51eb26e8afa149544580508dc846e9e31585ede512aecf035 + checksum/config: 90b9696f685054e272b317ad791524d9e2c2d00e182e8cca0a588858e8294aee spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index 0b0cf3e2d8..5878abee96 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -17,16 +17,16 @@ metadata: data: relay: | exporters: - otlp: + otlp_grpc: endpoint: :4317 tls: insecure: true - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -66,7 +66,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -340,10 +340,10 @@ data: pipelines: logs: exporters: - - otlp + - otlp_grpc logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -353,7 +353,7 @@ data: - nop metrics: exporters: - - otlp + - otlp_grpc processors: - memory_limiter - batch @@ -388,11 +388,11 @@ data: - receiver_creator traces: exporters: - - otlp + - otlp_grpc - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 69840d8414..0479f00b41 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b8ad4a74074e546d07c8482c5ffab5c38430821b8ca5d258ff08d91df71fa3a4 + checksum/config: ee21e8a516b61bd835cd098b02fb684a76adfcf0b7cdcce69b8935944ce2cf1e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/route-data-through-gateway-deployed-separately/route-data-through-gateway-deployed-separately-values.yaml b/examples/route-data-through-gateway-deployed-separately/route-data-through-gateway-deployed-separately-values.yaml index def6d5afbc..863326e350 100644 --- a/examples/route-data-through-gateway-deployed-separately/route-data-through-gateway-deployed-separately-values.yaml +++ b/examples/route-data-through-gateway-deployed-separately/route-data-through-gateway-deployed-separately-values.yaml @@ -6,7 +6,7 @@ splunkObservability: agent: config: exporters: - otlp: + otlp_grpc: endpoint: :4317 tls: insecure: true @@ -16,11 +16,11 @@ agent: service: pipelines: traces: - exporters: [otlp, signalfx] + exporters: [otlp_grpc, signalfx] metrics: - exporters: [otlp] + exporters: [otlp_grpc] logs: - exporters: [otlp] + exporters: [otlp_grpc] clusterReceiver: config: diff --git a/examples/secret-validation/rendered_manifests/configmap-agent.yaml b/examples/secret-validation/rendered_manifests/configmap-agent.yaml index 600144f072..575e60bd5b 100644 --- a/examples/secret-validation/rendered_manifests/configmap-agent.yaml +++ b/examples/secret-validation/rendered_manifests/configmap-agent.yaml @@ -61,7 +61,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -303,7 +303,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index fe801ed883..e029d5b957 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: be831479db676d7f5202d30a16853d634269279d168f4cf05fe2eb1a942832b3 + checksum/config: 6c5afb2f800563be140f3f57b17b98031e508ae2fb5ce324c7acb76c39889a7d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/secureapp-agent-mode/rendered_manifests/configmap-agent.yaml b/examples/secureapp-agent-mode/rendered_manifests/configmap-agent.yaml index a3c466e2db..e0c4d68b73 100644 --- a/examples/secureapp-agent-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/secureapp-agent-mode/rendered_manifests/configmap-agent.yaml @@ -26,16 +26,16 @@ data: pipelines: - logs/secureapp exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event - otlphttp/secureapp: + otlp_http/secureapp: headers: X-SF-TOKEN: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} X-Splunk-Instrumentation-Library: secureapp @@ -82,7 +82,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -359,7 +359,7 @@ data: - splunk_hec/o11y processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -369,7 +369,7 @@ data: - routing/logs logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -379,7 +379,7 @@ data: - nop logs/secureapp: exporters: - - otlphttp/secureapp + - otlp_http/secureapp processors: - memory_limiter - batch @@ -427,11 +427,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/secureapp-agent-mode/rendered_manifests/daemonset.yaml b/examples/secureapp-agent-mode/rendered_manifests/daemonset.yaml index 0c436c937f..fc8e5cf325 100644 --- a/examples/secureapp-agent-mode/rendered_manifests/daemonset.yaml +++ b/examples/secureapp-agent-mode/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 11f314c48bee758aa578fdd8e00849937e980ee45aeaff2d3e362f9fe5b542a3 + checksum/config: f6633faf81c0d201897a25c5b24127800a3775e947d3c0807135dd8c171ae5a4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/secureapp-gateway-mode/rendered_manifests/configmap-gateway.yaml b/examples/secureapp-gateway-mode/rendered_manifests/configmap-gateway.yaml index d030c27ac2..7277b75cd2 100644 --- a/examples/secureapp-gateway-mode/rendered_manifests/configmap-gateway.yaml +++ b/examples/secureapp-gateway-mode/rendered_manifests/configmap-gateway.yaml @@ -30,18 +30,18 @@ data: pipelines: - logs/secureapp exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp sending_queue: num_consumers: 32 traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event - otlphttp/secureapp: + otlp_http/secureapp: headers: X-SF-TOKEN: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} X-Splunk-Instrumentation-Library: secureapp @@ -76,7 +76,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -217,7 +217,7 @@ data: exporters: null processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resource/logs @@ -225,7 +225,7 @@ data: - routing/logs logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -233,7 +233,7 @@ data: - routing/logs logs/secureapp: exporters: - - otlphttp/secureapp + - otlp_http/secureapp processors: - memory_limiter - batch @@ -267,11 +267,11 @@ data: - prometheus/collector traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resource/add_cluster_name receivers: diff --git a/examples/secureapp-gateway-mode/rendered_manifests/deployment-gateway.yaml b/examples/secureapp-gateway-mode/rendered_manifests/deployment-gateway.yaml index 23554b26ba..2a6d20d572 100644 --- a/examples/secureapp-gateway-mode/rendered_manifests/deployment-gateway.yaml +++ b/examples/secureapp-gateway-mode/rendered_manifests/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 334bae074ec1148e6ee024caee9030fc693b496b73d6f73cbfc9eb705ee2136f + checksum/config: 1389895483c00a94a51403cff8013b5ac8d9a08ff7830ee7f8eaf5628b8c90d9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml index 22569de08a..ce9ad60161 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml @@ -61,7 +61,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -306,7 +306,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 275cbdce5a..8edf2a07ba 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1bdb048f16fbbd9f382245df0c459cc31e19d636a0df9e36cf9a1a5674294068 + checksum/config: ee7d1fc72c3f1a7777bfe861f96bfbb408375859f56bdf51dd67d871edb71f50 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-agent.yaml b/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-agent.yaml index 94e432d20c..f00405bf7f 100644 --- a/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-agent.yaml +++ b/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-agent.yaml @@ -84,7 +84,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -125,7 +125,7 @@ data: name: ip - sources: - from: connection - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -402,7 +402,7 @@ data: - splunk_hec/platform_logs processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch - resourcedetection @@ -419,7 +419,7 @@ data: - batch - resourcedetection - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/metrics receivers: - hostmetrics @@ -435,7 +435,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics - resource/metrics receivers: - prometheus/agent diff --git a/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-cluster-receiver.yaml index e5069d290c..719c7d5ad5 100644 --- a/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/splunk-platform-with-sourcetypes/rendered_manifests/configmap-cluster-receiver.yaml @@ -79,7 +79,7 @@ data: key: k8s.event.uid batch: send_batch_max_size: 32768 - k8sattributes/metrics: + k8s_attributes/metrics: extract: annotations: - from: namespace @@ -280,7 +280,7 @@ data: - batch - transform/k8shpascaletargetref - resource - - k8sattributes/metrics + - k8s_attributes/metrics - resource/metrics - resource/k8s_cluster receivers: @@ -295,7 +295,7 @@ data: - resourcedetection - resource - resource/add_mode - - k8sattributes/metrics + - k8s_attributes/metrics - resource/metrics receivers: - prometheus/k8s_cluster_receiver diff --git a/examples/splunk-platform-with-sourcetypes/rendered_manifests/daemonset.yaml b/examples/splunk-platform-with-sourcetypes/rendered_manifests/daemonset.yaml index 1f00231044..b15640136d 100644 --- a/examples/splunk-platform-with-sourcetypes/rendered_manifests/daemonset.yaml +++ b/examples/splunk-platform-with-sourcetypes/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: acc39001a63d6d1f080d0fdd7cf54f7a43ca1c0fe5d0ba3d0b907a1260bcc66a + checksum/config: caecccae998c463c3ca49f5d2e9d1f66bc417d98ec2a80bad2c0b1f438b96fee kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/splunk-platform-with-sourcetypes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/splunk-platform-with-sourcetypes/rendered_manifests/deployment-cluster-receiver.yaml index b4707a17cd..ae63c9d1e6 100644 --- a/examples/splunk-platform-with-sourcetypes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/splunk-platform-with-sourcetypes/rendered_manifests/deployment-cluster-receiver.yaml @@ -30,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 1cd102127318a27204f0b97a45c67c353ed10f804ff613c31ed4e5e7735fd8ba + checksum/config: a26c29c0840b9aaf4094cd571330be030bd2c3b7ba3e84f7ec8fdba6bee396b9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index a0e7d06e6a..e92568aa27 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -344,7 +344,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -391,11 +391,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 742272d50a..29bfea8992 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 6a10594ab33b29a1c407934ec5273021ea26672f1aece2b5be7285f99c1e63f9 + checksum/config: 7f2480a561e1c5b629b9130f8e4487c98f5e498901681a95850f4f77e6d72930 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index 752cb9bc49..1c3d1589b6 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -336,7 +336,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -381,11 +381,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index bc58bc09a0..e512074aac 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 378eb91f0da4c4c3592a69cedb4427637db0201717a29ef7aad37b5b84aea950 + checksum/config: 84154622378471196763c5f4a76aa0d9efd8b1964ba152e3bb5686455db7a8ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index c2c19712ed..24ad61a7ac 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -17,12 +17,12 @@ metadata: data: relay: | exporters: - otlphttp: + otlp_http: auth: authenticator: headers_setter metrics_endpoint: https://ingest.CHANGEME.signalfx.com/v2/datapoint/otlp traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp - otlphttp/entities: + otlp_http/entities: auth: authenticator: headers_setter logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event @@ -62,7 +62,7 @@ data: resource_attributes: - key: splunk.com/exclude value: "true" - k8sattributes: + k8s_attributes: extract: annotations: - from: pod @@ -344,7 +344,7 @@ data: pipelines: logs/entities: exporters: - - otlphttp/entities + - otlp_http/entities processors: - memory_limiter - batch @@ -390,11 +390,11 @@ data: - receiver_creator traces: exporters: - - otlphttp + - otlp_http - signalfx processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 54d82c813a..7c44f43872 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 0daf0d176be3deaea476ee34d820ed4ff3a10d157363422614d8edf6efae4221 + checksum/config: 72672f226efa0d8bf0cc91d479327d1585fdbbd626d3cc6506a4e4c0031e5abe kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/functional_tests/discovery/testdata/agent_only_values.tmpl b/functional_tests/discovery/testdata/agent_only_values.tmpl index 0c0d1ac3c9..9d67ced906 100644 --- a/functional_tests/discovery/testdata/agent_only_values.tmpl +++ b/functional_tests/discovery/testdata/agent_only_values.tmpl @@ -11,7 +11,7 @@ agent: enabled: true config: exporters: - otlphttp/entities: + otlp_http/entities: logs_endpoint: {{ .EventsURL }}/v1/logs clusterReceiver: diff --git a/functional_tests/discovery/testdata/agent_with_gateway_values.tmpl b/functional_tests/discovery/testdata/agent_with_gateway_values.tmpl index 6f3d19c5cc..7d3ca32105 100644 --- a/functional_tests/discovery/testdata/agent_with_gateway_values.tmpl +++ b/functional_tests/discovery/testdata/agent_with_gateway_values.tmpl @@ -19,7 +19,7 @@ gateway: memory: 256Mi config: exporters: - otlphttp/entities: + otlp_http/entities: logs_endpoint: {{ .EventsURL }}/v1/logs clusterReceiver: diff --git a/functional_tests/functional/testdata/expected_kind_values/expected_internal_metrics.yaml b/functional_tests/functional/testdata/expected_kind_values/expected_internal_metrics.yaml index 56b6b238a0..505f10ae8e 100644 --- a/functional_tests/functional/testdata/expected_kind_values/expected_internal_metrics.yaml +++ b/functional_tests/functional/testdata/expected_kind_values/expected_internal_metrics.yaml @@ -1271,7 +1271,7 @@ resourceMetrics: stringValue: logs - key: exporter value: - stringValue: otlphttp/entities + stringValue: otlp_http/entities - key: host.name value: stringValue: kind-control-plane @@ -1556,7 +1556,7 @@ resourceMetrics: stringValue: traces - key: exporter value: - stringValue: otlp + stringValue: otlp_grpc - key: host.name value: stringValue: kind-control-plane @@ -2673,7 +2673,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes + stringValue: k8s_attributes - key: server.port value: stringValue: "8889" @@ -3072,7 +3072,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes/metrics + stringValue: k8s_attributes/metrics - key: server.port value: stringValue: "8889" @@ -3471,7 +3471,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes + stringValue: k8s_attributes - key: server.port value: stringValue: "8889" @@ -5755,7 +5755,7 @@ resourceMetrics: stringValue: logs - key: exporter value: - stringValue: otlphttp/entities + stringValue: otlp_http/entities - key: host.name value: stringValue: kind-control-plane @@ -8345,7 +8345,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes + stringValue: k8s_attributes - key: server.port value: stringValue: "8889" @@ -8744,7 +8744,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes/metrics + stringValue: k8s_attributes/metrics - key: server.port value: stringValue: "8889" @@ -9143,7 +9143,7 @@ resourceMetrics: stringValue: agent - key: processor value: - stringValue: k8sattributes + stringValue: k8s_attributes - key: server.port value: stringValue: "8889" diff --git a/functional_tests/functional/testdata/values/aks_test_linux_values.yaml.tmpl b/functional_tests/functional/testdata/values/aks_test_linux_values.yaml.tmpl index 02f4a12252..5adf5af355 100644 --- a/functional_tests/functional/testdata/values/aks_test_linux_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/aks_test_linux_values.yaml.tmpl @@ -21,7 +21,7 @@ agent: exporters: file: path: /tmp/metrics.json - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -29,7 +29,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc metrics/agent: exporters: - file diff --git a/functional_tests/functional/testdata/values/aks_test_win_values.yaml.tmpl b/functional_tests/functional/testdata/values/aks_test_win_values.yaml.tmpl index ccc2fa3f37..1cd1c2ef49 100644 --- a/functional_tests/functional/testdata/values/aks_test_win_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/aks_test_win_values.yaml.tmpl @@ -21,7 +21,7 @@ agent: memory: 1Gi config: exporters: - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -31,7 +31,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc metrics/agent: exporters: - file diff --git a/functional_tests/functional/testdata/values/autopilot_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/autopilot_test_values.yaml.tmpl index b82fb14740..b2e3274f34 100644 --- a/functional_tests/functional/testdata/values/autopilot_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/autopilot_test_values.yaml.tmpl @@ -12,7 +12,7 @@ splunkPlatform: agent: config: exporters: - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -20,7 +20,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc clusterReceiver: eventsEnabled: true config: diff --git a/functional_tests/functional/testdata/values/eks_auto_mode_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/eks_auto_mode_test_values.yaml.tmpl index 40d56a71f4..e5c4c89f56 100644 --- a/functional_tests/functional/testdata/values/eks_auto_mode_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/eks_auto_mode_test_values.yaml.tmpl @@ -26,7 +26,7 @@ agent: exporters: file: path: /tmp/metrics.json - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -36,7 +36,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc metrics/agent: exporters: - file diff --git a/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl index 5cb05748ba..8478da9694 100644 --- a/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl @@ -30,7 +30,7 @@ agent: file: path: /tmp/metrics.json {{ end }} - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -45,7 +45,7 @@ agent: {{ end }} traces: exporters: - - otlp + - otlp_grpc clusterReceiver: eventsEnabled: true config: diff --git a/functional_tests/functional/testdata/values/gce_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/gce_test_values.yaml.tmpl index 475d66026d..31b01bfcd0 100644 --- a/functional_tests/functional/testdata/values/gce_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/gce_test_values.yaml.tmpl @@ -24,7 +24,7 @@ agent: exporters: file: path: /tmp/metrics.json - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -37,7 +37,7 @@ agent: - file traces: exporters: - - otlp + - otlp_grpc clusterReceiver: eventsEnabled: true config: diff --git a/functional_tests/functional/testdata/values/gke_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/gke_test_values.yaml.tmpl index eabb01081b..d3c352a0a4 100644 --- a/functional_tests/functional/testdata/values/gke_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/gke_test_values.yaml.tmpl @@ -12,7 +12,7 @@ splunkPlatform: agent: config: exporters: - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -22,7 +22,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc metrics/agent: exporters: - file diff --git a/functional_tests/functional/testdata/values/rosa_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/rosa_test_values.yaml.tmpl index 76d2a923e3..af38efd339 100644 --- a/functional_tests/functional/testdata/values/rosa_test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/rosa_test_values.yaml.tmpl @@ -26,7 +26,7 @@ agent: exporters: file: path: /tmp/metrics.json - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -39,7 +39,7 @@ agent: - file traces: exporters: - - otlp + - otlp_grpc clusterReceiver: eventsEnabled: true config: diff --git a/functional_tests/functional/testdata/values/test_values.yaml.tmpl b/functional_tests/functional/testdata/values/test_values.yaml.tmpl index 1a9fde8822..4379fb4dcd 100644 --- a/functional_tests/functional/testdata/values/test_values.yaml.tmpl +++ b/functional_tests/functional/testdata/values/test_values.yaml.tmpl @@ -26,7 +26,7 @@ agent: file: path: /tmp/metrics.json {{ end }} - otlp: + otlp_grpc: endpoint: {{ .OtlpEndpoint }} tls: insecure: true @@ -43,7 +43,7 @@ agent: {{ end }} traces: exporters: - - otlp + - otlp_grpc clusterReceiver: eventsEnabled: true config: diff --git a/functional_tests/k8sentities/k8sentities_test.go b/functional_tests/k8sentities/k8sentities_test.go index 2f9f77a2cb..51280820f6 100644 --- a/functional_tests/k8sentities/k8sentities_test.go +++ b/functional_tests/k8sentities/k8sentities_test.go @@ -6,7 +6,7 @@ // // When enabled, the helm chart adds a logs/k8s_entities pipeline to the cluster // receiver that collects Kubernetes entity data via the k8s_cluster receiver and -// forwards it to the Splunk Observability v3/event endpoint using an otlphttp +// forwards it to the Splunk Observability v3/event endpoint using an otlp_http // exporter. This test deploys the chart with the feature gate enabled, waits for // data to arrive at a local OTLP HTTP sink that mimics the v3/event endpoint, // and compares the collected logs against a golden file. @@ -56,7 +56,7 @@ func Test_K8SEntities(t *testing.T) { internal.SetupSignalFxAPIServer(t) - // Receive OTLP logs sent by the otlphttp/o11y_entities exporter to the /v3/event path. + // Receive OTLP logs sent by the otlp_http/o11y_entities exporter to the /v3/event path. entitiesLogsSink = internal.SetupOTLPLogsSinkOnPort(t, otlpEntitiesPort, "/v3/event") if os.Getenv("SKIP_SETUP") == "true" { diff --git a/functional_tests/k8sevents/k8sevents_test.go b/functional_tests/k8sevents/k8sevents_test.go index db46e4d3f2..aeced5829e 100644 --- a/functional_tests/k8sevents/k8sevents_test.go +++ b/functional_tests/k8sevents/k8sevents_test.go @@ -122,7 +122,7 @@ func Test_K8SEvents(t *testing.T) { plogtest.IgnoreResourceAttributeValue("host.name"), plogtest.IgnoreLogRecordAttributeValue("k8s.object.uid"), plogtest.IgnoreLogRecordAttributeValue("k8s.object.resource_version"), - plogtest.IgnoreResourceAttributeValue("com.splunk.index"), // this is flaky, the index can be the value from pod annotation due to the k8sattributes processor in the pipeline or main + plogtest.IgnoreResourceAttributeValue("com.splunk.index"), // this is flaky, the index can be the value from pod annotation due to the k8s_attributes processor in the pipeline or main plogtest.IgnoreResourceLogsOrder(), plogtest.IgnoreScopeLogsOrder(), plogtest.IgnoreLogRecordsOrder(), diff --git a/functional_tests/obi/testdata/values/obi_values.yaml.tmpl b/functional_tests/obi/testdata/values/obi_values.yaml.tmpl index d557bcbcad..1595a22bcb 100644 --- a/functional_tests/obi/testdata/values/obi_values.yaml.tmpl +++ b/functional_tests/obi/testdata/values/obi_values.yaml.tmpl @@ -12,7 +12,7 @@ clusterReceiver: agent: config: exporters: - otlp: + otlp_grpc: endpoint: "{{ .OTLPEndpoint }}" tls: insecure: true @@ -20,7 +20,7 @@ agent: pipelines: traces: exporters: - - otlp + - otlp_grpc obi: enabled: true diff --git a/functional_tests/token_passthrough/testdata/agent_only_values.tmpl b/functional_tests/token_passthrough/testdata/agent_only_values.tmpl index a4d116fd18..250b18aae0 100644 --- a/functional_tests/token_passthrough/testdata/agent_only_values.tmpl +++ b/functional_tests/token_passthrough/testdata/agent_only_values.tmpl @@ -16,7 +16,7 @@ agent: http: include_metadata: true exporters: - otlphttp: + otlp_http: traces_endpoint: {{ .OTLPSink }}/v2/trace/otlp clusterReceiver: diff --git a/functional_tests/token_passthrough/testdata/agent_with_gateway_values.tmpl b/functional_tests/token_passthrough/testdata/agent_with_gateway_values.tmpl index 50ed906e83..9b3a7e5259 100644 --- a/functional_tests/token_passthrough/testdata/agent_with_gateway_values.tmpl +++ b/functional_tests/token_passthrough/testdata/agent_with_gateway_values.tmpl @@ -32,7 +32,7 @@ gateway: http: include_metadata: true exporters: - otlphttp: + otlp_http: traces_endpoint: {{ .OTLPSink }}/v2/trace/otlp clusterReceiver: diff --git a/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml b/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml index 0df17fde28..281ee86998 100644 --- a/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml +++ b/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml @@ -20,7 +20,7 @@ agent: processors: - memory_limiter - probabilistic_sampler - - k8sattributes + - k8s_attributes - batch - resource - resourcedetection diff --git a/helm-charts/splunk-otel-collector/ci/use-custom-gateway-values.yaml b/helm-charts/splunk-otel-collector/ci/use-custom-gateway-values.yaml index a21083d568..7f072db067 100644 --- a/helm-charts/splunk-otel-collector/ci/use-custom-gateway-values.yaml +++ b/helm-charts/splunk-otel-collector/ci/use-custom-gateway-values.yaml @@ -6,7 +6,7 @@ splunkObservability: agent: config: exporters: - otlp: + otlp_grpc: endpoint: 192.168.0.10:4317 tls: insecure: true @@ -16,9 +16,9 @@ agent: service: pipelines: traces: - exporters: [otlp, signalfx] + exporters: [otlp_grpc, signalfx] metrics: - exporters: [otlp] + exporters: [otlp_grpc] clusterReceiver: config: diff --git a/helm-charts/splunk-otel-collector/templates/NOTES.txt b/helm-charts/splunk-otel-collector/templates/NOTES.txt index b0e1102044..8622662f5a 100644 --- a/helm-charts/splunk-otel-collector/templates/NOTES.txt +++ b/helm-charts/splunk-otel-collector/templates/NOTES.txt @@ -61,3 +61,7 @@ Splunk OpenTelemetry Collector is installed and configured to send data to Splun {{- fail (printf "ERROR: Deprecated instrumentation configuration detected, the following %s is no longer supported under instrumentation. Please migrate to instrumentation.spec.*. See https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#01280-to-01290 for details." $instrKeys) }} {{- end }} {{- end }} + +{{- include "splunk-otel-collector.failOnDeprecatedNames" (dict "config" .Values.agent.config "source" "agent.config") }} +{{- include "splunk-otel-collector.failOnDeprecatedNames" (dict "config" .Values.gateway.config "source" "gateway.config") }} +{{- include "splunk-otel-collector.failOnDeprecatedNames" (dict "config" .Values.clusterReceiver.config "source" "clusterReceiver.config") }} diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index 73a04fcd2b..19b52cfe43 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -302,7 +302,7 @@ Whether k8s events sending to Splunk Observability events/v3 endpoint is enabled {{/* [EXPERIMENTAL] Whether the k8s entities pipeline is enabled. -Sends k8s_cluster receiver data to Splunk Observability v3/event endpoint via otlphttp. +Sends k8s_cluster receiver data to Splunk Observability v3/event endpoint via otlp_http. */}} {{- define "splunk-otel-collector.k8sEntitiesEnabled" -}} {{- and (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") .Values.featureGates.enableK8sEntities -}} @@ -441,3 +441,52 @@ Otherwise, return directory only. {{- .Values.logsCollection.journald.directory -}} {{- end -}} {{- end -}} + +{{/* +Fail if a collector config override uses deprecated component names. +Checks exporter/processor definitions and pipeline references. + +To add a new deprecation, add an entry to $depExporters or $depProcessors. + +Usage: + include "splunk-otel-collector.failOnDeprecatedNames" (dict "config" .Values.agent.config "source" "agent.config") +*/}} +{{- define "splunk-otel-collector.failOnDeprecatedNames" -}} +{{- if .config -}} +{{- $source := .source -}} +{{- $depExporters := dict "otlp" "otlp_grpc" "otlphttp" "otlp_http" -}} +{{- $depProcessors := dict "k8sattributes" "k8s_attributes" -}} +{{- range $key, $_ := (dig "exporters" (dict) .config) -}} + {{- range $old, $new := $depExporters -}} + {{- if or (eq $key $old) (hasPrefix (printf "%s/" $old) $key) -}} + {{- fail (printf "%s.exporters.%s: \"%s\" has been renamed to \"%s\". Please update your custom configuration." $source $key $old $new) -}} + {{- end -}} + {{- end -}} +{{- end -}} +{{- range $key, $_ := (dig "processors" (dict) .config) -}} + {{- range $old, $new := $depProcessors -}} + {{- if or (eq $key $old) (hasPrefix (printf "%s/" $old) $key) -}} + {{- fail (printf "%s.processors.%s: \"%s\" has been renamed to \"%s\". Please update your custom configuration." $source $key $old $new) -}} + {{- end -}} + {{- end -}} +{{- end -}} +{{- range $pname, $p := (dig "service" "pipelines" (dict) .config) -}} + {{- if $p -}} + {{- range $item := (dig "exporters" (list) $p) -}} + {{- range $old, $new := $depExporters -}} + {{- if or (eq $item $old) (hasPrefix (printf "%s/" $old) $item) -}} + {{- fail (printf "%s.service.pipelines.%s.exporters references \"%s\": \"%s\" has been renamed to \"%s\". Please update your custom configuration." $source $pname $item $old $new) -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- range $item := (dig "processors" (list) $p) -}} + {{- range $old, $new := $depProcessors -}} + {{- if or (eq $item $old) (hasPrefix (printf "%s/" $old) $item) -}} + {{- fail (printf "%s.service.pipelines.%s.processors references \"%s\": \"%s\" has been renamed to \"%s\". Please update your custom configuration." $source $pname $item $old $new) -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 434814d3ac..2215f68b67 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -14,11 +14,11 @@ memory_limiter: {{- end }} {{/* -Common config for the otel-collector otlphttp exporter +Common config for the otel-collector otlp_http exporter */}} {{- define "splunk-otel-collector.otlpHttpExporter" -}} {{- if (eq (include "splunk-otel-collector.tracesEnabled" .) "true") }} -otlphttp: +otlp_http: metrics_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v2/datapoint/otlp traces_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v2/trace/otlp auth: @@ -193,7 +193,7 @@ resourcedetection/k8s_cluster_name: Common config for K8s attributes processor adding k8s metadata to resource attributes. */}} {{- define "splunk-otel-collector.k8sAttributesProcessor" -}} -k8sattributes: +k8s_attributes: pod_association: - sources: - from: resource_attribute @@ -241,7 +241,7 @@ k8sattributes: Common config for K8s attributes processor adding k8s metadata to metrics resource attributes. */}} {{- define "splunk-otel-collector.k8sAttributesSplunkPlatformMetrics" -}} -k8sattributes/metrics: +k8s_attributes/metrics: pod_association: - sources: - from: resource_attribute diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl index c377ad2bdd..aadaf96f18 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -830,10 +830,10 @@ receivers: {{- end }} {{- end }} -# By default k8sattributes and batch processors enabled. +# By default k8s_attributes and batch processors enabled. processors: {{- include "splunk-otel-collector.k8sAttributesProcessor" . | nindent 2 }} - # Agent specific configuration of k8sattributes: + # Agent specific configuration of k8s_attributes: # If gateway deployment is enabled, the `passthrough` configuration is enabled by default. # It means that traces and metrics enrichment happens in the gateway, and the agent only passes information # about traces and metrics source, without calling k8s API. @@ -975,16 +975,16 @@ processors: key: destination_canonical_revision {{- end }} -# If the gateway deployment is enabled, it will use a otlp exporter to send from the daemonset +# If the gateway deployment is enabled, it will use a otlp_grpc exporter to send from the daemonset # to the gateway deployment. # Otherwise it's pointed directly to signalfx backend based on the values provided in signalfx setting, -# using the otlphttp exporter. +# using the otlp_http exporter. # These values should not be specified manually and will be set in the templates. exporters: {{- if .Values.gateway.enabled }} # If gateway is enabled, metrics, logs and traces will be sent to the gateway - otlp: + otlp_grpc: endpoint: {{ include "splunk-otel-collector.fullname" . }}:4317 tls: insecure: true @@ -1007,7 +1007,7 @@ exporters: disable_compression: true {{- end }} {{- if .Values.splunkObservability.secureAppEnabled }} - otlphttp/secureapp: + otlp_http/secureapp: logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event headers: "X-SF-TOKEN": "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" @@ -1061,7 +1061,7 @@ exporters: {{- end }} # To send entities (applicable only if discovery mode is enabled) - otlphttp/entities: + otlp_http/entities: {{- if .Values.gateway.enabled }} endpoint: http://{{ include "splunk-otel-collector.fullname" . }}:4318 {{- else }} @@ -1137,9 +1137,9 @@ service: processors: [memory_limiter, batch] exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- else }} - - otlphttp/secureapp + - otlp_http/secureapp {{- end }} {{- end }} {{- if or (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq (include "splunk-otel-collector.profilingEnabled" .) "true") }} @@ -1161,7 +1161,7 @@ service: {{- end }} processors: - memory_limiter - - k8sattributes + - k8s_attributes {{- if not .Values.gateway.enabled }} - filter/logs {{- end }} @@ -1184,7 +1184,7 @@ service: {{- end }} exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- else }} {{- if (eq (include "splunk-otel-collector.o11yProfilingEnabled" .) "true") }} - splunk_hec/o11y @@ -1221,7 +1221,7 @@ service: {{- end }} exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- else }} {{- if eq (include "splunk-otel-collector.platformLogsEnabled" .) "true" }} - splunk_hec/platform_logs @@ -1239,7 +1239,7 @@ service: - zipkin processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch - resourcedetection - resource @@ -1248,10 +1248,10 @@ service: {{- end }} exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- else }} {{- if (eq (include "splunk-otel-collector.o11yTracesEnabled" .) "true") }} - - otlphttp + - otlp_http {{- end }} {{- if (eq (include "splunk-otel-collector.platformTracesEnabled" .) "true") }} - splunk_hec/platform_traces @@ -1295,14 +1295,14 @@ service: - metricstransform {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} {{- end }} exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }} # The signalfx exporter is only being used to sync host metadata when gateway is enabled. # The otlp exporter sends the metric data. @@ -1330,14 +1330,14 @@ service: - resource - resource/add_mode {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} {{- end }} exporters: {{- if .Values.gateway.enabled }} - - otlp + - otlp_grpc {{- else }} {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} - signalfx @@ -1357,7 +1357,7 @@ service: - batch - resourcedetection - resource - exporters: [otlphttp/entities] + exporters: [otlp_http/entities] {{- if and .Values.featureGates.useControlPlaneMetricsHistogramData (eq (include "splunk-otel-collector.metricsEnabled" .) "true") }} metrics/histograms: diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl index 4c419efda6..a1a4593162 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -38,7 +38,7 @@ receivers: # Prometheus receiver scraping metrics from the pod itself {{- include "splunk-otel-collector.prometheusInternalMetrics" (dict "receiver" "collector") | nindent 2}} -# By default k8sattributes, memory_limiter and batch processors enabled. +# By default k8s_attributes, memory_limiter and batch processors enabled. processors: {{- include "splunk-otel-collector.k8sAttributesProcessor" . | nindent 2 }} @@ -127,12 +127,12 @@ exporters: sending_queue: num_consumers: 32 # To send entities (applicable only if discovery mode is enabled) - otlphttp/entities: + otlp_http/entities: logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event auth: authenticator: headers_setter {{- if .Values.splunkObservability.secureAppEnabled }} - otlphttp/secureapp: + otlp_http/secureapp: logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event headers: "X-SF-TOKEN": "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" @@ -220,7 +220,7 @@ service: receivers: [otlp, jaeger, zipkin] processors: - memory_limiter - - k8sattributes + - k8s_attributes - batch {{- if eq (include "splunk-otel-collector.autoDetectClusterName" .) "true" }} - resourcedetection/k8s_cluster_name @@ -236,7 +236,7 @@ service: {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.o11yTracesEnabled" .) "true") }} - - otlphttp + - otlp_http - signalfx {{- end }} {{- if (eq (include "splunk-otel-collector.platformTracesEnabled" .) "true") }} @@ -268,7 +268,7 @@ service: - resource/add_environment {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} @@ -292,14 +292,14 @@ service: - otlp {{- end }} processors: [memory_limiter, batch] - exporters: [otlphttp/entities] + exporters: [otlp_http/entities] {{- if .Values.splunkObservability.secureAppEnabled }} # secureapp events logs/secureapp: receivers: - routing/logs processors: [memory_limiter, batch] - exporters: [otlphttp/secureapp] + exporters: [otlp_http/secureapp] {{- end }} {{- end }} {{- if or (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq (include "splunk-otel-collector.profilingEnabled" .) "true") (.Values.splunkObservability.secureAppEnabled)}} @@ -318,7 +318,7 @@ service: {{- end }} processors: - memory_limiter - - k8sattributes + - k8s_attributes - filter/logs - batch {{- if .Values.autodetect.istio }} @@ -348,7 +348,7 @@ service: - resource/add_cluster_name {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl index 10383d8943..a9e7d24ab0 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl @@ -276,7 +276,7 @@ exporters: {{- end }} {{- if eq (include "splunk-otel-collector.sendK8sEventsToSplunkO11yEnabled" .) "true" }} - otlphttp/o11y_events: + otlp_http/o11y_events: logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event headers: "X-SF-TOKEN": "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" @@ -284,7 +284,7 @@ exporters: {{- end }} {{- if eq (include "splunk-otel-collector.k8sEntitiesEnabled" .) "true" }} - otlphttp/o11y_entities: + otlp_http/o11y_entities: logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event headers: "X-SF-TOKEN": "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" @@ -346,7 +346,7 @@ service: {{- end }} - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} @@ -371,7 +371,7 @@ service: {{- end }} - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} @@ -396,7 +396,7 @@ service: - resource - resource/add_mode {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - - k8sattributes/metrics + - k8s_attributes/metrics {{- if or .Values.splunkPlatform.metricsSourcetype .Values.splunkPlatform.sourcetype }} - resource/metrics {{- end }} @@ -429,7 +429,7 @@ service: - splunk_hec/platform_logs {{- end }} {{- if eq (include "splunk-otel-collector.sendK8sEventsToSplunkO11yEnabled" .) "true" }} - - otlphttp/o11y_events + - otlp_http/o11y_events {{- end }} {{- end }} @@ -496,7 +496,7 @@ service: {{- end }} - resource exporters: - - otlphttp/o11y_entities + - otlp_http/o11y_entities {{- end }} {{- end }} diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 2ea313911b..2751cf360e 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1391,7 +1391,7 @@ featureGates: # splunkPlatform.logsEnabled (Splunk Platform logs) to be enabled. sendK8sEventsToSplunkO11y: false # [EXPERIMENTAL] This feature gate enables a new logs pipeline that sends Kubernetes entity data - # (collected from the k8s_cluster receiver) to the Splunk Observability v3/event endpoint via otlphttp. + # (collected from the k8s_cluster receiver) to the Splunk Observability v3/event endpoint via otlp_http. # Requires Splunk Observability to be configured (splunkObservability.realm or ingestUrl must be set). # This feature is experimental and may change or be removed in future releases. enableK8sEntities: false diff --git a/unittests/k8sentities_test.yaml b/unittests/k8sentities_test.yaml index 3221adc876..3c304e9b39 100644 --- a/unittests/k8sentities_test.yaml +++ b/unittests/k8sentities_test.yaml @@ -15,7 +15,7 @@ tests: pattern: "logs/k8s_entities" - notMatchRegex: path: data["relay"] - pattern: "otlphttp/o11y_entities" + pattern: "otlp_http/o11y_entities" - it: should render k8s entities pipeline when featureGates.enableK8sEntities is true set: @@ -27,7 +27,7 @@ tests: pattern: "logs/k8s_entities" - matchRegex: path: data["relay"] - pattern: "otlphttp/o11y_entities" + pattern: "otlp_http/o11y_entities" - matchRegex: path: data["relay"] pattern: "/v3/event"