Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing processors to metrics pipeline #399

Merged
merged 4 commits into from
Mar 9, 2022
Merged

Add missing processors to metrics pipeline #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1809628
Add environment processor to metrics sent to Splunk
tongpu Mar 7, 2022
82f859e
Update changelog
tongpu Mar 8, 2022
b27ef17
Update CHANGELOG.md
dmitryax Mar 9, 2022
2a4321a
Merge branch 'main' into bug/metrics_processors
dmitryax Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

## [0.44.1] - 2022-03-08

### Fixed

- Add environment processor to metrics pipeline when sending metrics to Splunk Platform (#399)

## [0.44.0] - 2022-03-03

### Added
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: splunk-otel-collector
version: 0.44.0
version: 0.44.1
appVersion: 0.44.0
description: Splunk OpenTelemetry Collector for Kubernetes
icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
Expand Down
3 changes: 3 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,9 @@ service:
- batch
- resourcedetection
- resource
{{- if (and .Values.splunkPlatform.metricsEnabled .Values.environment) }}
- resource/add_environment
{{- end }}
{{- if .Values.isWindows }}
- metricstransform
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ service:
{{- if .Values.extraAttributes.custom }}
- resource/add_custom_attrs
{{- end }}
{{- if (and .Values.splunkPlatform.metricsEnabled .Values.environment) }}
- resource/add_environment
{{- end }}
exporters:
{{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }}
- signalfx
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
rules:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-otel-agent
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
6 changes: 3 additions & 3 deletions rendered/manifests/agent-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-agent
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
spec:
Expand All @@ -29,7 +29,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 22485775cf7aa15d84c29f3b263478c8094585023d7835357d3b75903a80b381
checksum/config: d9bdeeee21bc8da10680e6338d3c530701df3c580a7788264aa362acab2fcf7a
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
6 changes: 3 additions & 3 deletions rendered/manifests/agent-only/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ metadata:
name: default-splunk-otel-collector-k8s-cluster-receiver
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-k8s-cluster-receiver
Expand All @@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f071e6903141bc1aa59f94faf8eef2e519f56acb4cf28cfd38c5fe295ce2b5b8
checksum/config: c66f93805b2b2e5fb1c4d21ebe36fb1a6688d7451b6bc8ebf468f0fd5bce78c9
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/secret-splunk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
type: Opaque
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
rules:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/configmap-cluster-receiver-node-discoverer-script.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-cr-node-discoverer-script
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/configmap-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
6 changes: 3 additions & 3 deletions rendered/manifests/eks-fargate/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ metadata:
name: default-splunk-otel-collector-k8s-cluster-receiver
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-k8s-cluster-receiver
Expand All @@ -32,7 +32,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: a4127846f195dd23e69913307ee6e25e5f810546e7a5c25ec81b7d8f747b54ae
checksum/config: d739a74eb5a8404135fe62b0730cb2e7fd8e8372dbc3f265d943a9e27c62ca03
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
6 changes: 3 additions & 3 deletions rendered/manifests/eks-fargate/deployment-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-collector
Expand All @@ -30,7 +30,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: aea5807dba6bcab44c89502c99a514f8c0a784e613eddd792bf4edd53724ac8f
checksum/config: d00b2479ef868a93e0c99374748ec9d9bc7bff151450dccf46b3ac6dac4971f4
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/secret-splunk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
type: Opaque
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-collector
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
4 changes: 2 additions & 2 deletions rendered/manifests/gateway-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
rules:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/gateway-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/gateway-only/configmap-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ metadata:
name: default-splunk-otel-collector-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.44.0
helm.sh/chart: splunk-otel-collector-0.44.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.44.0"
app: splunk-otel-collector
chart: splunk-otel-collector-0.44.0
chart: splunk-otel-collector-0.44.1
release: default
heritage: Helm
data:
Expand Down
Loading