diff --git a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml index ddaf12e7..dc8792d7 100644 --- a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml @@ -48,7 +48,6 @@ spec: tenant: {{ .Release.Namespace }} remoteWrite: url: http://vminsert-shortterm.{{ $targetTenant }}.svc:8480/insert/0/prometheus - fluent-bit: readinessProbe: httpGet: diff --git a/packages/system/monitoring-agents/values.yaml b/packages/system/monitoring-agents/values.yaml index cc09c729..250db7d8 100644 --- a/packages/system/monitoring-agents/values.yaml +++ b/packages/system/monitoring-agents/values.yaml @@ -305,3 +305,57 @@ vmagent: tenant: tenant-root remoteWrite: url: http://vminsert-shortterm.tenant-root.svc:8480/insert/0/prometheus + +fluent-bit: + readinessProbe: + httpGet: + path: / + daemonSetVolumes: + - name: varlog + hostPath: + path: /var/log + - name: varlibdockercontainers + hostPath: + path: /var/lib/docker/containers + daemonSetVolumeMounts: + - name: varlog + mountPath: /var/log + - name: varlibdockercontainers + mountPath: /var/lib/docker/containers + readOnly: true + config: + outputs: | + [OUTPUT] + Name http + Match kube.* + Host vlogs-generic.tenant-root.svc + port 9428 + compress gzip + uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date + format json_lines + json_date_format iso8601 + header AccountID 0 + header ProjectID 0 + filters: | + [FILTER] + Name kubernetes + Match kube.* + Merge_Log On + Keep_Log On + K8S-Logging.Parser On + K8S-Logging.Exclude On + [FILTER] + Name nest + Match * + Wildcard pod_name + Operation lift + Nested_under kubernetes + Add_prefix kubernetes_ + [FILTER] + Name modify + Match * + Add tenant tenant-root + [FILTER] + Name modify + Match * + Add cluster root-cluster