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.
 rsyslog_server: 172.31.9.252
 
 # ops influxdb server
-ops_influxdb_server: 10.66.4.25
+ops_influxdb_server: 172.31.70.9
 
 # platform
 platform_zk_gray: 172.31.70.42
@@ -50,6 +50,8 @@ platform_zk_pro: 172.31.70.42
 platform_redis: 172.31.70.42
 platform_gray: 172.31.70.42
 
+# zabbix
+zabbix_server: 172.31.9.161
 
 #rabbit
 rabbit:

@@ -49,6 +49,9 @@ platform_zk_pro: 10.66.50.140
 platform_redis: 10.66.50.132
 platform_gray: 10.66.50.107
 
+# zabbix
+zabbix_server: 10.66.0.191
+
 #rabbit
 rabbit:
     common_local: 10.66.4.112

@@ -26,10 +26,10 @@ influxdb                                          IN    A         {{ ops_influxd
 influxdb-event                                    IN    A         {{ ops_influxdb_server }}
 influxdb-order                                    IN    A         {{ ops_influxdb_server }}
 monitor.redis                                     IN    A         {{ ops_influxdb_server }}
-zabbix.master                                     IN	A         10.66.0.191
+zabbix.master                                     IN	A         {{ zabbix_server }}
 rsyslog                                           IN	A         {{ rsyslog_server }}
 config.server                                     IN	A         10.66.80.2
-zabbix                                            IN	A         10.66.0.191
+zabbix                                            IN	A         {{ zabbix_server }}
 kafkacluster                                      IN	A         10.66.80.4
 kafkacluster                                      IN	A         10.66.80.17
 kafkacluster                                      IN	A         10.66.80.14