diff --git a/.gitignore b/.gitignore index b097d5f2..1b3100bd 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ Chart.lock *.fix addons/grafana/10/dashborad/ addons/prometheus/prom-value.yaml +toCopy/ diff --git a/addons/fluentbit/2/chart/fluentbit/templates/_helpers.tpl b/addons/fluentbit/2/chart/fluentbit/templates/_helpers.tpl index 01f7bd0e..a56088d0 100644 --- a/addons/fluentbit/2/chart/fluentbit/templates/_helpers.tpl +++ b/addons/fluentbit/2/chart/fluentbit/templates/_helpers.tpl @@ -60,3 +60,22 @@ Return the Fluentbit Reloader image name {{- include "fluentbit.image" . -}} {{- end -}} {{- end -}} + +{{/* +Return the Fluentbit input path +*/}} +{{- define "input.paths" -}} + {{- $namespace := .Release.Namespace -}} + {{- $wildcards := .Values.daemonset.config.podWildcards -}} + {{- $pathTemplate := "/var/log/containers/%s_%s_*.log" -}} + + {{/* */}} + {{- $paths := list -}} + {{- range $wildcard := $wildcards -}} + {{- $path := printf $pathTemplate $wildcard $namespace -}} + {{- $paths = append $paths $path -}} + {{- end -}} + {{- join "," $paths -}} +{{- end -}} + + diff --git a/addons/fluentbit/2/chart/fluentbit/values.yaml b/addons/fluentbit/2/chart/fluentbit/values.yaml index 52f9d738..b34a989e 100644 --- a/addons/fluentbit/2/chart/fluentbit/values.yaml +++ b/addons/fluentbit/2/chart/fluentbit/values.yaml @@ -164,8 +164,9 @@ daemonset: type: OnDelete flush: 1 ## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/configuration-file - config: - + config: + podWildcards: + - "*" service: | [SERVICE] Flush {{ .Values.daemonset.flush }} @@ -181,7 +182,7 @@ daemonset: inputs: | [INPUT] Name tail - Path /var/log/containers/*_{{ .Release.Namespace }}_*.log + Path {{ include "input.paths" . }} DB /data/containers.pos.db DB.locking true Offset_Key offset diff --git a/addons/fluentbit/2/meta.yaml b/addons/fluentbit/2/meta.yaml index f4684883..e6d64b97 100644 --- a/addons/fluentbit/2/meta.yaml +++ b/addons/fluentbit/2/meta.yaml @@ -18,6 +18,9 @@ allow_parameters: - name: "daemonset.extraEnvVars" required: false description: "extra environment variables to add to fluentbit" +- name: "daemonset.config.podWildcards" + equired: false + description: "fluentbit inout paths pod wildcards" - name: "daemonset.config.outputs" required: true description: "destinations for your data: databases, cloud services and more" diff --git a/addons/grafana/10/chart/grafana/templates/configmap.yaml b/addons/grafana/10/chart/grafana/templates/configmap.yaml index 1d5393ce..a6abcea2 100644 --- a/addons/grafana/10/chart/grafana/templates/configmap.yaml +++ b/addons/grafana/10/chart/grafana/templates/configmap.yaml @@ -32,3 +32,4 @@ data: GF_PATHS_CONFIG: "/opt/drycc/grafana/conf/grafana.ini" GF_PATHS_DATA: "/opt/drycc/grafana/data" GF_PATHS_LOGS: "/opt/drycc/grafana/logs" +