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 index routing #256

Merged
merged 5 commits into from
Oct 29, 2021
Merged

Add index routing #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b25b8e
Add index routing
chaitanyaphalak Oct 28, 2021
2e7af2e
update changelog
chaitanyaphalak Oct 28, 2021
a3b3d0b
add rendered files
chaitanyaphalak Oct 29, 2021
d02ae21
fix changelog
chaitanyaphalak Oct 29, 2021
f632423
add implementation for gateway collector
chaitanyaphalak Oct 29, 2021
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added

- Add initContainer for log checkpoint migration from Fluentd to Otel agent (#253)
- Add index routing for Splunk Enterprise/Cloud customers (#256)

## [0.37.0] - 2021-10-26

Expand Down
6 changes: 6 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 @@ -276,6 +276,12 @@ processors:
- key: splunk.com/exclude
tag_name: splunk.com/exclude
from: pod
- key: splunk.com/index
tag_name: com.splunk.index
from: namespace
- key: splunk.com/index
tag_name: com.splunk.index
from: pod
{{- with .Values.extraAttributes.podLabels }}
labels:
{{- range . }}
Expand Down
6 changes: 6 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 @@ -59,6 +59,12 @@ processors:
- key: splunk.com/exclude
tag_name: splunk.com/exclude
from: pod
- key: splunk.com/index
tag_name: com.splunk.index
from: namespace
- key: splunk.com/index
tag_name: com.splunk.index
from: pod
{{- with .Values.extraAttributes.podLabels }}
labels:
{{- range . }}
Expand Down
6 changes: 6 additions & 0 deletions rendered/manifests/agent-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ data:
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
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 @@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 4ffcd6ad374bf3453a1bbfb00e3e479e5a7cf02fccda7ff775f910c4a5bbd14b
checksum/config: 20a1fd3f41ceed15707bd33502fd3f75ce1597d18af73ce912f4f439897ce980
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
6 changes: 6 additions & 0 deletions rendered/manifests/gateway-only/configmap-otel-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ data:
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/deployment-collector.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: 2963fe3886378456d19ca16255af597ead8a8107b61963c01031eed94a136639
checksum/config: 6ddfa38dbe4dd50fd0ff81ab32a4119f9f886f0477d838bfdc89ae6af06dbd16
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
6 changes: 6 additions & 0 deletions rendered/manifests/logs-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ data:
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
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: 4328d5df45de1880b436838f5094a78a57b3bb464a6615053a5569acf2b963fb
checksum/config: 983ef6fe97ebf7e114e7702c2bbd0ba72194b668994a283d9fccef9bc9f559c9
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
6 changes: 6 additions & 0 deletions rendered/manifests/metrics-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ data:
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
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: 9c3e9e1d077cd5b6a4bbdf19c15b2a819cfeb0403e4d6c7e67f71d401b25df79
checksum/config: 8c07d464239d90650b529646b44d241718a1dea4767be5c805ebde25e5b8ea42
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
6 changes: 6 additions & 0 deletions rendered/manifests/traces-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ data:
- from: pod
key: splunk.com/exclude
tag_name: splunk.com/exclude
- from: namespace
key: splunk.com/index
tag_name: com.splunk.index
- from: pod
key: splunk.com/index
tag_name: com.splunk.index
labels:
- key: app
metadata:
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: f13bd43848f30b76fe54b1069cc94749703ae49e278d4f875281d1f6ea85d8f0
checksum/config: bdfe44006ba069e4375ed1dda455e6e3ce606f9cbbe0b1492c2a51706e12eb31
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down