Authored by qinchao

Merge branch 'master' of http://git.yoho.cn/ops/monitor-service

@@ -4,5 +4,5 @@ zabbix.jdbc.password=yoho@zabbix @@ -4,5 +4,5 @@ zabbix.jdbc.password=yoho@zabbix
4 zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq 4 zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq
5 zabbix_cpu_alarm=90.00 5 zabbix_cpu_alarm=90.00
6 zabbix_mem_alarm=0.2 6 zabbix_mem_alarm=0.2
7 -zabbix_net_alarm=300 7 +zabbix_net_alarm=500
8 8
@@ -4,4 +4,4 @@ zabbix.jdbc.password=yoho@zabbix @@ -4,4 +4,4 @@ zabbix.jdbc.password=yoho@zabbix
4 zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq 4 zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq
5 zabbix_cpu_alarm=90.00 5 zabbix_cpu_alarm=90.00
6 zabbix_mem_alarm=0.2 6 zabbix_mem_alarm=0.2
7 -zabbix_net_alarm=300  
  7 +zabbix_net_alarm=500