From a6e710eeec1267b80bc7c10f1417666343209d21 Mon Sep 17 00:00:00 2001
From: klinch0 <68821526+klinch0@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:51:10 +0300
Subject: [PATCH] fix tenant labels (#468)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Updated the HelmRelease configuration for monitoring agents to
simplify tenant label assignment by using the release namespace
directly.

- **Bug Fixes**
- Adjusted the logging configuration for `fluent-bit` to ensure accurate
categorization and processing of monitoring data.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../kubernetes/templates/helmreleases/monitoring-agents.yaml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
index c39fe8bb..ddaf12e7 100644
--- a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
@@ -45,7 +45,7 @@ spec:
     vmagent:
       externalLabels:
         cluster: {{ .Release.Name }}
-        tenant: {{ $targetTenant }}
+        tenant: {{ .Release.Namespace }}
       remoteWrite:
         url: http://vminsert-shortterm.{{ $targetTenant }}.svc:8480/insert/0/prometheus
 
@@ -97,7 +97,7 @@ spec:
           [FILTER]
               Name modify
               Match *
-              Add tenant {{ $targetTenant }}
+              Add tenant {{ .Release.Namespace }}
           [FILTER]
               Name modify
               Match *