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

Explicitly set match_type parameter in filter processor #385

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Explicitly set match_type parameter in filter processor #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/config/_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ Filter logs processor
filter/logs:
logs:
{{ .Values.logsCollection.containers.useSplunkIncludeAnnotation | ternary "include" "exclude" }}:
match_type: strict
resource_attributes:
- key: {{ include "splunk-otel-collector.filterAttr" . }}
value: "true"
Expand Down
1 change: 1 addition & 0 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 @@ -42,6 +42,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: aa7528ec9c709cc3ba572b82a01e5655bc4b4f3dfc033dfe63416f7dfc938f1e
checksum/config: 0f9d655547d838d756caa945851e4b3fa9c7dc077aeb87e29b9fe7be0cabfc89
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
1 change: 1 addition & 0 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 @@ -40,6 +40,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/eks-fargate/deployment-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: 47a5973ab9684c31d4ea82f2aeb8194527083cfcc20ec43c293c54f6d0ef3676
checksum/config: 4bece69606d91681bbbf6d563e9cf975bef2f0e2eb65d0c4c2c5195d36ae3cee
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
1 change: 1 addition & 0 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 @@ -40,6 +40,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/deployment-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: 85899e674fbc0355d85fbb7d822a4bea21dd0e3c1a4b0f6c889e6218db593a94
checksum/config: 542eb9adab3ab14cb34d4cfe176b071dbfe33685b187f8d992024af92b27b78d
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
1 change: 1 addition & 0 deletions rendered/manifests/logs-only/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 3ab283e375e0dd2e5fc5b4fa26bf0935b3029d42c2d77f36623a8003473f9978
checksum/config: 6f3510034b23bf0bdc80c125bc872a4e958c2074fa3a7264b4363499ad63072d
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
1 change: 1 addition & 0 deletions rendered/manifests/metrics-only/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 7084567f96152193e375f201b458d6723fb0ce8be9ca3b4f9edce25fd7da0525
checksum/config: 1d4258d58071c97907dfd41cec47975188901435328e0710c2176515fe4cffed
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
1 change: 1 addition & 0 deletions rendered/manifests/otel-logs/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/otel-logs/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 5ad23fec85ce0c684fdf787156ac399d29bbc574d9fcd9af80a2fcc292579525
checksum/config: b3036ac596045014d775fcc8e5571ede014ad8fe9930105b44c8fbb89ecba89a
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
1 change: 1 addition & 0 deletions rendered/manifests/traces-only/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ data:
filter/logs:
logs:
exclude:
match_type: strict
resource_attributes:
- key: splunk.com/exclude
value: "true"
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 2a3d6ef153bd2553d4bdcbcf0ec967978a09bff154e992dd56eb5654d1f8e1e3
checksum/config: 01339a894491164cc8db28eaac6db1f5319e1e4b5a1ff1f9056539895301e1da
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down