diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index 9f0ccd9..a98981f 100644 --- a/install_config/group_vars/all.yml +++ b/install_config/group_vars/all.yml @@ -28,6 +28,9 @@ oam: snmptrapd_ip: "127.0.0.1" snmptrapd_port: 162 +tsg_cli: + rpm_file_name: "tsg-cli-1.0.17.19ebf72-1.el7.x86_64.rpm" + java_version: jdk1.8.0_73 bifang_api_ip: "10.3.60.7" bifang_api_port: 8080 diff --git a/install_config/hosts b/install_config/hosts index 51b918f..4018b7b 100644 --- a/install_config/hosts +++ b/install_config/hosts @@ -1,27 +1,21 @@ [all:vars] ansible_user=root use_chassis_hardware_sn=false -rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm [cluster_server] -10.3.60.8 influxdb_cluster=true +127.0.0.1 influxdb_cluster=true [blade-mxn] -10.3.72.1 SN=CBT2201925000001 mcn0_ip=10.3.73.1 -10.3.72.2 SN=CBT2201925000002 mcn0_ip=10.3.73.2 +192.168.40.25 SN=CBT2201925000002 tag_location=xinxigang [blade-mcn0] -10.3.73.1 SN=CBT2201925000001 server_ip=10.3.72.1 -10.3.73.2 SN=CBT2201925000002 server_ip=10.3.72.2 +192.168.40.21 SN=CBT2201925000002 tag_location=xinxigang [blade-mcn1] -10.3.74.1 SN=CBT2201925000001 server_ip=10.3.72.1 -10.3.74.2 SN=CBT2201925000002 server_ip=10.3.72.2 +192.168.40.22 SN=CBT2201925000002 tag_location=xinxigang [blade-mcn2] -10.3.75.1 SN=CBT2201925000001 server_ip=10.3.72.1 -10.3.75.2 SN=CBT2201925000002 server_ip=10.3.72.2 +192.168.40.23 SN=CBT2201925000002 tag_location=xinxigang [blade-mcn3] -10.3.76.1 SN=CBT2201925000001 server_ip=10.3.72.1 -10.3.76.2 SN=CBT2201925000002 server_ip=10.3.72.2 +192.168.40.24 SN=CBT2201925000002 tag_location=xinxigang 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 9b38da4..722524a 100644 Binary files a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm and b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm differ 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 2ac7ce6..fac65fa 100644 Binary files a/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm and b/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_cli_agent/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm b/roles/oam_cli_agent/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm index 716ac4a..077a073 100644 Binary files a/roles/oam_cli_agent/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm and b/roles/oam_cli_agent/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm differ 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 7fab8e2..683fb21 100644 Binary files a/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm and b/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm differ 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 ea3fe6f..8e3f525 100644 Binary files a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm and b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm differ 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 85bff26..0579887 100644 Binary files a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm and b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_core/templates/application.properties.j2 b/roles/oam_core/templates/application.properties.j2 index a7262b8..5e83eb8 100644 --- a/roles/oam_core/templates/application.properties.j2 +++ b/roles/oam_core/templates/application.properties.j2 @@ -85,12 +85,15 @@ spring.jpa.properties.hibernate.show_sql=true spring.jpa.properties.hibernate.format_sql=true spring.jpa.properties.hibernate.hbm2ddl.auto=update +#alarm stategy, 1:每次都生成一条新的告警; 2:如果有相同告警, 则更新, 如果没有则新生成一条. +oam.alarm.strategy=2 + # log logging.file=oam-rest.log # logging.level.root=ERROR # logging.level.com.cs.oam=ERROR logging.file.max-size=10MB -logging.file.max-history=10 +logging.file.max-history=7 # Absolute path oam.rest.oam_core=D:/IDEA/idea-project/oam/oam-rest/src/main/resources/application.properties 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 37729a9..e8471d7 100644 Binary files a/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm and b/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm differ diff --git a/roles/tsg-cli-mcn0/files/tsg-monitor.sh b/roles/tsg-cli-mcn0/files/tsg-monitor.sh index 8bc13c5..6176dcc 100644 --- a/roles/tsg-cli-mcn0/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn0/files/tsg-monitor.sh @@ -8,7 +8,7 @@ killall_uncompleted_cmd(){ #killall -9 tsg_cluster_register killall -9 -q tsg_diagnose_background - killall -9 -q tsg_update_tags + #killall -9 -q tsg_update_tags killall -9 -q tsg_monit_app killall -9 -q tsg_monit_intercept @@ -25,7 +25,7 @@ start_background_cmd(){ #后台并发运行, 保证所有命令的开始运行时间基本一样， #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环 /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null & - /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & + #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_app > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null & diff --git a/roles/tsg-cli-mcn0/tasks/main.yml b/roles/tsg-cli-mcn0/tasks/main.yml index 739e198..47c90b2 100644 --- a/roles/tsg-cli-mcn0/tasks/main.yml +++ b/roles/tsg-cli-mcn0/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "copy tsg-cli rmp to destination server" synchronize: - src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}" + src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}" dest: "/tmp/tsg-cli-deploy/" - name: "install tsg-cli" @@ -10,7 +10,7 @@ state: present vars: packages: - - /tmp/tsg-cli-deploy/{{ rpm_file_name }} + - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }} - name: Template the tsg_sn.json template: @@ -25,6 +25,17 @@ dest: "/opt/tsg/etc/tsg_sn.json" when: use_chassis_hardware_sn | bool +- name: Template the tsg_tags.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2" + dest: "/opt/tsg/etc/tsg_tags.json" + tags: template + +- name: Template the tsg_device_tag.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2" + dest: "/opt/tsg/etc/tsg_device_tag.json" + tags: template - name: "copy tsg-monitor.service to destination server" synchronize: diff --git a/roles/tsg-cli-mcn1/files/tsg-monitor.sh b/roles/tsg-cli-mcn1/files/tsg-monitor.sh index 72c2c83..f7b0fb1 100644 --- a/roles/tsg-cli-mcn1/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn1/files/tsg-monitor.sh @@ -8,7 +8,7 @@ killall_uncompleted_cmd(){ #killall -9 tsg_cluster_register killall -9 -q tsg_diagnose_background - killall -9 -q tsg_update_tags + #killall -9 -q tsg_update_tags killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept @@ -19,7 +19,7 @@ start_background_cmd(){ #后台并发运行, 保证所有命令的开始运行时间基本一样， #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环 /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null & - /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & + #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null & } diff --git a/roles/tsg-cli-mcn1/tasks/main.yml b/roles/tsg-cli-mcn1/tasks/main.yml index 40581ce..6e4796a 100644 --- a/roles/tsg-cli-mcn1/tasks/main.yml +++ b/roles/tsg-cli-mcn1/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "copy tsg-cli rmp to destination server" synchronize: - src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}" + src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}" dest: "/tmp/tsg-cli-deploy/" - name: "install tsg-cli" @@ -10,7 +10,7 @@ state: present vars: packages: - - /tmp/tsg-cli-deploy/{{ rpm_file_name }} + - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }} - name: Template the tsg_sn.json template: @@ -24,6 +24,18 @@ src: "{{ role_path }}/../tsg-common-files/tsg_sn.json" dest: "/opt/tsg/etc/tsg_sn.json" when: use_chassis_hardware_sn | bool + +- name: Template the tsg_tags.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2" + dest: "/opt/tsg/etc/tsg_tags.json" + tags: template + +- name: Template the tsg_device_tag.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2" + dest: "/opt/tsg/etc/tsg_device_tag.json" + tags: template - name: "copy tsg-monitor.service to destination server" synchronize: diff --git a/roles/tsg-cli-mcn2/files/tsg-monitor.sh b/roles/tsg-cli-mcn2/files/tsg-monitor.sh index 618f15a..a550147 100644 --- a/roles/tsg-cli-mcn2/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn2/files/tsg-monitor.sh @@ -8,7 +8,7 @@ killall_uncompleted_cmd(){ #killall -9 tsg_cluster_register killall -9 -q tsg_diagnose_background - killall -9 -q tsg_update_tags + #killall -9 -q tsg_update_tags killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept @@ -19,7 +19,7 @@ start_background_cmd(){ #后台并发运行, 保证所有命令的开始运行时间基本一样， #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环 /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null & - /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & + #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null & } diff --git a/roles/tsg-cli-mcn2/tasks/main.yml b/roles/tsg-cli-mcn2/tasks/main.yml index b4691f9..3841dc8 100644 --- a/roles/tsg-cli-mcn2/tasks/main.yml +++ b/roles/tsg-cli-mcn2/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "copy tsg-cli rmp to destination server" synchronize: - src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}" + src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}" dest: "/tmp/tsg-cli-deploy/" - name: "install tsg-cli" @@ -10,7 +10,7 @@ state: present vars: packages: - - /tmp/tsg-cli-deploy/{{ rpm_file_name }} + - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }} - name: Template the tsg_sn.json template: @@ -24,6 +24,18 @@ src: "{{ role_path }}/../tsg-common-files/tsg_sn.json" dest: "/opt/tsg/etc/tsg_sn.json" when: use_chassis_hardware_sn | bool + +- name: Template the tsg_tags.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2" + dest: "/opt/tsg/etc/tsg_tags.json" + tags: template + +- name: Template the tsg_device_tag.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2" + dest: "/opt/tsg/etc/tsg_device_tag.json" + tags: template - name: "copy tsg-monitor.service to destination server" synchronize: diff --git a/roles/tsg-cli-mcn3/files/tsg-monitor.sh b/roles/tsg-cli-mcn3/files/tsg-monitor.sh index e1a1917..a984a28 100644 --- a/roles/tsg-cli-mcn3/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn3/files/tsg-monitor.sh @@ -8,7 +8,7 @@ killall_uncompleted_cmd(){ #killall -9 -q tsg_cluster_register killall -9 -q tsg_diagnose_background - killall -9 -q tsg_update_tags + #killall -9 -q tsg_update_tags killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept @@ -19,7 +19,7 @@ start_background_cmd(){ #后台并发运行, 保证所有命令的开始运行时间基本一样， #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环 /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null & - /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & + #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null & /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null & } diff --git a/roles/tsg-cli-mcn3/tasks/main.yml b/roles/tsg-cli-mcn3/tasks/main.yml index a87e349..5a740f8 100644 --- a/roles/tsg-cli-mcn3/tasks/main.yml +++ b/roles/tsg-cli-mcn3/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "copy tsg-cli rmp to destination server" synchronize: - src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}" + src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}" dest: "/tmp/tsg-cli-deploy/" - name: "install tsg-cli" @@ -10,7 +10,7 @@ state: present vars: packages: - - /tmp/tsg-cli-deploy/{{ rpm_file_name }} + - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }} - name: Template the tsg_sn.json template: @@ -24,6 +24,18 @@ src: "{{ role_path }}/../tsg-common-files/tsg_sn.json" dest: "/opt/tsg/etc/tsg_sn.json" when: use_chassis_hardware_sn | bool + +- name: Template the tsg_tags.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2" + dest: "/opt/tsg/etc/tsg_tags.json" + tags: template + +- name: Template the tsg_device_tag.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2" + dest: "/opt/tsg/etc/tsg_device_tag.json" + tags: template - name: "copy tsg-monitor.service to destination server" synchronize: diff --git a/roles/tsg-cli-mxn/files/tsg-monitor.sh b/roles/tsg-cli-mxn/files/tsg-monitor.sh index 2e8e2c4..7aa8874 100644 --- a/roles/tsg-cli-mxn/files/tsg-monitor.sh +++ b/roles/tsg-cli-mxn/files/tsg-monitor.sh @@ -8,7 +8,7 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_cluster_register #killall -9 -q tsg_diagnose_background - killall -9 -q tsg_update_tags + #killall -9 -q tsg_update_tags rm -rf /tmp/_MEI* } @@ -21,7 +21,7 @@ start_background_cmd(){ #mxn板只检测cpu, mem, disk等, 前台cli命令启用diagnose, #后台服务依靠oam snmp模块, 无需运行tsg_diagnose_background #/opt/tsg/tsg-monitor/tsg_diagnose_background & - /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & + #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null & } #return value: current time in ms diff --git a/roles/tsg-cli-mxn/tasks/main.yml b/roles/tsg-cli-mxn/tasks/main.yml index e9e95c9..b031e9a 100644 --- a/roles/tsg-cli-mxn/tasks/main.yml +++ b/roles/tsg-cli-mxn/tasks/main.yml @@ -18,7 +18,7 @@ args: chdir: /tmp/tsg-cli-deploy/ when: use_chassis_hardware_sn | bool - + - name: "scp tsg_sn.json from destination server to local" fetch: src: "/tmp/tsg-cli-deploy/tsg_sn.json" @@ -28,7 +28,7 @@ - name: "copy tsg-cli rmp to destination server" synchronize: - src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}" + src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}" dest: "/tmp/tsg-cli-deploy/" - name: "install tsg-cli" @@ -37,7 +37,7 @@ state: present vars: packages: - - /tmp/tsg-cli-deploy/{{ rpm_file_name }} + - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }} - name: Template the tsg_sn.json template: @@ -51,6 +51,18 @@ src: "{{ role_path }}/../tsg-common-files/tsg_sn.json" dest: "/opt/tsg/etc/tsg_sn.json" when: use_chassis_hardware_sn | bool + +- name: Template the tsg_tags.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2" + dest: "/opt/tsg/etc/tsg_tags.json" + tags: template + +- name: Template the tsg_device_tag.json + template: + src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2" + dest: "/opt/tsg/etc/tsg_device_tag.json" + tags: template - name: "copy tsg-monitor.service to destination server" synchronize: diff --git a/roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm b/roles/tsg-common-files/tsg-cli-1.0.17.19ebf72-1.el7.x86_64.rpm similarity index 52% rename from roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm rename to roles/tsg-common-files/tsg-cli-1.0.17.19ebf72-1.el7.x86_64.rpm index 076098f..6ffa494 100644 Binary files a/roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm and b/roles/tsg-common-files/tsg-cli-1.0.17.19ebf72-1.el7.x86_64.rpm differ diff --git a/roles/tsg-common-files/tsg_device_tag.json.j2 b/roles/tsg-common-files/tsg_device_tag.json.j2 new file mode 100644 index 0000000..e467607 --- /dev/null +++ b/roles/tsg-common-files/tsg_device_tag.json.j2 @@ -0,0 +1,2 @@ +[MAAT] +ACCEPT_TAGS={"tags":[{"tag":"Location","value":"{{tag_location}}"}]} diff --git a/roles/tsg-common-files/tsg_tags.json.j2 b/roles/tsg-common-files/tsg_tags.json.j2 new file mode 100644 index 0000000..e48fdf3 --- /dev/null +++ b/roles/tsg-common-files/tsg_tags.json.j2 @@ -0,0 +1 @@ +{"tags":[{"tag":"Location","value":"{{tag_location}}"}]}