Merge pull request #224 from zmc/wip-205

author pcuzner <pcuzner@redhat.com>

Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)

committer GitHub <noreply@github.com>

Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)
author pcuzner <pcuzner@redhat.com>
Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)
committer GitHub <noreply@github.com>
Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)
diff --cc dashboards/mgr-prometheus/alert-status.json
Simple merge
author	pcuzner <pcuzner@redhat.com>
	Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)
committer	GitHub <noreply@github.com>
	Tue, 28 Aug 2018 19:44:38 +0000 (07:44 +1200)