From 6ae37d9e7e867c0eb6306be0f2dba781c5960795 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Wed, 20 Dec 2023 11:56:57 +0800
Subject: [PATCH] =?UTF-8?q?feature:TSG-18016:telegraf=5Fstatistic=20role?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BAtelegraf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/HAL_deploy.yml                              |   4 ++--
 .../files/telegraf-1.25.0-1.x86_64.rpm              | Bin
 .../files/telegraf_proxy.service                    |   0
 .../{telegraf_statistic => telegraf}/tasks/main.yml |   0
 .../templates/service_override_slice.conf.j2        |   0
 .../templates/telegraf_proxy.conf.j2.j2             |   0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename ansible/roles/{telegraf_statistic => telegraf}/files/telegraf-1.25.0-1.x86_64.rpm (100%)
 rename ansible/roles/{telegraf_statistic => telegraf}/files/telegraf_proxy.service (100%)
 rename ansible/roles/{telegraf_statistic => telegraf}/tasks/main.yml (100%)
 rename ansible/roles/{telegraf_statistic => telegraf}/templates/service_override_slice.conf.j2 (100%)
 rename ansible/roles/{telegraf_statistic => telegraf}/templates/telegraf_proxy.conf.j2.j2 (100%)

diff --git a/ansible/HAL_deploy.yml b/ansible/HAL_deploy.yml
index eb045eeb..983fe985 100644
--- a/ansible/HAL_deploy.yml
+++ b/ansible/HAL_deploy.yml
@@ -20,7 +20,7 @@
     - {role: redis, tags: redis}
     - {role: maat-redis, tags: maat-redis}
     - {role: certstore, tags: certstore}
-    - {role: telegraf_statistic, tags: telegraf_statistic}
+    - {role: telegraf, tags: telegraf}
     - {role: sysctl, tags: sysctl}
     - {role: exporter, tags: exporter}
     - {role: tsg-diagnose, tags: tsg-diagnose}
@@ -128,7 +128,7 @@
     - install_config/group_vars/HAL_x86_64_COTS.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: telegraf_statistic, tags: telegraf_statistic}
+    - {role: telegraf, tags: telegraf}
 
 - hosts: x86_64_COTS-sce
   remote_user: root
diff --git a/ansible/roles/telegraf_statistic/files/telegraf-1.25.0-1.x86_64.rpm b/ansible/roles/telegraf/files/telegraf-1.25.0-1.x86_64.rpm
similarity index 100%
rename from ansible/roles/telegraf_statistic/files/telegraf-1.25.0-1.x86_64.rpm
rename to ansible/roles/telegraf/files/telegraf-1.25.0-1.x86_64.rpm
diff --git a/ansible/roles/telegraf_statistic/files/telegraf_proxy.service b/ansible/roles/telegraf/files/telegraf_proxy.service
similarity index 100%
rename from ansible/roles/telegraf_statistic/files/telegraf_proxy.service
rename to ansible/roles/telegraf/files/telegraf_proxy.service
diff --git a/ansible/roles/telegraf_statistic/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml
similarity index 100%
rename from ansible/roles/telegraf_statistic/tasks/main.yml
rename to ansible/roles/telegraf/tasks/main.yml
diff --git a/ansible/roles/telegraf_statistic/templates/service_override_slice.conf.j2 b/ansible/roles/telegraf/templates/service_override_slice.conf.j2
similarity index 100%
rename from ansible/roles/telegraf_statistic/templates/service_override_slice.conf.j2
rename to ansible/roles/telegraf/templates/service_override_slice.conf.j2
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2 b/ansible/roles/telegraf/templates/telegraf_proxy.conf.j2.j2
similarity index 100%
rename from ansible/roles/telegraf_statistic/templates/telegraf_proxy.conf.j2.j2
rename to ansible/roles/telegraf/templates/telegraf_proxy.conf.j2.j2