Reviewed: https://review.openstack.org/509791 Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=0475a84f0e92a7a5cf83377aee5517030c070dca Submitter: Zuul Branch: stable/pike
commit 0475a84f0e92a7a5cf83377aee5517030c070dca Author: Spyros Trigazis <email address hidden> Date: Tue Sep 26 09:17:17 2017 +0000
Fix prometheus scrape configuration
Make prometheus configuration compatible with 1.7.3 or greater. The new config matches the one in the pormetheus kubernetes example [1] minus the configuration for ingress that we don't deploy.
[1] https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml Closes-Bug: #1719187
Change-Id: Ied8b8d8fb610e5ecba18e37f98dd1a4c9bddbf30 (cherry picked from commit 4aade351b07e04791d6ac9aa6a1abc8bc3a8f98e)
Reviewed: https:/ /review. openstack. org/509791 /git.openstack. org/cgit/ openstack/ magnum/ commit/ ?id=0475a84f0e9 2a7a5cf83377aee 5517030c070dca
Committed: https:/
Submitter: Zuul
Branch: stable/pike
commit 0475a84f0e92a7a 5cf83377aee5517 030c070dca
Author: Spyros Trigazis <email address hidden>
Date: Tue Sep 26 09:17:17 2017 +0000
Fix prometheus scrape configuration
Make prometheus configuration compatible with 1.7.3 or greater.
The new config matches the one in the pormetheus kubernetes
example [1] minus the configuration for ingress that we don't
deploy.
[1] https:/ /github. com/prometheus/ prometheus/ blob/master/ documentation/ examples/ prometheus- kubernetes. yml
Closes-Bug: #1719187
Change-Id: Ied8b8d8fb610e5 ecba18e37f98dd1 a4c9bddbf30 91d6ac9aa6a1abc 8bc3a8f98e)
(cherry picked from commit 4aade351b07e047