SYS-672 wip

Author: instantlinux

k8s/Makefile

@@ -223,11 +223,12 @@ imports/traefik-prom.yaml:
 
 SPLUNK_OPT = $(if $(LOG_TO_SPLUNK), -f install/fluent-bit-splunk.yaml, )
 fluent-bit: install/namespace.yaml
-	K8S_NAMESPACE=logging envsubst < $< | kubectl apply --context=sudo -f -
+	K8S_NAMESPACE=$(LOG_NAMESPACE) envsubst < $< | \
+	  kubectl apply --context=sudo -f -
 	helm repo add fluent https://fluent.github.io/helm-charts
 	helm repo update
 	@$(eval OVERRIDE := $(shell [ -s ../admin/services/values/$@.yaml ] \
 	  && echo "-f ../admin/services/values/$@.yaml"))
 	envsubst < install/fluent-bit.yaml | \
 	  helm install -f - $(SPLUNK_OPT) $(OVERRIDE) \
-	  --kube-context=sudo --namespace=logging $@ fluent/fluent-bit 
+	  --kube-context=sudo --namespace=$(LOG_NAMESPACE) $@ fluent/fluent-bit 

k8s/Makefile.vars

@@ -18,6 +18,7 @@ export LIMIT_CPU_DEFAULT    ?= 500m
 export LIMIT_CPU_REQUEST    ?= 50m
 export LIMIT_MEM_DEFAULT    ?= 256Mi
 export LIMIT_MEM_REQUEST    ?= 64Mi
+export LOG_NAMESPACE        ?= logging
 export LOG_TO_SPLUNK        ?=
 export MYTHTV_VOL_SIZE      ?= 400Gi
 export NAMED_VOLUMES        ?= share $(LOCAL_VOLUMES)

k8s/install/fluent-bit-splunk.yaml

@@ -4,7 +4,7 @@ config:
         Name                kubernetes
         Match               kube.*
         Merge_Log           On
-        # Keep_Log            Off
+        Keep_Log            Off
         K8S-Logging.Parser  On
         K8S-Logging.Exclude Off
     [FILTER]

k8s/install/fluent-bit.yaml

@@ -5,6 +5,7 @@ config:
         Name                kubernetes
         Match               kube.*
         Merge_Log           On
+        Keep_Log            Off
         K8S-Logging.Parser  On
         K8S-Logging.Exclude On
     [FILTER]