diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-18 14:44:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 14:44:13 -0700 |
| commit | a8e02600fa0dc03aa85c4b103f2b79b963be19e4 (patch) | |
| tree | 4ecee069cb3e1d64aff7d4bf08aecbc6a76f3aba /roles/openshift_prometheus/tasks | |
| parent | e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704 (diff) | |
| parent | c4a98da82c697dd63c120ac8cd8e724eb2ccce20 (diff) | |
| download | openshift-a8e02600fa0dc03aa85c4b103f2b79b963be19e4.tar.gz openshift-a8e02600fa0dc03aa85c4b103f2b79b963be19e4.tar.bz2 openshift-a8e02600fa0dc03aa85c4b103f2b79b963be19e4.tar.xz openshift-a8e02600fa0dc03aa85c4b103f2b79b963be19e4.zip | |
Merge pull request #5439 from zgalor/prometheus-fixes
Automatic merge from submit-queue
Prometheus role fixes
- Use official prometheus-alert-buffer image
- Add prometheus annotations to service
Diffstat (limited to 'roles/openshift_prometheus/tasks')
| -rw-r--r-- | roles/openshift_prometheus/tasks/install_prometheus.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_prometheus/tasks/install_prometheus.yaml b/roles/openshift_prometheus/tasks/install_prometheus.yaml index 93bdda3e8..a9bce2fb1 100644 --- a/roles/openshift_prometheus/tasks/install_prometheus.yaml +++ b/roles/openshift_prometheus/tasks/install_prometheus.yaml @@ -107,7 +107,10 @@ - name: annotate prometheus service command: > {{ openshift.common.client_binary }} annotate --overwrite -n {{ openshift_prometheus_namespace }} - service prometheus 'service.alpha.openshift.io/serving-cert-secret-name=prometheus-tls' + service prometheus + prometheus.io/scrape='true' + prometheus.io/scheme=https + service.alpha.openshift.io/serving-cert-secret-name=prometheus-tls - name: annotate alerts service command: > |