handle container path config (#31)

* handle container path config * fix exclude path example Co-authored-by: Mei <[email protected]>
splunk · Jul 16, 2021 · 9bd92b9 · 9bd92b9
1 parent f5cd7e5
commit 9bd92b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/ci_build_test.yaml b/.github/workflows/ci_build_test.yaml
@@ -95,7 +95,10 @@ jobs:
 
       - name: Install Splunk
         run: |
-          kubectl get nodes
+          # Wait until default service account is created
+          until kubectl -n default get serviceaccount default -o name; do
+            sleep 1;
+          done
           # Install Splunk on minikube
           kubectl apply -f ci_scripts/k8s-splunk.yml
           # Wait until splunk is ready

diff --git a/charts/sck-otel/Chart.yaml b/charts/sck-otel/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: sck-otel
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for Splunk with Open Telemetry Agent
 type: application
 home: https://github.com/splunk/sck-otel
@@ -13,4 +13,4 @@ maintainers:
   - name: luckyj5
   - name: mwang2016
   - name: rockb1017
-appVersion: 0.29.0
+appVersion: 0.30.0
diff --git a/charts/sck-otel/templates/_config.tpl b/charts/sck-otel/templates/_config.tpl
@@ -97,7 +97,7 @@ extensions:
 receivers:
   # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver
   filelog:
-    include: [ /var/log/pods/*/*/*.log ]
+    include: [ {{ .Values.containers.path }} ]
     # Exclude collector container's logs. The file format is /var/log/pods/<namespace_name>_<pod_name>_<pod_uid>/<container_name>/<run_id>.log
     exclude:
       {{- if .Values.containers.excludeAgentLogs }}

diff --git a/charts/sck-otel/values.yaml b/charts/sck-otel/values.yaml
@@ -50,6 +50,8 @@ containers:
   # The file format is /var/log/pods/<namespace_name>_<pod_name>_<pod_uid>/<container_name>/<run_id>.log
   path: /var/log/pods/*/*/*.log
   # Paths of logfiles to exclude. object type is array:
+  # i.e) to exclude `kube-system` namespace,
+  # exclude_paths: [ /var/log/pods/kube-system_*/*/*.log ]
   exclude_paths: []
   #  - /var/log/pods/kube-system_*.log (to exclude `kube-system` namespace)
   # Boolean for ingesting the agent's own log
@@ -87,11 +89,10 @@ batch:
   send_batch_max_size: 0
 
 image:
-  repository: rock1017/otelcontribcol
-  # repository: otel/opentelemetry-collector-contrib
+  repository: otel/opentelemetry-collector-contrib
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.30.0"
+  tag: ""
 imagePullSecrets: []
 
 # OpenTelemetry Collector executable