更新设备管理一键部署安装包

author: zhangzhihan <[email protected]> 2020-04-13 17:49:10 +0800
committer: zhangzhihan <[email protected]> 2020-04-13 17:49:10 +0800
commit: 39a13763eb34433f68c04122c2cf8eb9f70aa268 (patch)
tree: 9ebe929116de8774ea21796200808c42732c56ec
parent: b76d26750401cf63642f355cbc93fa09c75603bd (diff)
48 files changed, 323 insertions, 630 deletions
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 49a13ce..0000000
--- a/.DS_Store
+++ /dev/null
diff --git a/deploy.yml b/deploy.yml
index 113bba2..9620a65 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -1,63 +1,53 @@
+- hosts: all
+  roles:
+    - jdk1.8.0_73
+
 - hosts: cluster_server
   roles:
     - consul-cluster
-    - influxdb
     - mariadb
+    - influxdb
 
 - hosts: blade-mxn
   roles:
     - consul-external
-
-- hosts: blade-00
-  roles:
-    - consul-internal
-    - telegraf
-    - influxdb
-    - grafana
-
-- hosts: blade-01
-  roles:
-    - consul-internal
-
-- hosts: blade-02
-  roles:
-    - consul-internal
-
-- hosts: blade-03
-  roles:
-    - consul-internal
-
-- hosts: sled-mxn
-  roles:
     - tsg-cli-mxn
     - oam_cli_agent_mxn
     - oam_cli
     - oam_core
     - oam_snmp
-    
-- hosts: sled-mcn0
+
+- hosts: blade-mcn0
   roles:
+    - mariadb
+    - consul-internal
+    - telegraf
+    - influxdb
+    - grafana
     - tsg-cli-mcn0
     - oam_cli_agent
 
-- hosts: sled-mcn1 
+- hosts: blade-mcn1
   roles:
+    - consul-internal
     - tsg-cli-mcn1
     - oam_cli_agent
 
-- hosts: sled-mcn2
+- hosts: blade-mcn2
   roles:
+    - consul-internal
     - tsg-cli-mcn2
     - oam_cli_agent
 
-- hosts: sled-mcn3  
+- hosts: blade-mcn3
   roles:
+    - consul-internal
     - tsg-cli-mcn3
     - oam_cli_agent
 
-- hosts: sled-mxn
+- hosts: blade-mxn
   roles:
-    - oam_core_start
+    - oam_mxn_start
 
 - hosts: cluster_server
   roles:
diff --git a/deploy.yml_bak b/deploy.yml_bak
new file mode 100644
index 0000000..8b0e3b9
--- /dev/null
+++ b/deploy.yml_bak
@@ -0,0 +1,70 @@
+- hosts: cluster_server
+  roles:
+    - consul-cluster
+    - mariadb
+    - influxdb
+
+- hosts: blade-mxn
+  roles:
+    - jdk1.8.0_73
+    - consul-external
+
+- hosts: blade-00
+  roles:
+    - jdk1.8.0_73
+    - mariadb
+    - consul-internal
+    - telegraf
+    - influxdb
+    - grafana
+
+- hosts: blade-01
+  roles:
+    - jdk1.8.0_73
+    - consul-internal
+
+- hosts: blade-02
+  roles:
+    - jdk1.8.0_73
+    - consul-internal
+
+- hosts: blade-03
+  roles:
+    - jdk1.8.0_73
+    - consul-internal
+
+- hosts: sled-mxn
+  roles:
+    - tsg-cli-mxn
+    - oam_cli_agent_mxn
+    - oam_cli
+    - oam_core
+    - oam_snmp
+    
+- hosts: sled-mcn0
+  roles:
+    - tsg-cli-mcn0
+    - oam_cli_agent
+
+- hosts: sled-mcn1 
+  roles:
+    - tsg-cli-mcn1
+    - oam_cli_agent
+
+- hosts: sled-mcn2
+  roles:
+    - tsg-cli-mcn2
+    - oam_cli_agent
+
+- hosts: sled-mcn3  
+  roles:
+    - tsg-cli-mcn3
+    - oam_cli_agent
+
+- hosts: sled-mxn
+  roles:
+    - oam_core_start
+
+- hosts: cluster_server
+  roles:
+    - oam_cluster
diff --git a/host_40.170/group_vars/all.yml b/host_40.170/group_vars/all.yml
deleted file mode 100644
index bafcf59..0000000
--- a/host_40.170/group_vars/all.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-influxdb:
-    cluster_ip: "192.168.40.210"
-
-consul:
-    datacenter: consul-xxg
-    dckey: "XwXLAbVN1C44dLUVJ6UL5A=="
-    cluster_ip: "192.168.40.210"
-    cluster_ethname: ens33
-    external_ethname: ens33
-    internal_ethname: ens33
-
-mariadb:
-    username: root
-    password: tsg2019
diff --git a/host_40.170/group_vars/blade-00.yml b/host_40.170/group_vars/blade-00.yml
deleted file mode 100644
index c7a4ad8..0000000
--- a/host_40.170/group_vars/blade-00.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-influxdb:
-    cluster_agent: "no"
-    cluster_ip: "192.168.40.210"
-    mcn0_agent: "yes"
-    meta_dir: /var/lib/influxdb/meta
-    data_dir: /var/lib/influxdb/data
-    wal_dir: /var/lib/influxdb/wal-dir
-
-grafana:
-    http_port: 53000
diff --git a/host_40.170/group_vars/cluster_server.yml b/host_40.170/group_vars/cluster_server.yml
deleted file mode 100644
index 7d69281..0000000
--- a/host_40.170/group_vars/cluster_server.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-influxdb:
-    cluster_agent: "yes"
-    mcn0_agent: "no"
-    meta_dir: /var/lib/influxdb/meta
-    data_dir: /var/lib/influxdb/data
-    wal_dir: /var/lib/influxdb/wal-dir
-
diff --git a/host_40.170/hosts b/host_40.170/hosts
deleted file mode 100644
index d884352..0000000
--- a/host_40.170/hosts
+++ /dev/null
@@ -1,48 +0,0 @@
-[all:vars]
-ansible_user=root
-use_chassis_hardware_sn=false
-rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm
-
-
-[blade-mxn]
-192.168.40.170
-
-[blade-00]
-192.168.40.166 server_ip=172.16.124.133
-
-[blade-01]
-192.168.40.167 server_ip=172.16.124.133
-
-[blade-02]
-192.168.40.168 server_ip=172.16.124.133
-
-[blade-03]
-192.168.40.169 server_ip=172.16.124.133
-
-[sled-mxn]
-192.168.40.170 SN=CBT2201925000003 mcn0_ip=192.168.40.166
-
-[sled-mcn0]
-192.168.40.166 SN=CBT2201925000003
-
-[sled-mcn1]
-192.168.40.167 SN=CBT2201925000003
-
-[sled-mcn2]
-192.168.40.168 SN=CBT2201925000003
-
-[sled-mcn3]
-192.168.40.169 SN=CBT2201925000003
-
-[Functional_Host:children]
-sled-mcn0
-sled-mcn1
-sled-mcn2
-sled-mcn3
-
-[tsg-all:children]
-sled-mxn
-sled-mcn0
-sled-mcn1
-sled-mcn2
-sled-mcn3
diff --git a/init_sql_for_mcn0.yml b/init_sql_for_mcn0.yml
deleted file mode 100644
index 182edf6..0000000
--- a/init_sql_for_mcn0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: sled-mcn0
-  gather_facts: no
-  roles:
-    - oam_env_initialize
diff --git a/install_oam_for_40.170.yml b/install_oam_for_40.170.yml
deleted file mode 100644
index c6d4fbe..0000000
--- a/install_oam_for_40.170.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- hosts: sled-mxn
-  gather_facts: no
-  roles:
-    - tsg-cli-mxn
-    - oam_cli_agent_mxn
-    - oam_cli
-    - oam_core
-    - oam_snmp
-    
-- hosts: sled-mcn0
-  gather_facts: no
-  roles:
-    - tsg-cli-mcn0
-    - oam_cli_agent
-
-- hosts: sled-mcn1 
-  gather_facts: no
-  roles:
-    - tsg-cli-mcn1
-    - oam_cli_agent
-
-- hosts: sled-mcn2
-  gather_facts: no
-  roles:
-    - tsg-cli-mcn2
-    - oam_cli_agent
-
-- hosts: sled-mcn3  
-  gather_facts: no
-  roles:
-    - tsg-cli-mcn3
-    - oam_cli_agent
-
-- hosts: sled-mxn
-  gather_facts: no
-  roles:
-    - oam_core_start
-
-## initialize is after all module has been installed
-- hosts: sled-mcn0
-  gather_facts: no
-  roles:
-    - oam_env_initialize
diff --git a/lijia_update_note.txt b/lijia_update_note.txt
deleted file mode 100644
index 9f93ea1..0000000
--- a/lijia_update_note.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-2020-03-13 lijia update
-1-����oam, tsg-cliģ���rpm��
-2-�޸�roles/oam_cli/tasks/main.yml, Templates application.properties��·������.
-3-�޸�roles/oam_core/taskĿ¼���ƴ��󣬸�Ϊtasks.
-\ No newline at end of file
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index fdd625e..9fe6e43 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -39,5 +39,6 @@
 - name: "Start grafana"
   systemd:
     name: grafana-server.service
