Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'signalfx:main' into add-journald-config
Browse files Browse the repository at this point in the history
luckyj5 authored Nov 16, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents e00da4e + 13e1345 commit e8b4b05
Showing 61 changed files with 1,083 additions and 75 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
version: v3.6.3

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.0.1
uses: helm/chart-testing-action@v2.1.0
with:
version: v3.3.1

2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ jobs:
version: v3.5.4

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.1.0
uses: helm/chart-releaser-action@v1.2.1
with:
charts_dir: helm-charts
env:
2 changes: 1 addition & 1 deletion .github/workflows/validate-changelog.yaml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:

- name: Read current version of the Chart
id: read-chart
uses: cumulusds/get-yaml-paths-action@v0.1.0
uses: cumulusds/get-yaml-paths-action@v0.1.1
with:
file: helm-charts/splunk-otel-collector/Chart.yaml
version: version
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,6 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- Field name compatibility for SCK (#258)

### Changed

- Extract `container.image.tag` attribute from `container.image.name` (#285)
- Upgrade splunk-otel-collector image to 0.38.1 (#284)

### Fixed

- Splunk Platform client certificates (#286)

### Removed

- Busybox image dependency (#275)
@@ -28,7 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [0.37.0] - 2021-10-26

[Upgrade
guidelines](https://github.com/signalfx/splunk-otel-collector-chart#0362-to-0370)
guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0362-to-0370)

### Added

@@ -174,7 +183,7 @@ guidelines](https://github.com/signalfx/splunk-otel-collector-chart#0362-to-0370
### Changed

- BREAKING CHANGE: Auto-detection of prometheus metrics is disabled by default (#163). See
[Upgrade guideline](https://github.com/signalfx/splunk-otel-collector-chart#0264-to-0270)
[Upgrade guideline](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0264-to-0270)

## [0.26.4] - 2021-06-09

16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ render:
rm -rf "$$dir"/splunk-otel-collector; \
done

# All telemetry types but no gateway, only agent.
# Default configuration deployment.
dir=rendered/manifests/agent-only; \
mkdir -p "$$dir"; \
helm template \
@@ -26,7 +26,7 @@ render:
mv "$$dir"/splunk-otel-collector/templates/* "$$dir"; \
rm -rf "$$dir"/splunk-otel-collector

# All telemetry types but no agent, only gateway.
# Gateway mode deployment only.
dir=rendered/manifests/gateway-only; \
mkdir -p "$$dir"; \
helm template \
@@ -37,3 +37,15 @@ render:
default helm-charts/splunk-otel-collector; \
mv "$$dir"/splunk-otel-collector/templates/* "$$dir"; \
rm -rf "$$dir"/splunk-otel-collector

# Native OTel logs collection instead of fluentd.
dir=rendered/manifests/otel-logs; \
mkdir -p "$$dir"; \
helm template \
--namespace default \
--values rendered/values.yaml \
--output-dir "$$dir" \
--set logsEngine=otel \
default helm-charts/splunk-otel-collector; \
mv "$$dir"/splunk-otel-collector/templates/* "$$dir"; \
rm -rf "$$dir"/splunk-otel-collector
2 changes: 1 addition & 1 deletion docs/troubleshooting.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
This document covers troubleshooting scenarios specific to Kubernetes
environment only. For general troubleshooting of Splunk OpenTelemetry Collector
see [Splunk OpenTelemetry Collector troubleshooting
documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md).
documentation](https://github.com/signalfx/splunk-otel-collector/blob/main/docs/troubleshooting.md).

## Gathering Support Information

2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: splunk-otel-collector
version: 0.37.1
appVersion: 0.37.1
appVersion: 0.38.1
description: Splunk OpenTelemetry Connector for Kubernetes
icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
type: application
14 changes: 7 additions & 7 deletions helm-charts/splunk-otel-collector/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -7,29 +7,29 @@ Splunk OpenTelemetry Connector is installed and configured to send data to Splun

{{- if .Values.splunkRealm }}
[WARNING] "splunkRealm" parameter is deprecated, please use "splunkObservability.realm" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if .Values.splunkAccessToken }}
[WARNING] "splunkAccessToken" parameter is deprecated, please use "splunkObservability.accessToken" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if .Values.ingestUrl }}
[WARNING] "ingestUrl" parameter is deprecated, please use "splunkObservability.ingestUrl" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if .Values.apiUrl }}
[WARNING] "apiUrl" parameter is deprecated, please use "splunkObservability.apiUrl" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if not (eq (toString .Values.metricsEnabled) "<nil>") }}
[WARNING] "metricsEnabled" parameter is deprecated, please use "splunkObservability.metricsEnabled" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if not (eq (toString .Values.tracesEnabled) "<nil>") }}
[WARNING] "tracesEnabled" parameter is deprecated, please use "splunkObservability.tracesEnabled" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
{{- if not (eq (toString .Values.logsEnabled) "<nil>") }}
[WARNING] "logsEnabled" parameter is deprecated, please use "splunkObservability.logsEnabled" instead.
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart#0353-to-0360
Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0353-to-0360
{{ end }}
Original file line number Diff line number Diff line change
@@ -94,6 +94,21 @@ processors:
key: {{ .name }}
value: {{ .value }}
{{- end }}
# Extract "container.image.tag" attribute from "container.image.name" here until k8scluster
# receiver does it natively.
- key: container.image.name
pattern: ^(?P<temp_container_image_name>[^\:]+)(?:\:(?P<temp_container_image_tag>.*))?
action: extract
- key: container.image.name
from_attribute: temp_container_image_name
action: upsert
- key: temp_container_image_name
action: delete
- key: container.image.tag
from_attribute: temp_container_image_tag
action: upsert
- key: temp_container_image_tag
action: delete

exporters:
{{- if eq (include "splunk-otel-collector.o11yMetricsEnabled" $) "true" }}
10 changes: 10 additions & 0 deletions helm-charts/splunk-otel-collector/templates/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -308,6 +308,11 @@ spec:
readOnly: true
{{- end }}
{{- end }}
{{- if or .Values.splunkPlatform.clientCert .Values.splunkPlatform.clientKey .Values.splunkPlatform.caFile }}
- name: secret
mountPath: /otel/etc
readOnly: true
{{- end }}
{{- if and (eq (include "splunk-otel-collector.logsEnabled" $) "true") (eq .Values.logsEngine "otel") }}
- name: varlog
mountPath: /var/log
@@ -398,6 +403,11 @@ spec:
path: /var/run/utmp
{{- end }}
{{- end }}
{{- if or .Values.splunkPlatform.clientCert .Values.splunkPlatform.clientKey .Values.splunkPlatform.caFile }}
- name: secret
secret:
secretName: {{ template "splunk-otel-collector.secret" . }}
{{- end }}
- name: otel-configmap
configMap:
name: {{ template "splunk-otel-collector.fullname" . }}-otel-agent
9 changes: 5 additions & 4 deletions rendered/README.md
Original file line number Diff line number Diff line change
@@ -4,10 +4,11 @@ The [manifests](manifests) directory contains pre-rendered Kubernetes resource
manifests that can be applied with `kubectl create`. Different sets contain
different features enabled. For now, configured for Slunk Observability only.

- [metrics-only](manifests/metrics-only)
- [traces-only](manifests/traces-only)
- [logs-only](manifests/logs-only)
- [agent-only](manifests/agent-only)
- [Default configuration deployment](manifests/agent-only)
- [Default deployment with native OTel logs collection](manifests/otel-logs)
- [Metrics collection only](manifests/metrics-only)
- [Traces collection only](manifests/traces-only)
- [Fluent logs collection only](manifests/logs-only)

contains manifests with all telemetry types enabled for the agent (the default when installing Helm chart).

2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-fluentd-cri.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-fluentd-json.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-fluentd.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-otel-agent.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -42,6 +42,19 @@ data:
- action: upsert
key: k8s.cluster.name
value: CHANGEME
- action: extract
key: container.image.name
pattern: ^(?P<temp_container_image_name>[^\:]+)(?:\:(?P<temp_container_image_tag>.*))?
- action: upsert
from_attribute: temp_container_image_name
key: container.image.name
- action: delete
key: temp_container_image_name
- action: upsert
from_attribute: temp_container_image_tag
key: container.image.tag
- action: delete
key: temp_container_image_tag
resource/add_collector_k8s:
attributes:
- action: insert
6 changes: 3 additions & 3 deletions rendered/manifests/agent-only/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: a6d79e9266fdb03b053855a5abd5e519189ebfbc6b81e192f77cd785da963369
checksum/config: 4eeca5afdb8456588b3f21440b9833d2f723f657ae167126f7f5182eea44bf30
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
@@ -152,7 +152,7 @@ spec:
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.37.1
@@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 0482b5c8dc6f8b2b65eaca8979490e13ddffaa7ef323cf330677deee0e635b5e
checksum/config: 7a0c93778a90faf607f84f182e959a2fa0a5086f8e085c2e7a5b1205ed9c9085
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
@@ -41,7 +41,7 @@ spec:
- /otelcol
- --config=/conf/relay.yaml
- --metrics-addr=0.0.0.0:8889
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/secret.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
6 changes: 3 additions & 3 deletions rendered/manifests/gateway-only/deployment-collector.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.37.1
@@ -30,7 +30,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: 792d830893ffad4b22a959320e4992cc5fb336697b87e5c908a50589c2abb946
checksum/config: 82f5a99ec5d7b25a404a23c6a3cb486b28037b729f073fc101230c04b610904d
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
@@ -41,7 +41,7 @@ spec:
- /otelcol
- --config=/conf/relay.yaml
- --metrics-addr=0.0.0.0:8889
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/secret.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/service.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.37.1
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-fluentd-cri.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-fluentd-json.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-fluentd.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-otel-agent.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
6 changes: 3 additions & 3 deletions rendered/manifests/logs-only/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 6c9b7449f787bc4c7631753162320384d8103395de97f8419c671cc1f9f45782
checksum/config: a31970065aabdf55dec4f5397d2d338f6b988f1599e0dca4ecf168fd294eb945
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
@@ -132,7 +132,7 @@ spec:
- name: otlp-http-old
containerPort: 55681
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/secret.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/configmap-otel-agent.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -42,6 +42,19 @@ data:
- action: upsert
key: k8s.cluster.name
value: CHANGEME
- action: extract
key: container.image.name
pattern: ^(?P<temp_container_image_name>[^\:]+)(?:\:(?P<temp_container_image_tag>.*))?
- action: upsert
from_attribute: temp_container_image_name
key: container.image.name
- action: delete
key: temp_container_image_name
- action: upsert
from_attribute: temp_container_image_tag
key: container.image.tag
- action: delete
key: temp_container_image_tag
resource/add_collector_k8s:
attributes:
- action: insert
6 changes: 3 additions & 3 deletions rendered/manifests/metrics-only/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: a2ddd09def6ab417ec0967414e446ebf9adfae0e109ac263863cff98c23cdd7e
checksum/config: e7d1ec302095a1cfdf06114064eb7e01edcf9dce8b2bf6028ae922ba1ac653a6
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
@@ -60,7 +60,7 @@ spec:
containerPort: 9943
hostPort: 9943
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.37.1
@@ -30,7 +30,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 0482b5c8dc6f8b2b65eaca8979490e13ddffaa7ef323cf330677deee0e635b5e
checksum/config: 7a0c93778a90faf607f84f182e959a2fa0a5086f8e085c2e7a5b1205ed9c9085
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
@@ -41,7 +41,7 @@ spec:
- /otelcol
- --config=/conf/relay.yaml
- --metrics-addr=0.0.0.0:8889
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/secret.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
83 changes: 83 additions & 0 deletions rendered/manifests/otel-logs/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
# Source: splunk-otel-collector/templates/clusterRole.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
rules:
- apiGroups:
- ""
resources:
- events
- namespaces
- namespaces/status
- nodes
- nodes/spec
- nodes/stats
- nodes/proxy
- pods
- pods/status
- persistentvolumeclaims
- persistentvolumes
- replicationcontrollers
- replicationcontrollers/status
- resourcequotas
- services
verbs:
- get
- list
- watch
- apiGroups:
- apps
resources:
- daemonsets
- deployments
- replicasets
- statefulsets
verbs:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- daemonsets
- deployments
- replicasets
verbs:
- get
- list
- watch
- apiGroups:
- batch
resources:
- jobs
- cronjobs
verbs:
- get
- list
- watch
- apiGroups:
- autoscaling
resources:
- horizontalpodautoscalers
verbs:
- get
- list
- watch
- nonResourceURLs:
- /metrics
verbs:
- get
- list
- watch
24 changes: 24 additions & 0 deletions rendered/manifests/otel-logs/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
# Source: splunk-otel-collector/templates/clusterRoleBinding.yaml
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: default-splunk-otel-collector
subjects:
- kind: ServiceAccount
name: default-splunk-otel-collector
namespace: default
333 changes: 333 additions & 0 deletions rendered/manifests/otel-logs/configmap-otel-agent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,333 @@
---
# Source: splunk-otel-collector/templates/configmap-otel-agent.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: default-splunk-otel-collector-otel-agent
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
data:
relay: |
exporters:
sapm:
access_token: ${SPLUNK_O11Y_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
signalfx:
access_token: ${SPLUNK_O11Y_ACCESS_TOKEN}
api_url: https://api.CHANGEME.signalfx.com
correlation: null
ingest_url: https://ingest.CHANGEME.signalfx.com
sync_host_metadata: true
splunk_hec/o11y:
endpoint: https://ingest.CHANGEME.signalfx.com/v1/log
token: ${SPLUNK_O11Y_ACCESS_TOKEN}
extensions:
file_storage:
directory: /var/lib/otel_pos
health_check: null
k8s_observer:
auth_type: serviceAccount
node: ${K8S_NODE_NAME}
memory_ballast:
size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
zpages: null
processors:
batch: null
filter/logs:
logs:
exclude:
resource_attributes:
- key: splunk.com/exclude
value: "true"
k8sattributes:
extract:
annotations:
- from: pod
key: splunk.com/sourcetype
- from: namespace
key: splunk.com/exclude
tag_name: splunk.com/exclude
- 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:
- k8s.namespace.name
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- container.id
- container.image.name
- container.image.tag
filter:
node_from_env_var: K8S_NODE_NAME
pod_association:
- from: resource_attribute
name: k8s.pod.uid
- from: resource_attribute
name: k8s.pod.ip
- from: resource_attribute
name: ip
- from: connection
- from: resource_attribute
name: host.name
memory_limiter:
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.cluster.name
value: CHANGEME
resource/add_agent_k8s:
attributes:
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/logs:
attributes:
- action: upsert
from_attribute: k8s.pod.annotations.splunk.com/sourcetype
key: com.splunk.sourcetype
- action: delete
key: k8s.pod.annotations.splunk.com/sourcetype
- action: delete
key: splunk.com/exclude
resourcedetection:
detectors:
- env
- system
override: false
timeout: 10s
receivers:
filelog:
encoding: utf-8
exclude:
- /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
fingerprint_size: 1kb
force_flush_period: "0"
include:
- /var/log/pods/*/*/*.log
include_file_name: false
include_file_path: true
max_concurrent_files: 1024
max_log_size: 1MiB
operators:
- id: get-format
routes:
- expr: $$$$body matches "^\\{"
output: parser-docker
- expr: $$$$body matches "^[^ Z]+ "
output: parser-crio
- expr: $$$$body matches "^[^ Z]+Z"
output: parser-containerd
type: router
- id: parser-crio
regex: ^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$
timestamp:
layout: "2006-01-02T15:04:05.000000000-07:00"
layout_type: gotime
parse_from: time
type: regex_parser
- combine_field: log
id: crio-recombine
is_last_entry: ($$.logtag) == 'F'
type: recombine
- id: crio-handle_empty_log
if: $$.log == nil
ops:
- add:
field: log
value: ""
output: filename
type: restructure
- id: parser-containerd
regex: ^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$
timestamp:
layout: '%Y-%m-%dT%H:%M:%S.%LZ'
parse_from: time
type: regex_parser
- combine_field: log
id: containerd-recombine
is_last_entry: ($$.logtag) == 'F'
type: recombine
- id: containerd-handle_empty_log
if: $$.log == nil
ops:
- add:
field: log
value: ""
output: filename
type: restructure
- id: parser-docker
timestamp:
layout: '%Y-%m-%dT%H:%M:%S.%LZ'
parse_from: time
type: json_parser
- id: filename
resource:
com.splunk.source: EXPR($$$$attributes["file.path"])
type: metadata
- id: extract_metadata_from_filepath
parse_from: $$$$attributes["file.path"]
regex: ^\/var\/log\/pods\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[^\/]+)\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$
type: regex_parser
- attributes:
stream: EXPR($$.stream)
resource:
com.splunk.sourcetype: EXPR("kube:container:"+$$.container_name)
k8s.container.name: EXPR($$.container_name)
k8s.container.restart_count: EXPR($$.restart_count)
k8s.namespace.name: EXPR($$.namespace)
k8s.pod.name: EXPR($$.pod_name)
k8s.pod.uid: EXPR($$.uid)
type: metadata
- id: clean-up-log-record
ops:
- move:
from: log
to: $$
type: restructure
poll_interval: 200ms
start_at: beginning
fluentforward:
endpoint: 0.0.0.0:8006
hostmetrics:
collection_interval: 10s
scrapers:
cpu: null
disk: null
filesystem: null
load: null
memory: null
network: null
paging: null
processes: null
jaeger:
protocols:
grpc:
endpoint: 0.0.0.0:14250
thrift_http:
endpoint: 0.0.0.0:14268
kubeletstats:
auth_type: serviceAccount
collection_interval: 10s
endpoint: ${K8S_NODE_IP}:10250
extra_metadata_labels:
- container.id
metric_groups:
- container
- pod
- node
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:4318
prometheus/agent:
config:
scrape_configs:
- job_name: otel-agent
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
receiver_creator:
receivers: null
watch_observers:
- k8s_observer
signalfx:
endpoint: 0.0.0.0:9943
smartagent/signalfx-forwarder:
listenAddress: 0.0.0.0:9080
type: signalfx-forwarder
zipkin:
endpoint: 0.0.0.0:9411
service:
extensions:
- file_storage
- health_check
- k8s_observer
- memory_ballast
- zpages
pipelines:
logs:
exporters:
- splunk_hec/o11y
processors:
- memory_limiter
- k8sattributes
- batch
- filter/logs
- resource
- resource/logs
- resourcedetection
receivers:
- filelog
- fluentforward
- otlp
metrics:
exporters:
- signalfx
processors:
- memory_limiter
- batch
- resource
- resourcedetection
receivers:
- hostmetrics
- kubeletstats
- otlp
- receiver_creator
- signalfx
metrics/agent:
exporters:
- signalfx
processors:
- memory_limiter
- batch
- resource
- resource/add_agent_k8s
- resourcedetection
receivers:
- prometheus/agent
traces:
exporters:
- sapm
- signalfx
processors:
- memory_limiter
- k8sattributes
- batch
- resource
- resourcedetection
receivers:
- otlp
- jaeger
- smartagent/signalfx-forwarder
- zipkin
115 changes: 115 additions & 0 deletions rendered/manifests/otel-logs/configmap-otel-k8s-cluster-receiver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
---
# Source: splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml
apiVersion: v1
kind: ConfigMap
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.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
data:
relay: |
exporters:
signalfx:
access_token: ${SPLUNK_O11Y_ACCESS_TOKEN}
api_url: https://api.CHANGEME.signalfx.com
ingest_url: https://ingest.CHANGEME.signalfx.com
timeout: 10s
extensions:
health_check: null
memory_ballast:
size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
processors:
batch: null
memory_limiter:
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
- action: insert
key: metric_source
value: kubernetes
- action: insert
key: receiver
value: k8scluster
- action: upsert
key: k8s.cluster.name
value: CHANGEME
- action: extract
key: container.image.name
pattern: ^(?P<temp_container_image_name>[^\:]+)(?:\:(?P<temp_container_image_tag>.*))?
- action: upsert
from_attribute: temp_container_image_name
key: container.image.name
- action: delete
key: temp_container_image_name
- action: upsert
from_attribute: temp_container_image_tag
key: container.image.tag
- action: delete
key: temp_container_image_tag
resource/add_collector_k8s:
attributes:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resourcedetection:
detectors:
- env
- system
override: false
timeout: 10s
receivers:
k8s_cluster:
auth_type: serviceAccount
metadata_exporters:
- signalfx
prometheus/k8s_cluster_receiver:
config:
scrape_configs:
- job_name: otel-k8s-cluster-receiver
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
service:
extensions:
- health_check
- memory_ballast
pipelines:
metrics:
exporters:
- signalfx
processors:
- memory_limiter
- batch
- resource
receivers:
- k8s_cluster
metrics/collector:
exporters:
- signalfx
processors:
- memory_limiter
- batch
- resource
- resource/add_collector_k8s
- resourcedetection
receivers:
- prometheus/k8s_cluster_receiver
242 changes: 242 additions & 0 deletions rendered/manifests/otel-logs/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
---
# Source: splunk-otel-collector/templates/daemonset.yaml
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: default-splunk-otel-collector-agent
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
spec:
updateStrategy:
type: RollingUpdate
selector:
matchLabels:
app: splunk-otel-collector
release: default
template:
metadata:
labels:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 79fbef3ed17c5716a0d28f36d47d1f28fa123718a75dd9865dec2160707b0b47
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
serviceAccountName: default-splunk-otel-collector
nodeSelector:
kubernetes.io/os: linux
tolerations:

- effect: NoSchedule
key: node-role.kubernetes.io/master
initContainers:
- name: migrate-checkpoint
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
command: ["/migratecheckpoint"]
securityContext:
runAsUser: 0
env:
- name: CONTAINER_LOG_PATH_FLUENTD
value: "/var/log/splunk-fluentd-containers.log.pos"
- name: CONTAINER_LOG_PATH_OTEL
value: "/var/lib/otel_pos/receiver_filelog_"
- name: CUSTOM_LOG_PATH_FLUENTD
value: "/var/log/splunk-fluentd-*.pos"
- name: CUSTOM_LOG_PATH_OTEL
value: "/var/lib/otel_pos/receiver_filelog_"
- name: CUSTOM_LOG_CAPTURE_REGEX
value: '\/var\/log\/splunk\-fluentd\-(?P<name>[\w0-9-_]+)\.pos'
- name: JOURNALD_LOG_PATH_FLUENTD
value: "/var/log/splunkd-fluentd-journald-*.pos.json"
- name: JOURNALD_LOG_PATH_OTEL
value: "/var/lib/otel_pos/receiver_journald_"
- name: JOURNALD_LOG_CAPTURE_REGEX
value: '\/splunkd\-fluentd\-journald\-(?P<name>[\w0-9-_]+)\.pos\.json'
volumeMounts:
- name: checkpoint
mountPath: /var/lib/otel_pos
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
containers:
- name: otel-collector
command:
- /otelcol
- --config=/conf/relay.yaml
- --metrics-addr=0.0.0.0:8889
ports:
- name: fluentforward
containerPort: 8006
hostPort: 8006
protocol: TCP
- name: jaeger-grpc
containerPort: 14250
hostPort: 14250
protocol: TCP
- name: jaeger-thrift
containerPort: 14268
hostPort: 14268
protocol: TCP
- name: otlp
containerPort: 4317
hostPort: 4317
protocol: TCP
- name: otlp-http
containerPort: 4318
protocol: TCP
- name: otlp-http-old
containerPort: 55681
protocol: TCP
- name: sfx-forwarder
containerPort: 9080
hostPort: 9080
protocol: TCP
- name: signalfx
containerPort: 9943
hostPort: 9943
protocol: TCP
- name: zipkin
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 0
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
value: "500"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: K8S_NODE_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.hostIP
- name: K8S_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
- name: K8S_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: K8S_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
- name: K8S_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SPLUNK_O11Y_ACCESS_TOKEN
valueFrom:
secretKeyRef:
name: splunk-otel-collector
key: splunk_o11y_access_token
# Env variables for host metrics receiver
- name: HOST_PROC
value: /hostfs/proc
- name: HOST_SYS
value: /hostfs/sys
- name: HOST_ETC
value: /hostfs/etc
- name: HOST_VAR
value: /hostfs/var
- name: HOST_RUN
value: /hostfs/run
- name: HOST_DEV
value: /hostfs/dev

readinessProbe:
httpGet:
path: /
port: 13133
livenessProbe:
httpGet:
path: /
port: 13133
resources:
limits:
cpu: 200m
memory: 500Mi
volumeMounts:
- mountPath: /conf
name: otel-configmap
- mountPath: /hostfs/dev
name: host-dev
readOnly: true
- mountPath: /hostfs/etc
name: host-etc
readOnly: true
- mountPath: /hostfs/proc
name: host-proc
readOnly: true
- mountPath: /hostfs/run/udev/data
name: host-run-udev-data
readOnly: true
- mountPath: /hostfs/sys
name: host-sys
readOnly: true
- mountPath: /hostfs/var/run/utmp
name: host-var-run-utmp
readOnly: true
- name: varlog
mountPath: /var/log
readOnly: true
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
- name: checkpoint
mountPath: /var/lib/otel_pos
terminationGracePeriodSeconds: 600
volumes:
- name: varlog
hostPath:
path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: checkpoint
hostPath:
path: /var/lib/otel_pos
type: DirectoryOrCreate
- name: host-dev
hostPath:
path: /dev
- name: host-etc
hostPath:
path: /etc
- name: host-proc
hostPath:
path: /proc
- name: host-run-udev-data
hostPath:
path: /run/udev/data
- name: host-sys
hostPath:
path: /sys
- name: host-var-run-utmp
hostPath:
path: /var/run/utmp
- name: otel-configmap
configMap:
name: default-splunk-otel-collector-otel-agent
items:
- key: relay
path: relay.yaml
97 changes: 97 additions & 0 deletions rendered/manifests/otel-logs/deployment-k8s-cluster-receiver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
---
# Source: splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: default-splunk-otel-collector-k8s-cluster-receiver
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
app.kubernetes.io/component: otel-k8s-cluster-receiver
spec:
replicas: 1
selector:
matchLabels:
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
release: default
template:
metadata:
labels:
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 7a0c93778a90faf607f84f182e959a2fa0a5086f8e085c2e7a5b1205ed9c9085
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
kubernetes.io/os: linux
containers:
- name: otel-collector
command:
- /otelcol
- --config=/conf/relay.yaml
- --metrics-addr=0.0.0.0:8889
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
value: "500"
- name: K8S_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: K8S_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
- name: K8S_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: K8S_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
- name: K8S_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SPLUNK_O11Y_ACCESS_TOKEN
valueFrom:
secretKeyRef:
name: splunk-otel-collector
key: splunk_o11y_access_token
readinessProbe:
httpGet:
path: /
port: 13133
livenessProbe:
httpGet:
path: /
port: 13133
resources:
limits:
cpu: 200m
memory: 500Mi
volumeMounts:
- mountPath: /conf
name: collector-configmap
terminationGracePeriodSeconds: 600
volumes:
- name: collector-configmap
configMap:
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
items:
- key: relay
path: relay.yaml
19 changes: 19 additions & 0 deletions rendered/manifests/otel-logs/secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
# Source: splunk-otel-collector/templates/secret.yaml
apiVersion: v1
kind: Secret
metadata:
name: splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
type: Opaque
data:
splunk_o11y_access_token: Q0hBTkdFTUU=
16 changes: 16 additions & 0 deletions rendered/manifests/otel-logs/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
# Source: splunk-otel-collector/templates/serviceAccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: default-splunk-otel-collector
labels:
app.kubernetes.io/name: splunk-otel-collector
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
heritage: Helm
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/clusterRole.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/clusterRoleBinding.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/configmap-otel-agent.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
6 changes: 3 additions & 3 deletions rendered/manifests/traces-only/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
@@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: f73b8bcab68386344194b87d6c10ab64684bb653f3b10b821247864a4da49c48
checksum/config: fb37eb794d74f55669e7e8804627a61e5e6090f26c4f78457e3a606cde8f6b81
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
@@ -72,7 +72,7 @@ spec:
containerPort: 9411
hostPort: 9411
protocol: TCP
image: quay.io/signalfx/splunk-otel-collector:0.37.1
image: quay.io/signalfx/splunk-otel-collector:0.38.1
imagePullPolicy: IfNotPresent
env:
- name: SPLUNK_MEMORY_TOTAL_MIB
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/secret.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/serviceAccount.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
helm.sh/chart: splunk-otel-collector-0.37.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default
app.kubernetes.io/version: "0.37.1"
app.kubernetes.io/version: "0.38.1"
app: splunk-otel-collector
chart: splunk-otel-collector-0.37.1
release: default

0 comments on commit e8b4b05

Please sign in to comment.