summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/certstore/tasks/main.yml8
-rw-r--r--roles/firewall/templates/maat.conf.j26
-rw-r--r--roles/maat-redis/tasks/main.yml5
-rw-r--r--roles/reboot/tasks/main.yml2
-rw-r--r--roles/telegraf_collect/tasks/main.yml10
-rw-r--r--roles/telegraf_collect/templates/telegraf_collect.conf_adc.j273
-rw-r--r--roles/telegraf_collect/templates/telegraf_collect.conf_server.j270
-rw-r--r--roles/tsg-diagnose-uninstall/tasks/main.yml9
-rw-r--r--roles/tsg-diagnose-verify-succ/tasks/main.yml11
-rw-r--r--roles/tsg-diagnose-verify-succ/tasks/main.yml.bak9
-rw-r--r--roles/tsg_device_tag/tasks/main.yml11
-rw-r--r--roles/tsg_device_tag/templates/tsg_sn.json.j23
-rw-r--r--roles/tsg_device_tag/templates/tsg_tags.json.j21
13 files changed, 176 insertions, 42 deletions
diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml
index d970488..33b0b5a 100644
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -3,22 +3,22 @@
src: "{{ role_path }}/files/"
dest: "/tmp/ansible_deploy/"
-- name: Ensures /opt/tsg exists
+- name: "Ensures /opt/tsg exists"
file: path=/opt/tsg state=directory
tags: mkdir
-- name: install certstore
+- name: "install certstore"
yum:
name:
- /tmp/ansible_deploy/certstore-2.1.3.202010.81eef83-1.el7.x86_64.rpm
state: present
-- name: template certstore configure file
+- name: "template certstore configure file"
template:
src: "{{ role_path }}/templates/cert_store.ini.j2"
dest: /opt/tsg/certstore/conf/cert_store.ini
-- name: template certstore zlog file
+- name: "template certstore zlog file"
template:
src: "{{ role_path }}/templates/zlog.conf.j2"
dest: /opt/tsg/certstore/conf/zlog.conf
diff --git a/roles/firewall/templates/maat.conf.j2 b/roles/firewall/templates/maat.conf.j2
index bf88863..baa29f6 100644
--- a/roles/firewall/templates/maat.conf.j2
+++ b/roles/firewall/templates/maat.conf.j2
@@ -24,9 +24,9 @@ TABLE_INFO=tsgconf/tsg_dynamic_tableinfo.conf
STAT_FILE=tsg_dynamic_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ dynamic_maat_redis_server.address }}
-REDIS_PORT_NUM={{ maat_redis_server.port_num }}
-REDIS_PORT={{ maat_redis_server.port }}
-REDIS_INDEX={{ maat_redis_server.db }}
+REDIS_PORT_NUM={{ dynamic_maat_redis_server.port_num }}
+REDIS_PORT={{ dynamic_maat_redis_server.port }}
+REDIS_INDEX={{ dynamic_maat_redis_server.db }}
JSON_CFG_FILE=tsgconf/tsg_maat.json
INC_CFG_DIR=tsgrule/inc/index/
FULL_CFG_DIR=tsgrule/full/index/
diff --git a/roles/maat-redis/tasks/main.yml b/roles/maat-redis/tasks/main.yml
index 3cf437c..a20f36c 100644
--- a/roles/maat-redis/tasks/main.yml
+++ b/roles/maat-redis/tasks/main.yml
@@ -3,12 +3,14 @@
src: "{{ role_path }}/files/maat-redis.service"
dest: "/usr/lib/systemd/system"
mode: 0644
+ when: tsg_cluster_mode == 1
-- name: "Template the kni.conf"
+- name: "Template the maat-redis.conf"
template:
src: "{{ role_path }}/templates/maat-redis.conf.j2"
dest: /etc/maat-redis.conf
tags: template
+ when: tsg_cluster_mode == 1
- name: "start maat-redis"
systemd:
@@ -16,3 +18,4 @@
state: started
daemon_reload: yes
enabled: yes
+ when: tsg_cluster_mode == 1
diff --git a/roles/reboot/tasks/main.yml b/roles/reboot/tasks/main.yml
index 777560a..a9bb686 100644
--- a/roles/reboot/tasks/main.yml
+++ b/roles/reboot/tasks/main.yml
@@ -1,3 +1,3 @@
- name: "reboot"
reboot:
-# when: Deploy_finished_reboot == 1
+ when: Deploy_finished_reboot == 1
diff --git a/roles/telegraf_collect/tasks/main.yml b/roles/telegraf_collect/tasks/main.yml
index dfc73ac..a18f43f 100644
--- a/roles/telegraf_collect/tasks/main.yml
+++ b/roles/telegraf_collect/tasks/main.yml
@@ -11,9 +11,17 @@
- name: "Templates telegraf_collect.conf"
template:
- src: "{{role_path}}/templates/telegraf_collect.conf.j2"
+ src: "{{role_path}}/templates/telegraf_collect.conf_adc.j2"
dest: /etc/telegraf/telegraf_collect.conf
tags: template
+ when: tsg_running_type == 2
+
+- name: "Templates telegraf_collect.conf"
+ template:
+ src: "{{role_path}}/templates/telegraf_collect.conf_server.j2"
+ dest: /etc/telegraf/telegraf_collect.conf
+ tags: template
+ when: tsg_running_type != 2
- name: "copy telegraf_collect.service to destination server"
copy:
diff --git a/roles/telegraf_collect/templates/telegraf_collect.conf_adc.j2 b/roles/telegraf_collect/templates/telegraf_collect.conf_adc.j2
new file mode 100644
index 0000000..0eb75f5
--- /dev/null
+++ b/roles/telegraf_collect/templates/telegraf_collect.conf_adc.j2
@@ -0,0 +1,73 @@
+[global_tags]
+ blade = "{{bladename}}"
+[agent]
+ interval = "5s"
+ round_interval = true
+ metric_batch_size = 1000000
+ metric_buffer_limit = 1000000
+ collection_jitter = "0s"
+ flush_interval = "1s"
+ flush_jitter = "0s"
+ precision = ""
+ debug = false
+ quiet = false
+ logfile = ""
+ hostname = ""
+ omit_hostname = false
+
+[[outputs.file]]
+ files = ["stdout", "/tmp/collect.out"]
+ data_format = "json"
+ rotation_interval = "1h"
+ rotation_max_size = "100MB"
+ rotation_max_archives = 5
+
+[[outputs.socket_writer]]
+ address = "udp://192.168.100.1:8100"
+
+
+{% if bladename == "mcn0" %}
+[[inputs.procstat]]
+ exe= "sapp"
+[[inputs.procstat]]
+ exe="certstore"
+{% else %}
+[[inputs.procstat]]
+ exe= "tfe"
+{% endif %}
+
+[[inputs.systemd_units]]
+ unittype = "service"
+ timeout = "1s"
+
+[[inputs.cpu]]
+ percpu = false
+ totalcpu = true
+ collect_cpu_time = false
+ report_active = false
+ fieldpass = ["usage_idle", "usage_iowait", "usage_system", "usage_user"]
+
+[[inputs.system]]
+ fieldpass = ["load1", "load5", "load15"]
+
+[[inputs.mem]]
+ fieldpass = ["available"]
+
+[[inputs.disk]]
+ fieldpass = ["free", "inodes_free", "used_percent"]
+ ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
+
+[[inputs.diskio]]
+ fieldpass = ["read_bytes", "write_bytes", "reads","writes"]
+
+[[inputs.netstat]]
+
+[[inputs.net]]
+ ignore_protocol_stats = false
+ interfaces = ["ens*"]
+
+[[inputs.kernel]]
+
+[[inputs.udp_listener]]
+ ServiceAddress= ":58100"
+ data_format = "influx" \ No newline at end of file
diff --git a/roles/telegraf_collect/templates/telegraf_collect.conf_server.j2 b/roles/telegraf_collect/templates/telegraf_collect.conf_server.j2
new file mode 100644
index 0000000..b2699a4
--- /dev/null
+++ b/roles/telegraf_collect/templates/telegraf_collect.conf_server.j2
@@ -0,0 +1,70 @@
+[global_tags]
+ blade = "server"
+[agent]
+ interval = "5s"
+ round_interval = true
+ metric_batch_size = 1000000
+ metric_buffer_limit = 1000000
+ collection_jitter = "0s"
+ flush_interval = "1s"
+ flush_jitter = "0s"
+ precision = ""
+ debug = false
+ quiet = false
+ logfile = ""
+ hostname = ""
+ omit_hostname = false
+
+[[outputs.file]]
+ files = ["stdout", "/tmp/collect.out"]
+ data_format = "json"
+ rotation_interval = "1h"
+ rotation_max_size = "100MB"
+ rotation_max_archives = 5
+
+[[outputs.socket_writer]]
+ address = "udp://192.168.100.1:8100"
+
+
+[[inputs.procstat]]
+ exe= "sapp"
+[[inputs.procstat]]
+ exe="certstore"
+[[inputs.procstat]]
+ exe= "tfe"
+
+[[inputs.systemd_units]]
+ unittype = "service"
+ timeout = "1s"
+
+[[inputs.cpu]]
+ percpu = false
+ totalcpu = true
+ collect_cpu_time = false
+ report_active = false
+ fieldpass = ["usage_idle", "usage_iowait", "usage_system", "usage_user"]
+
+[[inputs.system]]
+ fieldpass = ["load1", "load5", "load15"]
+
+[[inputs.mem]]
+ fieldpass = ["available"]
+
+[[inputs.disk]]
+ fieldpass = ["free", "inodes_free", "used_percent"]
+ ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
+
+[[inputs.diskio]]
+ fieldpass = ["read_bytes", "write_bytes", "reads","writes"]
+
+[[inputs.netstat]]
+
+[[inputs.net]]
+ ignore_protocol_stats = false
+ interfaces = ["ens*"]
+
+[[inputs.kernel]]
+
+[[inputs.udp_listener]]
+ ServiceAddress= ":58100"
+ data_format = "influx"
diff --git a/roles/tsg-diagnose-uninstall/tasks/main.yml b/roles/tsg-diagnose-uninstall/tasks/main.yml
deleted file mode 100644
index 39e16ba..0000000
--- a/roles/tsg-diagnose-uninstall/tasks/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- name: stop tsg-diagnose
- systemd:
- name: tsg-diagnose
- state: stopped
-
-- name: remove the tsg-diagnose
- yum:
- name: tsg-diagnose
- state: absent
diff --git a/roles/tsg-diagnose-verify-succ/tasks/main.yml b/roles/tsg-diagnose-verify-succ/tasks/main.yml
deleted file mode 100644
index e84c503..0000000
--- a/roles/tsg-diagnose-verify-succ/tasks/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: "register tsg-diagnose exec result"
- shell: docker exec -it unittest_tsg-diagnose /bin/sh -c 'python3 /root/unittest/tsg_diagnose.py'
- register: tsgdiagnoseresults
-
-- name: assert
- assert:
- that:
- - tsgdiagnoseresults.stdout.find('FAIL') == -1
- fail_msg: "FAIL"
- success_msg: "PASS"
diff --git a/roles/tsg-diagnose-verify-succ/tasks/main.yml.bak b/roles/tsg-diagnose-verify-succ/tasks/main.yml.bak
deleted file mode 100644
index c217f50..0000000
--- a/roles/tsg-diagnose-verify-succ/tasks/main.yml.bak
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: "register tsg-diagnose exec result"
- shell: docker exec -it unittest_tsg-diagnose /bin/sh -c 'python3 /root/unittest/tsg_diagnose.py'
- register: tsgdiagnoseresults
-
-- name: "check the results"
- fail:
- msg: fail
- when: tsgdiagnoseresults.stdout.find('FAIL') != -1
diff --git a/roles/tsg_device_tag/tasks/main.yml b/roles/tsg_device_tag/tasks/main.yml
index 28f7ac7..21e4217 100644
--- a/roles/tsg_device_tag/tasks/main.yml
+++ b/roles/tsg_device_tag/tasks/main.yml
@@ -3,7 +3,12 @@
path: /opt/tsg/etc
state: directory
-- name: "Template tsg_device_tag.json"
+- name: "Template tsg_sn.json"
template:
- src: "{{ role_path }}/templates/tsg_device_tag.json.j2"
- dest: /opt/tsg/etc/tsg_device_tag.json
+ src: "{{ role_path }}/templates/tsg_sn.json.j2"
+ dest: /opt/tsg/etc/tsg_sn.json
+
+- name: "Template tsg_tag.json"
+ template:
+ src: "{{ role_path }}/templates/tsg_tags.json.j2"
+ dest: /opt/tsg/etc/tsg_tags.json
diff --git a/roles/tsg_device_tag/templates/tsg_sn.json.j2 b/roles/tsg_device_tag/templates/tsg_sn.json.j2
new file mode 100644
index 0000000..a88f0a5
--- /dev/null
+++ b/roles/tsg_device_tag/templates/tsg_sn.json.j2
@@ -0,0 +1,3 @@
+{
+ "sn": "GN202000000000000000"
+}
diff --git a/roles/tsg_device_tag/templates/tsg_tags.json.j2 b/roles/tsg_device_tag/templates/tsg_tags.json.j2
new file mode 100644
index 0000000..c275588
--- /dev/null
+++ b/roles/tsg_device_tag/templates/tsg_tags.json.j2
@@ -0,0 +1 @@
+{"tags":[{"tag":"data_center","value":"Beijing"}]}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 21:58:59 +0000