summaryrefslogtreecommitdiffstats
path: root/conftest.py
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-29 03:25:44 -0800
committerGitHub <noreply@github.com>2018-01-29 03:25:44 -0800
commit2ec70a36f50f670887f2f257d348db6332de5d26 (patch)
tree4e9eebca6c1979b57275d0a60ac30cb6dfcb1457 /conftest.py
parent312692222f11c19df680867b4e497947e343d017 (diff)
parent3de29f6d5a3017b57c553c5e2fb63a50994df840 (diff)
downloadopenshift-2ec70a36f50f670887f2f257d348db6332de5d26.tar.gz
openshift-2ec70a36f50f670887f2f257d348db6332de5d26.tar.bz2
openshift-2ec70a36f50f670887f2f257d348db6332de5d26.tar.xz
openshift-2ec70a36f50f670887f2f257d348db6332de5d26.zip
Merge pull request #6811 from mjudeikis/prometheus-new-template
Automatic merge from submit-queue. Prometheus new template rebase Updating Prometheus for new templates/example. 1. New scraping rules, fixes 2. exposed alert manager 3. clean ansible 4. add a custom annotation for routes (in the example when AVI router in use we need to be able to add custom annotations) 5. Externalise some of the configs Still work in progress... FIY: @zgalor
Diffstat (limited to 'conftest.py')
0 files changed, 0 insertions, 0 deletions