OVN: Fix control plane metrics alert job name

Following the change in PR openshift#581 the job name should be renamed to "ovnkube-master-metrics". Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
tssurya · Aug 4, 2020 · a9ea052 · a9ea052
1 parent 13a7db3
commit a9ea052
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/bindata/network/ovn-kubernetes/alert-rules-control-plane.yaml b/bindata/network/ovn-kubernetes/alert-rules-control-plane.yaml
@@ -15,9 +15,9 @@ spec:
     - alert: NoRunningOvnMaster
       annotations:
         message: |
-          there is no running ovn-kubernetes master
+          There is no running ovn-kubernetes master
       expr: |
-        absent(up{job="ovnkube-master",namespace="openshift-ovn-kubernetes"} ==1)
+        absent(up{job="ovnkube-master-metrics", namespace="openshift-ovn-kubernetes"} == 1)
       for: 10m
       labels:
         severity: warning

diff --git a/bindata/network/ovn-kubernetes/monitor.yaml b/bindata/network/ovn-kubernetes/monitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app: ovnkube-master-metrics
+    metrics: ovnkube-master-metrics
   annotations:
     networkoperator.openshift.io/ignore-errors: ""
   name: monitor-ovn-master-metrics
@@ -17,26 +17,26 @@ spec:
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
       serverName: ovn-kubernetes-master-metrics.openshift-ovn-kubernetes.svc
-  jobLabel: app
+  jobLabel: metrics
   namespaceSelector:
     matchNames:
     - openshift-ovn-kubernetes
   selector:
     matchLabels:
-      app: ovnkube-master-metrics
+      metrics: ovnkube-master-metrics
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: ovnkube-master-metrics
+    metrics: ovnkube-master-metrics
   name: ovn-kubernetes-master-metrics
   namespace: openshift-ovn-kubernetes
   annotations:
     service.beta.openshift.io/serving-cert-secret-name: ovn-master-metrics-cert
 spec:
   selector:
-    app: ovnkube-master-metrics
+    metrics: ovnkube-master-metrics
   clusterIP: None
   publishNotReadyAddresses: true
   ports:

diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -27,6 +27,7 @@ spec:
   selector:
     matchLabels:
       app: ovnkube-master
+      metrics: ovnkube-master-metrics
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -38,6 +39,7 @@ spec:
     metadata:
       labels:
         app: ovnkube-master
+        metrics: ovnkube-master-metrics
         component: network
         type: infra
         openshift.io/component: network
@@ -619,13 +621,13 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: ovnkube-master-metrics
+      metrics: ovnkube-master-metrics
   strategy:
     type: RollingUpdate
   template:
     metadata:
       labels:
-        app: ovnkube-master-metrics
+        metrics: ovnkube-master-metrics
         component: network
         type: infra
         openshift.io/component: network