Prometheus role fixes

- Use official prometheus-alert-buffer image
- Add prometheus annotations to service

roles/openshift_prometheus/defaults/main.yaml

@@ -11,7 +11,7 @@ openshift_prometheus_node_selector: {"region":"infra"}
 openshift_prometheus_image_proxy: "openshift/oauth-proxy:v1.0.0"
 openshift_prometheus_image_prometheus: "openshift/prometheus:v2.0.0-dev"
 openshift_prometheus_image_alertmanager: "openshift/prometheus-alertmanager:dev"
-openshift_prometheus_image_alertbuffer: "ilackarms/message-buffer"
+openshift_prometheus_image_alertbuffer: "openshift/prometheus-alert-buffer:v0.0.1"
 
 # additional prometheus rules file
 openshift_prometheus_additional_rules_file: null

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: >