Merge pull request #23 from axoflow/k8s-fields

feat(k8s-source): add configurable fields for json paramaters
axoflow · Nov 23, 2023 · 443a52b · 443a52b
2 parents ceab5ad + 45f2be0
commit 443a52b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/charts/axosyslog-collector/README.md b/charts/axosyslog-collector/README.md
@@ -49,3 +49,7 @@ The following table lists the configurable parameters of the AxoSyslog Collector
 |  tolerations  | Tolerations for pod assignment |  []  |
 |  affinity  | Pod affinity |  {}  |
 |  updateStrategy  | Update strategy for the DaemonSet |  RollingUpdate  |
+|  kubernetes.enabled  | Enable kubernetes log collection  |  true  |
+|  kubernetes.prefix  | Set JSON prefix for logs collected from the k8s cluster  |  ""  |
+|  kubernetes.keyDelimiter  | Set JSON key delimiter for logs collected from the k8s cluster  |  ""  |
+
diff --git a/charts/axosyslog-collector/templates/config.yaml b/charts/axosyslog-collector/templates/config.yaml
@@ -20,7 +20,14 @@ data:
 
     log {
 {{- if .Values.config.sources.kubernetes.enabled }}
-      source { kubernetes(); };
+      source { kubernetes(
+  {{- if .Values.config.sources.kubernetes.prefix }}
+        prefix({{ .Values.config.sources.kubernetes.prefix | quote }})
+  {{- end }}
+  {{- if .Values.config.sources.kubernetes.keyDelimiter }}
+        key-delimiter({{ .Values.config.sources.kubernetes.keyDelimiter | quote }})
+  {{- end }}
+      ); };
 {{- end }}
 {{- range .Values.config.sources.opentelemetry }}
       source {

diff --git a/charts/axosyslog-collector/values.yaml b/charts/axosyslog-collector/values.yaml
@@ -45,6 +45,9 @@ config:
   sources:
     kubernetes:
       enabled: true
+#     E.g.:
+#     prefix: "k8s~"
+#     keyDelimiter: "~"
     opentelemetry: []
 #   E.g.:
 #     - port: 4317