From 583e9caf4cb14f18dde885d78f2f2d214ee83f5c Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Sat, 6 May 2023 15:07:48 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E5=88=A0=E9=99=A4telegraf=E4=B8=AD?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8Evsys=5Fid=E7=9A=84tag=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../telegraf_statistic/templates/telegraf_security.conf.j2.j2    | 1 -
 .../telegraf_statistic/templates/telegraf_shaping.conf.j2.j2     | 1 -
 .../telegraf_statistic/templates/telegraf_statistic.conf.j2.j2   | 1 -
 .../roles/traffic-engine/files/helm/conf/telegraf_security.conf  | 1 -
 .../roles/traffic-engine/files/helm/conf/telegraf_shaping.conf   | 1 -
 .../roles/traffic-engine/files/helm/conf/telegraf_statistic.conf | 1 -
 6 files changed, 6 deletions(-)

diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
index 25921b23..3cb5efdb 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_security.conf.j2.j2
@@ -1,7 +1,6 @@
 # Telegraf Configuration
 [global_tags]
    device_id = "${device_id}"
-   vsys_id = "{% raw %}{{ vsys_id }}{% endraw %}"
 {% raw %}{% if data_center.name is defined %}
    data_center = "{{ data_center.name }}"
 {% endif %}
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
index 8fc56038..f9187091 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
@@ -1,7 +1,6 @@
 # Telegraf Configuration
 [global_tags]
    device_id = "${device_id}"
-   vsys_id = "{% raw %}{{ vsys_id }}{% endraw %}"
 {% raw %}{% if data_center.name is defined %}
    data_center = "{{ data_center.name }}"
 {% endif %}
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
index 3e2e2070..7f411f09 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
@@ -1,6 +1,5 @@
 [global_tags]
    device_id = "${device_id}"
-   vsys_id = "{% raw %}{{ vsys_id }}{% endraw %}"
 {% raw %}{% if data_center.name is defined %}
    data_center = "{{ data_center.name }}"
 {% endif %}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
index 38592957..184c3e4a 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_security.conf
@@ -6,7 +6,6 @@
    {{ $key }} = {{ $val | quote }}
 {{- end }}
 {{- end }}
-   vsys_id = {{ .Values.vsys_id | quote }}
 [agent]
    interval = "1s"
    round_interval = true
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
index d7f4a1da..bd99f850 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_shaping.conf
@@ -6,7 +6,6 @@
    {{ $key }} = {{ $val | quote }}
 {{- end }}
 {{- end }}
-   vsys_id = {{ .Values.vsys_id | quote }}
 [agent]
    interval = "1s"
    round_interval = true
diff --git a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
index c1beee2b..590aa12d 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/telegraf_statistic.conf
@@ -5,7 +5,6 @@
    {{ $key }} = {{ $val | quote }}
 {{- end }}
 {{- end }}
-   vsys_id = {{ .Values.vsys_id | quote }}
 [agent]
    interval = "5s"
    round_interval = true