Authored by chunhua.zhang

Merge branch 'tiexin.yang' into 'master'

启用AWS区zabbix server、influxdb

## AWS区新建zabbix server:172.31.9.161

## AWS区新建influxdb server :  172.31.70.9 版本(1.7.2)

See merge request !9
@@ -42,7 +42,7 @@ search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn. @@ -42,7 +42,7 @@ search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn.
42 rsyslog_server: 172.31.9.252 42 rsyslog_server: 172.31.9.252
43 43
44 # ops influxdb server 44 # ops influxdb server
45 -ops_influxdb_server: 10.66.4.25 45 +ops_influxdb_server: 172.31.70.9
46 46
47 # platform 47 # platform
48 platform_zk_gray: 172.31.70.42 48 platform_zk_gray: 172.31.70.42
@@ -50,6 +50,8 @@ platform_zk_pro: 172.31.70.42 @@ -50,6 +50,8 @@ platform_zk_pro: 172.31.70.42
50 platform_redis: 172.31.70.42 50 platform_redis: 172.31.70.42
51 platform_gray: 172.31.70.42 51 platform_gray: 172.31.70.42
52 52
  53 +# zabbix
  54 +zabbix_server: 172.31.9.161
53 55
54 #rabbit 56 #rabbit
55 rabbit: 57 rabbit:
@@ -49,6 +49,9 @@ platform_zk_pro: 10.66.50.140 @@ -49,6 +49,9 @@ platform_zk_pro: 10.66.50.140
49 platform_redis: 10.66.50.132 49 platform_redis: 10.66.50.132
50 platform_gray: 10.66.50.107 50 platform_gray: 10.66.50.107
51 51
  52 +# zabbix
  53 +zabbix_server: 10.66.0.191
  54 +
52 #rabbit 55 #rabbit
53 rabbit: 56 rabbit:
54 common_local: 10.66.4.112 57 common_local: 10.66.4.112
@@ -26,10 +26,10 @@ influxdb IN A {{ ops_influxd @@ -26,10 +26,10 @@ influxdb IN A {{ ops_influxd
26 influxdb-event IN A {{ ops_influxdb_server }} 26 influxdb-event IN A {{ ops_influxdb_server }}
27 influxdb-order IN A {{ ops_influxdb_server }} 27 influxdb-order IN A {{ ops_influxdb_server }}
28 monitor.redis IN A {{ ops_influxdb_server }} 28 monitor.redis IN A {{ ops_influxdb_server }}
29 -zabbix.master IN A 10.66.0.191 29 +zabbix.master IN A {{ zabbix_server }}
30 rsyslog IN A {{ rsyslog_server }} 30 rsyslog IN A {{ rsyslog_server }}
31 config.server IN A 10.66.80.2 31 config.server IN A 10.66.80.2
32 -zabbix IN A 10.66.0.191 32 +zabbix IN A {{ zabbix_server }}
33 kafkacluster IN A 10.66.80.4 33 kafkacluster IN A 10.66.80.4
34 kafkacluster IN A 10.66.80.17 34 kafkacluster IN A 10.66.80.17
35 kafkacluster IN A 10.66.80.14 35 kafkacluster IN A 10.66.80.14