edit default checkpoint path

signalfx · Nov 16, 2021 · ba26e22 · ba26e22
1 parent dc0e807
commit ba26e22
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -104,22 +104,22 @@ spec:
           - name: CONTAINER_LOG_PATH_FLUENTD
             value: "{{ .Values.fluentd.config.posFilePrefix }}-containers.log.pos"
           - name: CONTAINER_LOG_PATH_OTEL
-            value: "/var/lib/otel_pos/receiver_filelog_"
+            value: "/var/addon/splunk/otel_pos/receiver_filelog_"
           - name: CUSTOM_LOG_PATH_FLUENTD
             value: "{{ .Values.fluentd.config.posFilePrefix }}-*.pos"
           - name: CUSTOM_LOG_PATH_OTEL
-            value: "/var/lib/otel_pos/receiver_filelog_"
+            value: "/var/addon/splunk/otel_pos/receiver_filelog_"
           - name: CUSTOM_LOG_CAPTURE_REGEX
             value: '{{ regexReplaceAll "(\\W)" .Values.fluentd.config.posFilePrefix "\\${1}" }}\-(?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_"
+            value: "/var/addon/splunk/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
+              mountPath: /var/addon/splunk/otel_pos
             - name: varlog
               mountPath: /var/log
             - name: varlibdockercontainers

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -372,7 +372,7 @@ logsCollection:
     #       value: server
     #     firstEntryRegex: ^[^\s].*
 
-  checkpointPath: "/var/lib/otel_pos"
+  checkpointPath: "/var/addon/splunk/otel_pos"
 
 ################################################################################
 # Fluentd sidecar configuration for logs collection.

diff --git a/rendered/manifests/otel-logs/configmap-otel-agent.yaml b/rendered/manifests/otel-logs/configmap-otel-agent.yaml
@@ -31,7 +31,7 @@ data:
         token: ${SPLUNK_O11Y_ACCESS_TOKEN}
     extensions:
       file_storage:
-        directory: /var/lib/otel_pos
+        directory: /var/addon/splunk/otel_pos
       health_check: null
       k8s_observer:
         auth_type: serviceAccount

diff --git a/rendered/manifests/otel-logs/daemonset.yaml b/rendered/manifests/otel-logs/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 79fbef3ed17c5716a0d28f36d47d1f28fa123718a75dd9865dec2160707b0b47
+        checksum/config: 52a1c6a00dd8514c261cd185018337d12f7101950d7f42b2a7345008e71ae76a
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true
@@ -50,22 +50,22 @@ spec:
           - 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_"
+            value: "/var/addon/splunk/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_"
+            value: "/var/addon/splunk/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_"
+            value: "/var/addon/splunk/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
+              mountPath: /var/addon/splunk/otel_pos
             - name: varlog
               mountPath: /var/log
             - name: varlibdockercontainers
@@ -203,7 +203,7 @@ spec:
           mountPath: /var/lib/docker/containers
           readOnly: true
         - name: checkpoint
-          mountPath: /var/lib/otel_pos
+          mountPath: /var/addon/splunk/otel_pos
       terminationGracePeriodSeconds: 600
       volumes:
       - name: varlog
@@ -214,7 +214,7 @@ spec:
           path: /var/lib/docker/containers
       - name: checkpoint
         hostPath:
-          path: /var/lib/otel_pos
+          path: /var/addon/splunk/otel_pos
           type: DirectoryOrCreate
       - name: host-dev
         hostPath: