CoreDNS metric + upgrade fixes

Sem-Ver: bugfix
Change-Id: Ic108be00f85a059bea5cc867c16007c0c36cac50
diff --git a/roles/coredns/tasks/main.yml b/roles/coredns/tasks/main.yml
index 51a94be..a3ca046 100644
--- a/roles/coredns/tasks/main.yml
+++ b/roles/coredns/tasks/main.yml
@@ -41,6 +41,9 @@
                 name: coredns
           values:
             replicaCount: 3
+            prometheus:
+              service:
+                enabled: true
             service:
               name: neutron-coredns
               clusterIP: 10.96.0.20
@@ -87,3 +90,30 @@
               component: coredns
             deployment:
               name: neutron-coredns
+
+      - apiVersion: monitoring.coreos.com/v1
+        kind: ServiceMonitor
+        metadata:
+          name: neutron-coredns
+          namespace: monitoring
+          labels:
+            release: kube-prometheus-stack
+        spec:
+          jobLabel: app.kubernetes.io/name
+          endpoints:
+            - port: "metrics"
+              path: "/metrics"
+              relabelings:
+                - sourceLabels: ["__meta_kubernetes_pod_label_application"]
+                  targetLabel: "application"
+                - sourceLabels: ["__meta_kubernetes_pod_name"]
+                  targetLabel: "instance"
+                - action: "labeldrop"
+                  regex: "^(container|endpoint|namespace|pod|service)$"
+          namespaceSelector:
+            matchNames:
+              - openstack
+          selector:
+            matchLabels:
+              app.kubernetes.io/name: coredns
+              app.kubernetes.io/component: metrics