-    state: restarted
+    state: started
     enabled: yes
+    daemon-reload: yes
diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml
index a98e9e2..4db29e6 100644
--- a/roles/influxdb/tasks/main.yml
+++ b/roles/influxdb/tasks/main.yml
@@ -21,11 +21,15 @@
     state: restarted
     enabled: yes
 
-- name: "script set_influxdb_cluster.sh"
-  script: "{{role_path}}//files/set_influxdb_cluster.sh"
-  when: influxdb.cluster_agent == "yes"
+- name: "create database"
+  shell: influx -host '127.0.0.1' -port '58086'  -execute 'create database tsg_stat;'
 
-- name: "script set_influxdb_blade00.sh"
-  script: "{{role_path}}//files/set_influxdb_blade00.sh"
-  when: influxdb.mcn0_agent == "yes"
+- name: "create user"
+  shell: influx -host '127.0.0.1' -port '58086' -database 'tsg_stat' -execute "create user "admin" with password 'tsg2019' with all privileges"
+
+- name: "set cluster influxdb retention policy"
+  shell: influx -port 58086 -execute 'CREATE RETENTION POLICY "1_year" ON "tsg_stat" DURATION 365d REPLICATION 1 DEFAULT'
+
+- name: "set mcn0 influxdb retention policy"
+  shell: influx -port 58086 -execute 'CREATE RETENTION POLICY "1_day" ON "tsg_stat" DURATION 1d REPLICATION 1 DEFAULT'
 
diff --git a/roles/jdk1.8.0_73/files/jdk-8u73-linux-x64.tar.gz b/roles/jdk1.8.0_73/files/jdk-8u73-linux-x64.tar.gz
new file mode 100644
index 0000000..eb7b639
--- /dev/null
+++ b/roles/jdk1.8.0_73/files/jdk-8u73-linux-x64.tar.gz
diff --git a/roles/jdk1.8.0_73/files/set_java_enviroment b/roles/jdk1.8.0_73/files/set_java_enviroment
new file mode 100644
index 0000000..34c61f8
--- /dev/null
+++ b/roles/jdk1.8.0_73/files/set_java_enviroment
@@ -0,0 +1,5 @@
+#set java enviroment
+export JAVA_HOME=/usr/lib/jvm/jdk1.8.0_73
+export JRE_HOME=$JAVA_HOME/jre
+export CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib
+export PATH=$PATH:$JAVA_HOME/bin
diff --git a/roles/jdk1.8.0_73/tasks/main.yml b/roles/jdk1.8.0_73/tasks/main.yml
new file mode 100644
index 0000000..2384b18
--- /dev/null
+++ b/roles/jdk1.8.0_73/tasks/main.yml
@@ -0,0 +1,28 @@
+- name: "copy JDK install files to destination server"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp
+    mode: 0755
+
+- name: "remove old java"
+  shell: rpm -qa | grep openjdk | xargs rpm -e --nodeps warn=false
+  ignore_errors: true
+  
+- name: "install JDK1.8.0_73"
+  unarchive:
+    src: "/tmp/jdk-8u73-linux-x64.tar.gz"
+    dest: /usr/lib/jvm/
+    copy: no
+    mode: 0755
+
+- name: "judge java enviroment"
+  shell: grep "/usr/lib/jvm/jdk1.8.0_73" /etc/profile
+  register: return
+  ignore_errors: true
+
+- name: "set java enviroment"
+  shell: cat /tmp/set_java_enviroment >> /etc/profile
+  when: return.rc != 0
+
+- name: "source /etc/profile"
+  shell: source /etc/profile
diff --git a/roles/mariadb/files/my.cnf b/roles/mariadb/files/my.cnf
index 82f9b36..382cb34 100644
--- a/roles/mariadb/files/my.cnf
+++ b/roles/mariadb/files/my.cnf
@@ -19,7 +19,7 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /tmp/mysql.sock 
 
 # Here follows entries for some specific programs
 
