Authored by qinchao

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

... ... @@ -4,5 +4,5 @@ zabbix.jdbc.password=yoho@zabbix
zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq
zabbix_cpu_alarm=90.00
zabbix_mem_alarm=0.2
zabbix_net_alarm=300
zabbix_net_alarm=500
... ...
... ... @@ -4,4 +4,4 @@ zabbix.jdbc.password=yoho@zabbix
zabbix_type=gateway,order,product,promotion,resources,sns,users,uic,message,redis,twemproxy,memcached,rabbitmq
zabbix_cpu_alarm=90.00
zabbix_mem_alarm=0.2
zabbix_net_alarm=300
\ No newline at end of file
zabbix_net_alarm=500
\ No newline at end of file
... ...