Skip to content

Commit 29a4a64

Browse files
[monitoring] Auto-route logs per-tenant using namespace labels
Replace manual tenantLogRouting list with automatic discovery using Helm lookup on namespace.cozystack.io/monitoring labels, matching the existing vmagent pattern for metrics routing. - Use lookup "v1" "Namespace" to discover tenant namespaces - Generate rewrite_tag filters and HTTP outputs dynamically - Deduplicate targets (multiple namespaces -> one output per target) - Fix default outputs to use vlinsert-generic:9481 (VLCluster) - Remove manual tenantLogRouting configuration Signed-off-by: Mattia Eleuteri <[email protected]> Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
1 parent a13481b commit 29a4a64

1 file changed

Lines changed: 43 additions & 6 deletions

File tree

‎packages/system/monitoring-agents/values.yaml‎

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ fluent-bit:
344344
[OUTPUT]
345345
Name http
346346
Match kube.*
347-
Host vlogs-generic.{{ .Values.global.target }}.svc
348-
port 9428
347+
Host vlinsert-generic.{{ .Values.global.target }}.svc
348+
port 9481
349349
compress gzip
350350
uri /insert/jsonline?_stream_fields=log_source,stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
351351
format json_lines
@@ -355,8 +355,8 @@ fluent-bit:
355355
[OUTPUT]
356356
Name http
357357
Match events.*
358-
Host vlogs-generic.{{ .Values.global.target }}.svc
359-
port 9428
358+
Host vlinsert-generic.{{ .Values.global.target }}.svc
359+
port 9481
360360
compress gzip
361361
uri /insert/jsonline?_stream_fields=log_source,reason,meatdata_namespace,metadata_name&_msg_field=message&_time_field=date
362362
format json_lines
@@ -366,14 +366,38 @@ fluent-bit:
366366
[OUTPUT]
367367
Name http
368368
Match audit.*
369-
Host vlogs-generic.{{ .Values.global.target }}.svc
370-
port 9428
369+
Host vlinsert-generic.{{ .Values.global.target }}.svc
370+
port 9481
371371
compress gzip
372372
uri /insert/jsonline?_stream_fields=log_source,stage,user_username,verb,requestUri&_msg_field=requestURI&_time_field=date
373373
format json_lines
374374
json_date_format iso8601
375375
header AccountID 0
376376
header ProjectID 0
377+
{{- $defaultTarget := .Values.global.target }}
378+
{{- $namespaces := lookup "v1" "Namespace" "" "" }}
379+
{{- $uniqueTargets := dict }}
380+
{{- if $namespaces }}
381+
{{- range $ns := $namespaces.items }}
382+
{{- $monTarget := index (default dict $ns.metadata.labels) "namespace.cozystack.io/monitoring" }}
383+
{{- if and $monTarget (ne $monTarget "") (ne $monTarget $defaultTarget) }}
384+
{{- $_ := set $uniqueTargets $monTarget true }}
385+
{{- end }}
386+
{{- end }}
387+
{{- end }}
388+
{{- range $target, $_ := $uniqueTargets }}
389+
[OUTPUT]
390+
Name http
391+
Match tenant.{{ $target }}.*
392+
Host vlinsert-generic.{{ $target }}.svc
393+
port 9481
394+
compress gzip
395+
uri /insert/jsonline?_stream_fields=log_source,stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
396+
format json_lines
397+
json_date_format iso8601
398+
header AccountID 0
399+
header ProjectID 0
400+
{{- end }}
377401
filters: |
378402
[FILTER]
379403
Name kubernetes
@@ -423,6 +447,19 @@ fluent-bit:
423447
Name modify
424448
Match *
425449
Add cluster root-cluster
450+
{{- $defaultTarget := .Values.global.target }}
451+
{{- $namespaces := lookup "v1" "Namespace" "" "" }}
452+
{{- if $namespaces }}
453+
{{- range $ns := $namespaces.items }}
454+
{{- $monTarget := index (default dict $ns.metadata.labels) "namespace.cozystack.io/monitoring" }}
455+
{{- if and $monTarget (ne $monTarget "") (ne $monTarget $defaultTarget) }}
456+
[FILTER]
457+
Name rewrite_tag
458+
Match kube.*
459+
Rule $kubernetes_namespace_name ^({{ $ns.metadata.name }})$ tenant.{{ $monTarget }}.{{ $ns.metadata.name }}.$TAG false
460+
{{- end }}
461+
{{- end }}
462+
{{- end }}
426463
scrapeRules:
427464
etcd:
428465
enabled: false

0 commit comments

Comments
 (0)