Merge pull request #8702 from pat2man/patch-1

Add prometheus port annotation for Grafana service

roles/openshift_grafana/tasks/install_grafana.yaml

@@ -61,6 +61,7 @@
     annotations:
       prometheus.io/scrape: "true"
       prometheus.io/scheme: https
+      prometheus.io/port: "{{ grafana_service_targetport }}"
       service.alpha.openshift.io/serving-cert-secret-name: grafana-tls
     ports:
     - name: grafana