From 0005a2e9b2408355cf3073292121aa4d886a0549 Mon Sep 17 00:00:00 2001 From: Ryan Fitzpatrick Date: Wed, 28 Jun 2023 19:53:44 +0000 Subject: [PATCH] add emptyDir agent and CR volumes for SA receiver collectd config --- CHANGELOG.md | 4 ++++ .../add-filter-processor/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../add-receiver-creator/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/add-sampler/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/autodetect-istio/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../collector-agent-only/rendered_manifests/daemonset.yaml | 6 ++++++ .../collector-all-modes/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/crio-logging/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/default/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/distribution-aks/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/distribution-eks/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/distribution-gke/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../enable-trace-sampling/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../only-logs-fluentd/rendered_manifests/daemonset.yaml | 6 ++++++ examples/only-logs-otel/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../only-metrics-platform/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/only-metrics/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ examples/only-traces/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ .../rendered_manifests/daemonset.yaml | 6 ++++++ examples/use-proxy/rendered_manifests/daemonset.yaml | 6 ++++++ .../rendered_manifests/deployment-cluster-receiver.yaml | 6 ++++++ helm-charts/splunk-otel-collector/templates/daemonset.yaml | 6 ++++++ .../templates/deployment-cluster-receiver.yaml | 6 ++++++ 53 files changed, 316 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f4d4d74..3473a66e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Fixed + +- Fix `smartagent` collectd based monitors on read-only filesystems [#839](https://github.com/signalfx/splunk-otel-collector-chart/pull/839) + ### Added - Update PodDisruptionBudgets API version to allow both `policy/v1beta1` and `policy/v1` [#835](https://github.com/signalfx/splunk-otel-collector-chart/pull/835) diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index ff2ec3c4d..341da2ef2 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -240,8 +240,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 9ed155d98..b59b61466 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 04272f143..8196b270d 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index b4ac87d15..ed921e55a 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -241,8 +241,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index c3bf28a2d..b64670523 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -87,6 +87,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -95,3 +98,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 00a0bedcb..d1655d793 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 87cc36dd7..85f371ec6 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 3ac358ba2..9a7a2b5c4 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 00a0bedcb..d1655d793 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 00a0bedcb..d1655d793 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 2caaec5f5..fa603402c 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index 9525482b6..efd5eba7a 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index b511af750..6bbbf7200 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -121,6 +121,9 @@ spec: name: collector-configmap - mountPath: /splunk-messages name: messages + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -129,6 +132,9 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: init-eks-fargate-cluster-receiver-script configMap: name: default-splunk-otel-collector-cr-node-discoverer-script diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 0f0d69514..f5e97febf 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index b6224b06b..6c2bb58d1 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 7233492b0..4b07d2f00 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -168,8 +168,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index d4abadc74..e687439f0 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 09879d5fd..cb2860b84 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index d4abadc74..e687439f0 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index a5e8c104c..5e2923c8f 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index c84ee8935..858537746 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi 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 64c2d43b0..35e3fea58 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -240,8 +240,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index bc7bc9234..6001944b0 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 46d8a9cf2..42fe40463 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -127,8 +127,14 @@ spec: volumeMounts: - mountPath: /conf name: otel-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: otel-configmap configMap: name: default-splunk-otel-collector-otel-agent diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 7e47c10eb..fdf1a0798 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index a35f3dc2f..19257ecf1 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -240,8 +240,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 7275ad1c8..d3a810a9c 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -192,8 +192,14 @@ spec: - mountPath: "C:\\hostfs" name: hostfs readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index f36bcbf5a..c23c13409 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -88,6 +88,9 @@ spec: volumeMounts: - mountPath: C:\conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -96,3 +99,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 4250457bd..1f906cd3a 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -184,8 +184,14 @@ spec: volumeMounts: - mountPath: /conf name: otel-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 2ddba857e..46d867062 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -160,8 +160,14 @@ spec: readOnly: true - name: checkpoint mountPath: /var/addon/splunk/otel_pos + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log 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 07f25d373..af697976f 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 @@ -160,12 +160,18 @@ spec: readOnly: true - name: checkpoint mountPath: /var/addon/splunk/otel_pos + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false - mountPath: /tmp/directory_one name: example-with-storage-logs - mountPath: /var/log/catalina name: example-without-storage terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index e352f516f..a33f74887 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -151,8 +151,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev 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 81b85bc4f..d67396507 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 553f60106..a8cbfda7c 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -151,8 +151,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 880f8cd27..c44082093 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 2f86a177a..4e4d68b75 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -127,8 +127,14 @@ spec: volumeMounts: - mountPath: /conf name: otel-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: otel-configmap configMap: name: default-splunk-otel-collector-otel-agent 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 ecb721f49..838a91e2d 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 @@ -167,8 +167,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index feb54234c..cffddfdc4 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -86,6 +86,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -94,3 +97,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 8dce753c9..95627dce2 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -184,8 +184,14 @@ spec: volumeMounts: - mountPath: /conf name: otel-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: varlog hostPath: path: /var/log diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index a53b63e5f..96701b179 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -169,8 +169,14 @@ spec: - mountPath: /hostfs/var/run/utmp name: host-var-run-utmp readOnly: true + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi - name: host-dev hostPath: path: /dev diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index db32cc75b..b132f851d 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -88,6 +88,9 @@ spec: volumeMounts: - mountPath: /conf name: collector-configmap + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false terminationGracePeriodSeconds: 600 volumes: - name: collector-configmap @@ -96,3 +99,6 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 24da89c8d..62b06036b 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -404,11 +404,17 @@ spec: readOnly: true {{- end }} {{- end }} + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false {{- if $agent.extraVolumeMounts }} {{- toYaml $agent.extraVolumeMounts | nindent 8 }} {{- end }} terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} volumes: + - name: run-collectd + emptyDir: + sizeLimit: 25Mi {{- if (eq (include "splunk-otel-collector.logsEnabled" .) "true") }} {{- if eq .Values.logsEngine "fluentd" }} - name: varlog diff --git a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml index ccce7abee..0e054446e 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml @@ -194,6 +194,9 @@ spec: - mountPath: /splunk-messages name: messages {{- end }} + - mountPath: /usr/lib/splunk-otel-collector/agent-bundle/run/collectd + name: run-collectd + readOnly: false {{- if $clusterReceiver.extraVolumeMounts }} {{- toYaml $clusterReceiver.extraVolumeMounts | nindent 8 }} {{- end }} @@ -205,6 +208,9 @@ spec: items: - key: relay path: relay.yaml + - name: run-collectd + emptyDir: + sizeLimit: 25Mi {{- if or .Values.splunkPlatform.clientCert .Values.splunkPlatform.clientKey .Values.splunkPlatform.caFile }} - name: secret secret: