Merge pull request #43293 from pcuzner/granular-alerts

author Sebastian Wagner <sewagner@redhat.com>

Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)

committer GitHub <noreply@github.com>

Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)
author Sebastian Wagner <sewagner@redhat.com>
Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)
committer GitHub <noreply@github.com>
Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)
diff --cc src/pybind/mgr/prometheus/module.py
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
author	Sebastian Wagner <sewagner@redhat.com>
	Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)
committer	GitHub <noreply@github.com>
	Thu, 28 Oct 2021 22:23:24 +0000 (00:23 +0200)
		1	2
src/pybind/mgr/prometheus/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history