diff --git a/roles/mariadb/files/tsg_threshold.sql b/roles/mariadb/files/tsg_threshold.sql
deleted file mode 100644
index 6291bb7..0000000
--- a/roles/mariadb/files/tsg_threshold.sql
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-Navicat MySQL Data Transfer
-
-Source Server         : 192.168.161.134
-Source Server Version : 50505
-Source Host           : 192.168.161.134:3306
-Source Database       : tsg_oam
-
-Target Server Type    : MYSQL
-Target Server Version : 50505
-File Encoding         : 65001
-
-Date: 2019-10-03 22:27:26
-*/
-
-SET FOREIGN_KEY_CHECKS=0;
-
--- ----------------------------
--- Table structure for `tsg_threshold`
--- ----------------------------
-DROP TABLE IF EXISTS `tsg_threshold`;
-CREATE TABLE `tsg_threshold` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `component` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
-  `counter` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `critical_high` float DEFAULT NULL,
-  `critical_low` float DEFAULT NULL,
-  `major_high` float DEFAULT NULL,
-  `major_low` float DEFAULT NULL,
-  `minor_high` float DEFAULT NULL,
-  `minor_low` float DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=234 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- ----------------------------
--- Records of tsg_threshold
--- ----------------------------
-INSERT INTO `tsg_threshold` VALUES ('1', 'CBT2201925000001_mxn_hardware', 'CMM_TEMP', '55', '-10', '46', '-5', '39', '0');
-INSERT INTO `tsg_threshold` VALUES ('2', 'CBT2201925000001_mxn_network_port_1', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('3', 'CBT2201925000001_mxn_hardware', 'COME_TEMP', '90', '-10', '76', '-5', '63', '0');
-INSERT INTO `tsg_threshold` VALUES ('4', 'CBT2201925000001_mxn_hardware', 'RRC_TEMP', '90', '-10', '76', '-5', '63', '0');
-INSERT INTO `tsg_threshold` VALUES ('5', 'CBT2201925000001_mxn_hardware', 'P1V', '1.15', '0.85', '1.1', '0.9', '1.05', '0.95');
-INSERT INTO `tsg_threshold` VALUES ('6', 'CBT2201925000001_mxn_hardware', 'PVDDS', '1.07', '0.71', '1.04', '0.73', '1', '0.76');
-INSERT INTO `tsg_threshold` VALUES ('7', 'CBT2201925000001_mxn_hardware', 'PVDDF', '1.12', '0.71', '1.1', '0.73', '1.05', '0.76');
-INSERT INTO `tsg_threshold` VALUES ('8', 'CBT2201925000001_mxn_hardware', 'P3V3', '3.636', '2.964', '3.535', '3.066', '3.475', '3.139');
-INSERT INTO `tsg_threshold` VALUES ('9', 'CBT2201925000001_mxn_hardware', 'P5V', '5.745', '4.234', '5.494', '4.486', '5.242', '4.738');
-INSERT INTO `tsg_threshold` VALUES ('10', 'CBT2201925000001_mxn_hardware', 'P12V', '13.583', '10.415', '13.072', '10.926', '12.51', '11.488');
-INSERT INTO `tsg_threshold` VALUES ('11', 'CBT2201925000001_mxn_hardware', 'P1V_RT', '1.15', '0.85', '1.1', '0.9', '1.05', '0.95');
-INSERT INTO `tsg_threshold` VALUES ('12', 'CBT2201925000001_mxn_hardware', 'Fan_1', '9472', '512', '8672', '672', '7872', '832');
-INSERT INTO `tsg_threshold` VALUES ('13', 'CBT2201925000001_mxn_hardware', 'Fan_2', '9472', '512', '8672', '672', '7872', '832');
-INSERT INTO `tsg_threshold` VALUES ('14', 'CBT2201925000001_mxn_hardware', 'Fan_3', '9472', '512', '8672', '672', '7872', '832');
-INSERT INTO `tsg_threshold` VALUES ('15', 'CBT2201925000001_mcn0_hardware', 'HS_Current0', '40.25', '0', '37.25', '0', '36.75', '0');
-INSERT INTO `tsg_threshold` VALUES ('16', 'CBT2201925000001_mcn1_hardware', 'HS_Current0', '40.25', '0', '37.25', '0', '36.75', '0');
-INSERT INTO `tsg_threshold` VALUES ('17', 'CBT2201925000001_mcn2_hardware', 'HS_Current0', '40.25', '0', '37.25', '0', '36.75', '0');
-INSERT INTO `tsg_threshold` VALUES ('18', 'CBT2201925000001_mcn3_hardware', 'HS_Current0', '40.25', '0', '37.25', '0', '36.75', '0');
-INSERT INTO `tsg_threshold` VALUES ('19', 'CBT2201925000001_mcn0_hardware', 'HS_Volt0', '12.75', '10.5', '12.5', '10.875', '12.25', '11.125');
-INSERT INTO `tsg_threshold` VALUES ('20', 'CBT2201925000001_mcn1_hardware', 'HS_Volt0', '12.75', '10.5', '12.5', '10.875', '12.25', '11.125');
-INSERT INTO `tsg_threshold` VALUES ('21', 'CBT2201925000001_mcn2_hardware', 'HS_Volt0', '12.75', '10.5', '12.5', '10.875', '12.25', '11.125');
-INSERT INTO `tsg_threshold` VALUES ('22', 'CBT2201925000001_mcn3_hardware', 'HS_Volt0', '12.75', '10.5', '12.5', '10.875', '12.25', '11.125');
-INSERT INTO `tsg_threshold` VALUES ('23', 'CBT2201925000001_mcn0_hardware', 'P1V05_PCH', '1.147', '0.941', '1.117', '0.97', '1.098', '1');
-INSERT INTO `tsg_threshold` VALUES ('24', 'CBT2201925000001_mcn1_hardware', 'P1V05_PCH', '1.147', '0.941', '1.117', '0.97', '1.098', '1');
-INSERT INTO `tsg_threshold` VALUES ('25', 'CBT2201925000001_mcn2_hardware', 'P1V05_PCH', '1.147', '0.941', '1.117', '0.97', '1.098', '1');
-INSERT INTO `tsg_threshold` VALUES ('26', 'CBT2201925000001_mcn3_hardware', 'P1V05_PCH', '1.147', '0.941', '1.117', '0.97', '1.098', '1');
-INSERT INTO `tsg_threshold` VALUES ('27', 'CBT2201925000001_mcn0_hardware', 'P1V2_DDR0', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('28', 'CBT2201925000001_mcn1_hardware', 'P1V2_DDR0', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('29', 'CBT2201925000001_mcn2_hardware', 'P1V2_DDR0', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('30', 'CBT2201925000001_mcn3_hardware', 'P1V2_DDR0', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('31', 'CBT2201925000001_mcn0_hardware', 'P1V2_DDR1', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('32', 'CBT2201925000001_mcn1_hardware', 'P1V2_DDR1', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('33', 'CBT2201925000001_mcn2_hardware', 'P1V2_DDR1', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('34', 'CBT2201925000001_mcn3_hardware', 'P1V2_DDR1', '1.303', '1.078', '1.284', '1.117', '1.254', '1.137');
-INSERT INTO `tsg_threshold` VALUES ('35', 'CBT2201925000001_mcn0_hardware', 'P3V3', '3.569', '2.945', '3.51', '3.042', '3.452', '3.12');
-INSERT INTO `tsg_threshold` VALUES ('36', 'CBT2201925000001_mcn1_hardware', 'P3V3', '3.569', '2.945', '3.51', '3.042', '3.452', '3.12');
-INSERT INTO `tsg_threshold` VALUES ('37', 'CBT2201925000001_mcn2_hardware', 'P3V3', '3.569', '2.945', '3.51', '3.042', '3.452', '3.12');
-INSERT INTO `tsg_threshold` VALUES ('38', 'CBT2201925000001_mcn3_hardware', 'P3V3', '3.569', '2.945', '3.51', '3.042', '3.452', '3.12');
-INSERT INTO `tsg_threshold` VALUES ('39', 'CBT2201925000001_mcn0_hardware', 'P5V', '5.453', '4.494', '5.343', '4.631', '5.233', '4.74');
-INSERT INTO `tsg_threshold` VALUES ('40', 'CBT2201925000001_mcn1_hardware', 'P5V', '5.453', '4.494', '5.343', '4.631', '5.233', '4.74');
-INSERT INTO `tsg_threshold` VALUES ('41', 'CBT2201925000001_mcn2_hardware', 'P5V', '5.453', '4.494', '5.343', '4.631', '5.233', '4.74');
-INSERT INTO `tsg_threshold` VALUES ('42', 'CBT2201925000001_mcn3_hardware', 'P5V', '5.453', '4.494', '5.343', '4.631', '5.233', '4.74');
-INSERT INTO `tsg_threshold` VALUES ('43', 'CBT2201925000001_mcn0_hardware', 'PVCCIN_CPU0', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('44', 'CBT2201925000001_mcn1_hardware', 'PVCCIN_CPU0', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('45', 'CBT2201925000001_mcn2_hardware', 'PVCCIN_CPU0', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('46', 'CBT2201925000001_mcn3_hardware', 'PVCCIN_CPU0', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('47', 'CBT2201925000001_mcn0_hardware', 'PVCCIN_CPU1', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('48', 'CBT2201925000001_mcn1_hardware', 'PVCCIN_CPU1', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('49', 'CBT2201925000001_mcn2_hardware', 'PVCCIN_CPU1', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('50', 'CBT2201925000001_mcn3_hardware', 'PVCCIN_CPU1', '2.019', '1.323', '1.98', '1.343', '1.94', '1.352');
-INSERT INTO `tsg_threshold` VALUES ('51', 'CBT2201925000001_mcn0_hardware', 'PVCCIO', '1.029', '0.853', '1.009', '0.882', '1', '0.902');
-INSERT INTO `tsg_threshold` VALUES ('52', 'CBT2201925000001_mcn1_hardware', 'PVCCIO', '1.029', '0.853', '1.009', '0.882', '1', '0.902');
-INSERT INTO `tsg_threshold` VALUES ('53', 'CBT2201925000001_mcn2_hardware', 'PVCCIO', '1.029', '0.853', '1.009', '0.882', '1', '0.902');
-INSERT INTO `tsg_threshold` VALUES ('54', 'CBT2201925000001_mcn3_hardware', 'PVCCIO', '1.029', '0.853', '1.009', '0.882', '1', '0.902');
-INSERT INTO `tsg_threshold` VALUES ('55', 'CBT2201925000001_mcn0_hardware', 'Temp_LL', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('56', 'CBT2201925000001_mcn1_hardware', 'Temp_LL', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('57', 'CBT2201925000001_mcn2_hardware', 'Temp_LL', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('58', 'CBT2201925000001_mcn3_hardware', 'Temp_LL', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('59', 'CBT2201925000001_mcn0_hardware', 'Temp_LR', '45', '-10', '42', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('60', 'CBT2201925000001_mcn1_hardware', 'Temp_LR', '45', '-10', '42', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('61', 'CBT2201925000001_mcn2_hardware', 'Temp_LR', '45', '-10', '42', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('62', 'CBT2201925000001_mcn3_hardware', 'Temp_LR', '45', '-10', '42', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('63', 'CBT2201925000001_mcn0_hardware', 'Temp_PCH', '82', '-10', '74', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('64', 'CBT2201925000001_mcn1_hardware', 'Temp_PCH', '82', '-10', '74', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('65', 'CBT2201925000001_mcn2_hardware', 'Temp_PCH', '82', '-10', '74', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('66', 'CBT2201925000001_mcn3_hardware', 'Temp_PCH', '82', '-10', '74', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('67', 'CBT2201925000001_mcn0_hardware', 'Temp_UL', '85', '-10', '75', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('68', 'CBT2201925000001_mcn1_hardware', 'Temp_UL', '85', '-10', '75', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('69', 'CBT2201925000001_mcn2_hardware', 'Temp_UL', '85', '-10', '75', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('70', 'CBT2201925000001_mcn3_hardware', 'Temp_UL', '85', '-10', '75', '-5', '66', '0');
-INSERT INTO `tsg_threshold` VALUES ('71', 'CBT2201925000001_mcn0_hardware', 'Temp_UR', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('72', 'CBT2201925000001_mcn1_hardware', 'Temp_UR', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('73', 'CBT2201925000001_mcn2_hardware', 'Temp_UR', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('74', 'CBT2201925000001_mcn3_hardware', 'Temp_UR', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('75', 'CBT2201925000001_mcn0_hardware', 'Temp_XL710_82599', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('76', 'CBT2201925000001_mcn1_hardware', 'Temp_XL710_82599', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('77', 'CBT2201925000001_mcn2_hardware', 'Temp_XL710_82599', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('78', 'CBT2201925000001_mcn3_hardware', 'Temp_XL710_82599', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('79', 'CBT2201925000001_mcn0_hardware', 'Temp_mIO0', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('80', 'CBT2201925000001_mcn1_hardware', 'Temp_mIO0', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('81', 'CBT2201925000001_mcn2_hardware', 'Temp_mIO0', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('82', 'CBT2201925000001_mcn3_hardware', 'Temp_mIO0', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('83', 'CBT2201925000001_mcn0_hardware', 'Temp_mIO1', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('84', 'CBT2201925000001_mcn1_hardware', 'Temp_mIO1', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('85', 'CBT2201925000001_mcn2_hardware', 'Temp_mIO1', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('86', 'CBT2201925000001_mcn3_hardware', 'Temp_mIO1', '60', '-10', '50', '-5', '40', '0');
-INSERT INTO `tsg_threshold` VALUES ('87', 'CBT2201925000001_mcn0_hardware', 'PECI_CPU0', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('88', 'CBT2201925000001_mcn1_hardware', 'PECI_CPU0', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('89', 'CBT2201925000001_mcn2_hardware', 'PECI_CPU0', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('90', 'CBT2201925000001_mcn3_hardware', 'PECI_CPU0', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('91', 'CBT2201925000001_mcn0_hardware', 'PECI_CPU1', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('92', 'CBT2201925000001_mcn1_hardware', 'PECI_CPU1', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('93', 'CBT2201925000001_mcn2_hardware', 'PECI_CPU1', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('94', 'CBT2201925000001_mcn3_hardware', 'PECI_CPU1', '90', '-10', '80', '-5', '70', '0');
-INSERT INTO `tsg_threshold` VALUES ('95', 'CBT2201925000001_mxn_cpu', 'laLoad_1', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('96', 'CBT2201925000001_mcn0_cpu', 'laLoad_1', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('97', 'CBT2201925000001_mcn1_cpu', 'laLoad_1', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('98', 'CBT2201925000001_mcn2_cpu', 'laLoad_1', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('99', 'CBT2201925000001_mcn3_cpu', 'laLoad_1', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('100', 'CBT2201925000001_mxn_cpu', 'laLoad_5', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('101', 'CBT2201925000001_mcn0_cpu', 'laLoad_5', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('102', 'CBT2201925000001_mcn1_cpu', 'laLoad_5', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('103', 'CBT2201925000001_mcn2_cpu', 'laLoad_5', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('104', 'CBT2201925000001_mcn3_cpu', 'laLoad_5', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('105', 'CBT2201925000001_mxn_cpu', 'laLoad_10', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('106', 'CBT2201925000001_mcn0_cpu', 'laLoad_10', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('107', 'CBT2201925000001_mcn1_cpu', 'laLoad_10', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('108', 'CBT2201925000001_mcn2_cpu', 'laLoad_10', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('109', 'CBT2201925000001_mcn3_cpu', 'laLoad_10', '99', null, '85', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('110', 'CBT2201925000001_mxn_cpu', 'ssCpuUser', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('111', 'CBT2201925000001_mcn0_cpu', 'ssCpuUser', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('112', 'CBT2201925000001_mcn1_cpu', 'ssCpuUser', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('113', 'CBT2201925000001_mcn2_cpu', 'ssCpuUser', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('114', 'CBT2201925000001_mcn3_cpu', 'ssCpuUser', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('115', 'CBT2201925000001_mxn_cpu', 'ssCpuSystem', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('116', 'CBT2201925000001_mcn0_cpu', 'ssCpuSystem', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('117', 'CBT2201925000001_mcn1_cpu', 'ssCpuSystem', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('118', 'CBT2201925000001_mcn2_cpu', 'ssCpuSystem', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('119', 'CBT2201925000001_mcn3_cpu', 'ssCpuSystem', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('120', 'CBT2201925000001_mxn_cpu', 'ssCpuIdle', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('121', 'CBT2201925000001_mcn0_cpu', 'ssCpuIdle', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('122', 'CBT2201925000001_mcn1_cpu', 'ssCpuIdle', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('123', 'CBT2201925000001_mcn2_cpu', 'ssCpuIdle', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('124', 'CBT2201925000001_mcn3_cpu', 'ssCpuIdle', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('125', 'CBT2201925000001_mxn_memory', 'memTotalReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('126', 'CBT2201925000001_mcn0_memory', 'memTotalReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('127', 'CBT2201925000001_mcn1_memory', 'memTotalReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('128', 'CBT2201925000001_mcn2_memory', 'memTotalReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('129', 'CBT2201925000001_mcn3_memory', 'memTotalReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('130', 'CBT2201925000001_mxn_memory', 'memAvailReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('131', 'CBT2201925000001_mcn0_memory', 'memAvailReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('132', 'CBT2201925000001_mcn1_memory', 'memAvailReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('133', 'CBT2201925000001_mcn2_memory', 'memAvailReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('134', 'CBT2201925000001_mcn3_memory', 'memAvailReal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('135', 'CBT2201925000001_mxn_memory', 'memTotalSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('136', 'CBT2201925000001_mcn0_memory', 'memTotalSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('137', 'CBT2201925000001_mcn1_memory', 'memTotalSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('138', 'CBT2201925000001_mcn2_memory', 'memTotalSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('139', 'CBT2201925000001_mcn3_memory', 'memTotalSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('140', 'CBT2201925000001_mxn_memory', 'memAvailSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('141', 'CBT2201925000001_mcn0_memory', 'memAvailSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('142', 'CBT2201925000001_mcn1_memory', 'memAvailSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('143', 'CBT2201925000001_mcn2_memory', 'memAvailSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('144', 'CBT2201925000001_mcn3_memory', 'memAvailSwap', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('145', 'CBT2201925000001_mxn_memory', 'memTotalFree', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('146', 'CBT2201925000001_mcn0_memory', 'memTotalFree', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('147', 'CBT2201925000001_mcn1_memory', 'memTotalFree', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('148', 'CBT2201925000001_mcn2_memory', 'memTotalFree', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('149', 'CBT2201925000001_mcn3_memory', 'memTotalFree', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('150', 'CBT2201925000001_mxn_disk', 'dskTotal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('151', 'CBT2201925000001_mcn0_disk', 'dskTotal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('152', 'CBT2201925000001_mcn1_disk', 'dskTotal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('153', 'CBT2201925000001_mcn2_disk', 'dskTotal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('154', 'CBT2201925000001_mcn3_disk', 'dskTotal', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('155', 'CBT2201925000001_mxn_disk', 'dskUsed', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('156', 'CBT2201925000001_mcn0_disk', 'dskUsed', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('157', 'CBT2201925000001_mcn1_disk', 'dskUsed', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('158', 'CBT2201925000001_mcn2_disk', 'dskUsed', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('159', 'CBT2201925000001_mcn3_disk', 'dskUsed', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('160', 'CBT2201925000001_mxn_disk', 'dskAvail', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('161', 'CBT2201925000001_mcn0_disk', 'dskAvail', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('162', 'CBT2201925000001_mcn1_disk', 'dskAvail', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('163', 'CBT2201925000001_mcn2_disk', 'dskAvail', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('164', 'CBT2201925000001_mcn3_disk', 'dskAvail', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('165', 'CBT2201925000001_mxn_disk', 'dskPercent', '99', null, '95', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('166', 'CBT2201925000001_mcn0_disk', 'dskPercent', '99', null, '95', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('167', 'CBT2201925000001_mcn1_disk', 'dskPercent', '99', null, '95', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('168', 'CBT2201925000001_mcn2_disk', 'dskPercent', '99', null, '95', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('169', 'CBT2201925000001_mcn3_disk', 'dskPercent', '99', null, '95', null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('170', 'CBT2201925000001_mxn_disk', 'dskPercentSled', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('171', 'CBT2201925000001_mcn0_disk', 'dskPercentSled', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('172', 'CBT2201925000001_mcn1_disk', 'dskPercentSled', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('173', 'CBT2201925000001_mcn2_disk', 'dskPercentSled', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('174', 'CBT2201925000001_mcn3_disk', 'dskPercentSled', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('175', 'CBT2201925000001_mxn_network_port_1', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('176', 'CBT2201925000001_mxn_network_port_2', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('177', 'CBT2201925000001_mxn_network_port_3', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('178', 'CBT2201925000001_mxn_network_port_4', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('179', 'CBT2201925000001_mxn_network_port_5', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('180', 'CBT2201925000001_mxn_network_port_6', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('181', 'CBT2201925000001_mxn_network_port_9', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('182', 'CBT2201925000001_mxn_network_port_10', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('183', 'CBT2201925000001_mxn_network_port_37', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('184', 'CBT2201925000001_mxn_network_port_39', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('185', 'CBT2201925000001_mxn_network_port_41', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('186', 'CBT2201925000001_mxn_network_port_43', 'ifInOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('187', 'CBT2201925000001_mxn_network_port_2', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('188', 'CBT2201925000001_mxn_network_port_3', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('189', 'CBT2201925000001_mxn_network_port_4', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('190', 'CBT2201925000001_mxn_network_port_5', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('191', 'CBT2201925000001_mxn_network_port_6', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('192', 'CBT2201925000001_mxn_network_port_9', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('193', 'CBT2201925000001_mxn_network_port_10', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('194', 'CBT2201925000001_mxn_network_port_37', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('195', 'CBT2201925000001_mxn_network_port_39', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('196', 'CBT2201925000001_mxn_network_port_41', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('197', 'CBT2201925000001_mxn_network_port_43', 'ifInUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('198', 'CBT2201925000001_mxn_network_port_1', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('199', 'CBT2201925000001_mxn_network_port_2', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('200', 'CBT2201925000001_mxn_network_port_3', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('201', 'CBT2201925000001_mxn_network_port_4', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('202', 'CBT2201925000001_mxn_network_port_5', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('203', 'CBT2201925000001_mxn_network_port_6', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('204', 'CBT2201925000001_mxn_network_port_9', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('205', 'CBT2201925000001_mxn_network_port_10', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('206', 'CBT2201925000001_mxn_network_port_37', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('207', 'CBT2201925000001_mxn_network_port_39', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('208', 'CBT2201925000001_mxn_network_port_41', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('209', 'CBT2201925000001_mxn_network_port_43', 'ifInErrors', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('210', 'CBT2201925000001_mxn_network_port_1', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('211', 'CBT2201925000001_mxn_network_port_2', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('212', 'CBT2201925000001_mxn_network_port_3', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('213', 'CBT2201925000001_mxn_network_port_4', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('214', 'CBT2201925000001_mxn_network_port_5', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('215', 'CBT2201925000001_mxn_network_port_6', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('216', 'CBT2201925000001_mxn_network_port_9', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('217', 'CBT2201925000001_mxn_network_port_10', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('218', 'CBT2201925000001_mxn_network_port_37', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('219', 'CBT2201925000001_mxn_network_port_39', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('220', 'CBT2201925000001_mxn_network_port_41', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('221', 'CBT2201925000001_mxn_network_port_43', 'ifOutOctets', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('222', 'CBT2201925000001_mxn_network_port_1', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('223', 'CBT2201925000001_mxn_network_port_2', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('224', 'CBT2201925000001_mxn_network_port_3', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('225', 'CBT2201925000001_mxn_network_port_4', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('226', 'CBT2201925000001_mxn_network_port_5', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('227', 'CBT2201925000001_mxn_network_port_6', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('228', 'CBT2201925000001_mxn_network_port_9', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('229', 'CBT2201925000001_mxn_network_port_10', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('230', 'CBT2201925000001_mxn_network_port_37', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('231', 'CBT2201925000001_mxn_network_port_39', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('232', 'CBT2201925000001_mxn_network_port_41', 'ifOutUcastPkts', null, null, null, null, null, null);
-INSERT INTO `tsg_threshold` VALUES ('233', 'CBT2201925000001_mxn_network_port_43', 'ifOutUcastPkts', null, null, null, null, null, null);
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index a5ea760..dfdd3a7 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -94,7 +94,7 @@
 - name: "start and enable mariadb"
   systemd:
     name: mariadb
-    state: restarted
+    state: started
     enabled: yes
     daemon_reload: yes
 
@@ -104,4 +104,21 @@
 - name: "set mariadb privileges"
   shell: mysql -uroot -p{{ mariadb.password }} -e "grant all privileges on *.* to root@'%' identified by 'tsg2019' with grant option;"
   shell: mysql -uroot -p{{ mariadb.password }} -e "flush privileges;"
+  shell: mysql -uroot -p{{ mariadb.password }} -e "create database tsg_oam"
 
+- name: "get remote tsg sn"
+  shell: cat /opt/tsg/etc/tsg_sn.json | grep sn | awk -F "\"" {'print $4'}
+  register: adc_tsg_sn
+
+- name: "Templates tsg_threshold.sql"
+  template:
+    src: "{{role_path}}/templates/tsg_threshold.sql.j2"
+    dest: /tmp/tsg-cli-deploy/tsg_threshold.sql
+  tags: template
+
+
+- name: "debug show tsg_sn"
+  debug: var=adc_tsg_sn.stdout
+
+- name: "import the sql after template"
+  shell: mysql -s -h 127.0.0.1 -u {{ mariadb.username }} -p{{ mariadb.password }}  < /tmp/tsg-cli-deploy/tsg_threshold.sql
diff --git a/roles/oam_env_initialize/templates/sql.txt b/roles/mariadb/templates/sql.txt
index 234f528..234f528 100644
--- a/roles/oam_env_initialize/templates/sql.txt
+++ b/roles/mariadb/templates/sql.txt
diff --git a/roles/oam_env_initialize/templates/tsg_threshold.sql.j2 b/roles/mariadb/templates/tsg_threshold.sql.j2
index 8aa2f2d..8aa2f2d 100644
--- a/roles/oam_env_initialize/templates/tsg_threshold.sql.j2
+++ b/roles/mariadb/templates/tsg_threshold.sql.j2
diff --git a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
index f64dda8..f959b5a 100644
--- a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
+++ b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_cli/templates/application.properties.j2 b/roles/oam_cli/templates/application.properties.j2
index e335ec0..c76c7c0 100755
--- a/roles/oam_cli/templates/application.properties.j2
+++ b/roles/oam_cli/templates/application.properties.j2
@@ -10,15 +10,14 @@ cli.agent.port=50222
 
 # oam.influx.url=http://192.168.161.134:8086
 oam.influx.url=http://{{ mcn0_ip }}:58086
-oam.influx.db=tsg_stat
-oam.influx.user=admin
-oam.influx.password=tsg2019
+oam.influx.db={{ influxdb.dbname }}
+oam.influx.user={{ influxdb.username }}
+oam.influx.password={{ influxdb.passwd }}
 
 oam.cli.user.admin=tsgadmin
 oam.cli.user.user=tsguser
 
-cli.rest.root=http://192.168.40.4:8082/v1
-#cli.rest.root=http://192.168.40.4:8082/v1
+cli.rest.root=http://{{ bifang_api_ip }}:8082/v1
 cli.rest.login=${cli.rest.root}/user/login
 cli.rest.policy=${cli.rest.root}/policy/compile
 cli.rest.policy.object=${cli.rest.root}/policy/object
diff --git a/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm b/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm
index c30b36c..2ac7ce6 100644
--- a/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm
+++ b/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_cli_agent/tasks/main.yml b/roles/oam_cli_agent/tasks/main.yml
index e9d584a..1eff223 100644
--- a/roles/oam_cli_agent/tasks/main.yml
+++ b/roles/oam_cli_agent/tasks/main.yml
@@ -19,6 +19,11 @@
     dest: /usr/share/snmp/snmpd.conf
   tags: template
 
+- name: "Templates oam_cli_agent.service"
+  template:
+    src: "{{ role_path }}/templates/oam_cli_agent.service.j2"
+    dest: /usr/lib/systemd/system/oam_cli_agent.service
+
 - name: "Start snmpd"
   systemd:
     name: snmpd
@@ -30,3 +35,4 @@
     name: oam_cli_agent
     state: restarted
     enabled: yes
+    daemon_reload: yes
diff --git a/roles/oam_cli_agent/templates/oam_cli_agent.service.j2 b/roles/oam_cli_agent/templates/oam_cli_agent.service.j2
new file mode 100644
index 0000000..45ec95a
--- /dev/null
+++ b/roles/oam_cli_agent/templates/oam_cli_agent.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=oam_cli_agent daemon
+
+[Service]
+Type=simple
+Environment=OAM_DIR=/opt/tsg/cli_agent/
+ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java  -jar ${OAM_DIR}oam_cli_agent.jar --spring.config.location=${OAM_DIR}application.properties,${OAM_DIR}application-centos2.properties --logging.file=${OAM_DIR}oam-cli-agent.log
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Restart=always
+RestartSec=5s
+
diff --git a/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm b/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm
index 0f47f68..7fab8e2 100644
--- a/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm
+++ b/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_cli_agent_mxn/tasks/main.yml b/roles/oam_cli_agent_mxn/tasks/main.yml
index b7d3e2d..71bf567 100644
--- a/roles/oam_cli_agent_mxn/tasks/main.yml
+++ b/roles/oam_cli_agent_mxn/tasks/main.yml
@@ -9,8 +9,14 @@
       - /tmp/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm
     state: present
 
-- name: "Start oam_cli_agent_mxn"
-  systemd:
-    name: oam_cli_agent_mxn
-    state: restarted
-    enabled: yes
+- name: "Templates oam_cli_agent_mxn.service"
+  template:
+    src: "{{ role_path }}/templates/oam_cli_agent_mxn.service.j2"
+    dest: /usr/lib/systemd/system/oam_cli_agent_mxn.service
+
+#- name: "Start oam_cli_agent_mxn"
+#  systemd:
+#    name: oam_cli_agent_mxn
+#    state: restarted
+#    enabled: yes
+#    daemon_reload: yes
diff --git a/roles/oam_cli_agent_mxn/templates/oam_cli_agent_mxn.service.j2 b/roles/oam_cli_agent_mxn/templates/oam_cli_agent_mxn.service.j2
new file mode 100644
index 0000000..3226171
--- /dev/null
+++ b/roles/oam_cli_agent_mxn/templates/oam_cli_agent_mxn.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=oam_cli_agent daemon
+
+[Service]
+Type=simple
+Environment=OAM_DIR=/opt/tsg/cli_agent/
+ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java -jar ${OAM_DIR}oam_cli_agent.jar --spring.config.location=${OAM_DIR}application.properties,${OAM_DIR}application-centos2.properties --logging.file=${OAM_DIR}oam-cli-agent.log
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Restart=always
+RestartSec=5s
+
diff --git a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm
index c018b05..ea3fe6f 100644
--- a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm
+++ b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
index cd16ea4..099f518 100644
--- a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
+++ b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_core/tasks/main.yml b/roles/oam_core/tasks/main.yml
index 8a78a61..35fbac5 100644
--- a/roles/oam_core/tasks/main.yml
+++ b/roles/oam_core/tasks/main.yml
@@ -15,3 +15,8 @@
     src: "{{role_path}}/templates/application-centos2.properties.j2"
     dest: /opt/tsg/oam_core/application-centos2.properties
   tags: template
+
+- name: "Templates oam_core.service"
+  template:
+    src: "{{ role_path }}/templates/oam_core.service.j2"
+    dest: /usr/lib/systemd/system/oam_core.service
diff --git a/roles/oam_core/templates/application-centos2.properties.j2 b/roles/oam_core/templates/application-centos2.properties.j2
index 955e084..2bdc958 100644
--- a/roles/oam_core/templates/application-centos2.properties.j2
+++ b/roles/oam_core/templates/application-centos2.properties.j2
@@ -24,17 +24,20 @@ ipmi.fru.mcn3=ipmitool -t 0x88 fru
 network.data=/opt/tsg/oam_core/shell/network.sh
 
 # 本机influx和mariadb地址
-oam.local.server.ip={{ mcn0_ip }}
+oam.local.server.mariadb.ip={{ mcn0_ip }}
+oam.local.server.influxdb.ip={{ mcn0_ip }}
 # 集群influx和mariadb地址
-oam.cluster.server.ip={{ influxdb.cluster_ip }}
+oam.cluster.server.mariadb.ip={{ mariadb.cluster_ip }}
+oam.cluster.server.influxdb.ip={{ influxdb.cluster_ip }}
+
 # influxdb端口
 oam.influx.port=58086
 
 # influxdb - cluster
-oam.writer.influxcluster.db=tsg_stat
+oam.writer.influxcluster.db={{ influxdb.dbname }}
 
 # datasource - local
-datasource.first.password=tsg2019
+datasource.first.password={{ influxdb.passwd }}
 
 # datasource - cluster
 datasource.second.username=root
diff --git a/roles/oam_core/templates/oam_core.service.j2 b/roles/oam_core/templates/oam_core.service.j2
new file mode 100644
index 0000000..a56d1ee
--- /dev/null
+++ b/roles/oam_core/templates/oam_core.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=oam_core daemon
+
+[Service]
+Type=simple
+Environment=OAM_DIR=/opt/tsg/oam_core/
+ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java -jar ${OAM_DIR}oam_core.jar --spring.config.location=${OAM_DIR}application.properties,${OAM_DIR}application-centos2.properties --logging.file=${OAM_DIR}oam-core.log
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Restart=always
+RestartSec=5s
+
diff --git a/roles/oam_core_start/tasks/main.yml b/roles/oam_core_start/tasks/main.yml
deleted file mode 100644
index 95900c8..0000000
--- a/roles/oam_core_start/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: "Start oam_core"
-  systemd:
-    name: oam_core
-    state: restarted
-    enabled: yes
diff --git a/roles/oam_env_initialize/tasks/main.yml b/roles/oam_env_initialize/tasks/main.yml
deleted file mode 100644
index 71ab87d..0000000
--- a/roles/oam_env_initialize/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "get remote tsg sn"
-  shell: cat /opt/tsg/etc/tsg_sn.json | grep sn | awk -F "\"" {'print $4'}
-  register: adc_tsg_sn
-
-- name: "Templates tsg_threshold.sql"
-  template:
-    src: "{{role_path}}/templates/tsg_threshold.sql.j2"
-    dest: /tmp/tsg-cli-deploy/tsg_threshold.sql
-  tags: template
-
-
-- name: "debug show tsg_sn"
-  debug: var=adc_tsg_sn.stdout
- 
-- name: "import the sql after template"
-  shell: mysql -s -h 127.0.0.1 -u {{ mariadb.username }} -p{{ mariadb.password }}  < /tmp/tsg-cli-deploy/tsg_threshold.sql
-\ No newline at end of file
diff --git a/roles/oam_mxn_start/tasks/main.yml b/roles/oam_mxn_start/tasks/main.yml
new file mode 100644
index 0000000..661d09b
--- /dev/null
+++ b/roles/oam_mxn_start/tasks/main.yml
@@ -0,0 +1,28 @@
+- name: "Start oam_cli_agent_mxn"
+  systemd:
+    name: oam_cli_agent_mxn
+    state: restarted
+    enabled: yes
+    daemon_reload: yes
+
+- name: "kill all snmp"
+  shell: ps axf | grep snmp |grep -v grep  |awk '{print $1}' | xargs kill
+
+- name: "Start snmpd"
+  shell: /usr/sbin/snmpd -C -c /usr/share/snmp/snmpd.conf
+
+- name: "Start oam_snmp"
+  systemd:
+    name: oam_snmp
+    state: restarted
+    enabled: yes
+    daemon_reload: yes
+
+- name: "Start oam_core"
+  systemd:
+    name: oam_core
+    state: restarted
+    enabled: yes
+    daemon_reload: yes
+
+
diff --git a/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm b/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm
index fdd7b50..37729a9 100644
--- a/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm
+++ b/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_snmp/tasks/main.yml b/roles/oam_snmp/tasks/main.yml
index 3dff0f7..523c4e4 100644
--- a/roles/oam_snmp/tasks/main.yml
+++ b/roles/oam_snmp/tasks/main.yml
@@ -15,24 +15,18 @@
     dest: /opt/tsg/snmp/application.properties
   tags: template
 
-- name: "Start oam_snmp"
-  systemd:
-    name: oam_snmp
-    state: restarted
-    enabled: yes
+- name: "Templates oam_snmp.service"
+  template:
+    src: "{{ role_path }}/templates/oam_snmp.service.j2"
+    dest: /usr/lib/systemd/system/oam_snmp.service
 
-- name: "bak snmpd.conf"
-  shell: cp -rf /etc/snmp/snmpd.conf /etc/snmp/snmpd.conf_origin
+- name: "mkdir /etc/snmp"
+  file:
+    path: /etc/snmp
+    state: directory
 
 - name: "Templates snmpd.conf"
   template:
     src: "{{role_path}}/templates/snmpd.conf"
     dest: /etc/snmp/snmpd.conf
   tags: template
-
-#- name: "Start snmpd"
-#  systemd:
-#    name: snmpd
-#    state: restarted
-#    enabled: yes
-#  ignore_errors: yes
-\ No newline at end of file
diff --git a/roles/oam_snmp/templates/application.properties.j2 b/roles/oam_snmp/templates/application.properties.j2
index 4a027d2..bd0c308 100644
--- a/roles/oam_snmp/templates/application.properties.j2
+++ b/roles/oam_snmp/templates/application.properties.j2
@@ -1,6 +1,5 @@
 oam.influx.url=http://{{ mcn0_ip }}:58086
-# oam.influx.url=http://192.168.161.134:8086
-oam.influx.db=tsg_stat
-oam.influx.user=admin
-oam.influx.password=tsg2019
+oam.influx.db={{ influxdb.dbname }}
+oam.influx.user={{ influxdb.userbname }}
+oam.influx.password={{ influxdb.passwd }}
 oam.influx.recentminutes=5
diff --git a/roles/oam_snmp/templates/oam_snmp.service.j2 b/roles/oam_snmp/templates/oam_snmp.service.j2
new file mode 100644
index 0000000..433db95
--- /dev/null
+++ b/roles/oam_snmp/templates/oam_snmp.service.j2
@@ -0,0 +1,14 @@
+[Unit]
+Description=oam_snmp daemon
+
+[Service]
+Type=simple
+Environment=OAM_DIR=/opt/tsg/snmp/
+ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java -jar -Doam.snmp.config=${OAM_DIR}application.properties ${OAM_DIR}oam_snmp.jar udp:0.0.0.0/50161
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Restart=always
+RestartSec=5s
diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml
index b71c7eb..973e80f 100644
--- a/roles/telegraf/tasks/main.yml
+++ b/roles/telegraf/tasks/main.yml
@@ -6,7 +6,7 @@
 - name: "install telegraf"
   yum:
     name:
-      - /tmp/telegraf-1.11.4-1.x86_64.rpm
+      - /tmp/telegraf-1.13.0-1.x86_64.rpm
     state: present
 
 - name: "Templates telegraf.conf"
diff --git a/roles/telegraf/templates/telegraf.conf.j2 b/roles/telegraf/templates/telegraf.conf.j2
index 7ae8973..137bca8 100644
--- a/roles/telegraf/templates/telegraf.conf.j2
+++ b/roles/telegraf/templates/telegraf.conf.j2
@@ -17,17 +17,17 @@
 
 [[outputs.influxdb]]
     urls = ["http://{{ influxdb.cluster_ip }}:58086"]
-    database = "tsg_stat"
+    database = "{{ influxdb.dbname }}"
     # HTTP Basic Auth
-    username = "admin"
-    password = "tsg2019"
+    username = "{{ influxdb.username }}"
+    password = "{{ influxdb.passwd }}"
 
 [[outputs.influxdb]]
     urls = ["http://192.168.100.1:58086"]
-    database = "tsg_stat"
+    database = "{{ influxdb.dbname }}"
     # HTTP Basic Auth
-    username = "admin"
-    password = "tsg2019"
+    username = "{{ influxdb.username }}"
+    password = "{{ influxdb.passwd }}"
 
 [[inputs.statsd]]
 	protocol = "udp4"
@@ -35,6 +35,6 @@
 	percentiles = [20,30,40,50,60,70,80,90,95,99]
 	percentile_limit = 100000000
 
-[[inputs.udp_listener]]
-ServiceAddress= ":58126"
-data_format = "influx
+#[[inputs.udp_listener]]
+#ServiceAddress= ":58126"
+#data_format = "influx
diff --git a/roles/tsg-cli-mxn/tasks/main.yml b/roles/tsg-cli-mxn/tasks/main.yml
index 4ab79ab..e9e95c9 100644
--- a/roles/tsg-cli-mxn/tasks/main.yml
+++ b/roles/tsg-cli-mxn/tasks/main.yml
@@ -47,7 +47,7 @@
   when: not use_chassis_hardware_sn | bool 
 
 - name: "copy tsg_sn.json to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../tsg-common-files/tsg_sn.json"
     dest: "/opt/tsg/etc/tsg_sn.json"
   when: use_chassis_hardware_sn | bool 
@@ -79,4 +79,4 @@
     name: tsg-monitor
     enabled: yes
     daemon_reload: yes
-    state: restarted   
-\ No newline at end of file
+    state: restarted   
diff --git a/test_host/group_vars/all.yml b/test_host/group_vars/all.yml
index 776b2c0..c628c8b 100644
--- a/test_host/group_vars/all.yml
+++ b/test_host/group_vars/all.yml
@@ -1,13 +1,27 @@
+grafana:
+    http_port: 53000
+
 influxdb:
-    cluster_ip: "172.16.124.133"
+    cluster_ip: "192.168.40.210"
+    dbname: tsg_stat
+    username: admin
+    passwd: tsg2019
+    meta_dir: /var/lib/influxdb/meta
+    data_dir: /var/lib/influxdb/data
+    wal_dir: /var/lib/influxdb/wal-dir
 
 consul:
     datacenter: consul-xxg
     dckey: "XwXLAbVN1C44dLUVJ6UL5A=="
-    cluster_ip: "172.16.124.133"
+    cluster_ip: "192.168.40.210"
     cluster_ethname: ens33
-    external_ethname: ens33
-    internal_ethname: ens33
+    external_ethname: enp2s0
+    internal_ethname: enp6s0
 
 mariadb:
+    username: root
     password: 111111
+    cluster_ip: "192.168.40.210"
+
+java_version: jdk1.8.0_73
+bifang_api_ip: "192.168.40.4"
diff --git a/test_host/group_vars/blade-00.yml b/test_host/group_vars/blade-00.yml
index 361762f..b4e5300 100644
--- a/test_host/group_vars/blade-00.yml
+++ b/test_host/group_vars/blade-00.yml
@@ -1,10 +1,3 @@
 influxdb:
     cluster_agent: "no"
-    cluster_ip: "172.16.124.133"
     mcn0_agent: "yes"
-    meta_dir: /var/lib/influxdb/meta
-    data_dir: /var/lib/influxdb/data
-    wal_dir: /var/lib/influxdb/wal-dir
-
-grafana:
-    http_port: 53000
diff --git a/test_host/group_vars/cluster_server.yml b/test_host/group_vars/cluster_server.yml
index 7d69281..d65b687 100644
--- a/test_host/group_vars/cluster_server.yml
+++ b/test_host/group_vars/cluster_server.yml
@@ -1,7 +1,4 @@
 influxdb:
     cluster_agent: "yes"
     mcn0_agent: "no"
-    meta_dir: /var/lib/influxdb/meta
-    data_dir: /var/lib/influxdb/data
-    wal_dir: /var/lib/influxdb/wal-dir
 
diff --git a/test_host/hosts b/test_host/hosts
index a0addea..a65cf5e 100644
--- a/test_host/hosts
+++ b/test_host/hosts
@@ -1,50 +1,17 @@
 [all:vars]
 ansible_user=root
-use_chassis_hardware_sn=true
+use_chassis_hardware_sn=false
 rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm
 
 [cluster_server]
-172.16.124.134
+192.168.40.210
 
 [blade-mxn]
-172.16.124.133
+192.168.40.170 SN=CBT2201925000003 mcn0_ip=192.168.40.166
 
-[blade-00]
-172.16.124.129 server_ip=172.16.124.133
+[blade-mcn0]
+192.168.40.166 server_ip=192.168.40.170
 
-[blade-01]
-172.16.124.130 server_ip=172.16.124.133
-
-[blade-02]
-172.16.124.131 server_ip=172.16.124.133
-
-[blade-03]
-172.16.124.132 server_ip=172.16.124.133
-
-[sled-mxn]
-172.16.124.133 SN=CBT2201925000003 mcn0_ip=172.16.124.129
-
-[sled-mcn0]
-172.16.124.129 SN=CBT2201925000003
-
-[sled-mcn1]
-172.16.124.130 SN=CBT2201925000003
-
-[sled-mcn2]
-172.16.124.131 SN=CBT2201925000003
-
-[sled-mcn3]
-172.16.124.132 SN=CBT2201925000003
-
-[Functional_Host:children]
-sled-mcn0
-sled-mcn1
-sled-mcn2
-sled-mcn3
-
-[tsg-all:children]
-sled-mxn
-sled-mcn0
-sled-mcn1
-sled-mcn2
-sled-mcn3
+[blade-mcn1]
+[blade-mcn2]
+[blade-mcn3]
diff --git a/uninstall_oam_for_40.170.yml b/uninstall_oam_for_40.170.yml
deleted file mode 100644
index a437d2a..0000000
--- a/uninstall_oam_for_40.170.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- hosts: tsg-all
-  tasks:
-    - name: "stop tsg-monitor service"
-      service:
-        name: tsg-monitor
-        state: stopped
-      ignore_errors: yes
-
-    - name: "stop oam_core service"
-      service:
-        name: oam_core
-        state: stopped
-      ignore_errors: yes
-
-    - name: "stop oam_snmp service"
-      service:
-        name: oam_snmp
-        state: stopped
-      ignore_errors: yes
-
-    - name: "stop oam_cli_agent_mxn service"
-      service:
-        name: oam_cli_agent_mxn
-        state: stopped
-      ignore_errors: yes
-
-    - name: "stop oam_cli_agent service"
-      service:
-        name: oam_cli_agent
-        state: stopped
-      ignore_errors: yes
-        
-    - name: "uninstall tsg-cli"
-      yum:
-        name: "tsg-cli"
-        state: absent         
-
-    - name: "uninstall oam_cli_agent"
-      yum:
-        name: "oam_cli_agent"
-        state: absent  
-
-    - name: "uninstall oam_core"
-      yum:
-        name: "oam_core"
-        state: absent  
-
-    - name: "uninstall oam_snmp"
-      yum:
-        name: "oam_snmp"
-        state: absent  
-
-    - name: "uninstall oam_cli"
-      yum:
-        name: "oam_cli"
-        state: absent  
-
-    - name: "uninstall oam_cli_agent_mxn"
-      yum:
-        name: "oam_cli_agent_mxn"
-        state: absent   
-        
-- hosts: sled-mcn0
-  gather_facts: no
-  roles:
-    - oam_env_cleanup
-        
-\ No newline at end of file
author	zhangzhihan <[email protected]>	2020-04-13 17:49:10 +0800
committer	zhangzhihan <[email protected]>	2020-04-13 17:49:10 +0800
commit	39a13763eb34433f68c04122c2cf8eb9f70aa268 (patch)
tree	9ebe929116de8774ea21796200808c42732c56ec
parent	b76d26750401cf63642f355cbc93fa09c75603bd (diff)