田浩 79321b1df6 Merge branch 'version-2' into version-2		2017-11-10 23:03:23 +08:00
..
alert.rules	Merge branch 'version-2' into version-2	2017-11-10 23:03:23 +08:00
prometheus.yml	Merge branch 'version-2' into version-2	2017-11-10 23:03:23 +08:00