Update ovnkube metrics for migration of master to controller. Update variables

Signed-off-by: Andrew Collins <ancollin@redhat.com>

Author: afcollins

assets/ovn-monitoring/queries.libsonnet

@@ -166,7 +166,7 @@ local generateTimeSeriesQuery(query, legend) = [
 
   synclatency: {
     query():
-      generateTimeSeriesQuery('rate(ovnkube_master_sync_service_latency_seconds_sum[2m])', '{{pod}} - Sync service latency'),
+      generateTimeSeriesQuery('rate(ovnkube_controller_sync_service_latency_seconds_sum[2m])', '{{pod}} - Sync service latency'),
   },
 
   ovnkubeNodeReadyLatency: {
@@ -176,21 +176,21 @@ local generateTimeSeriesQuery(query, legend) = [
 
   workQueue: {
     query():
-      generateTimeSeriesQuery('rate(ovnkube_master_workqueue_adds_total[2m])', '{{pod}} - Rate of handled adds'),
+      generateTimeSeriesQuery('rate(ovnkube_controller_workqueue_adds_total[2m])', '{{pod}} - Rate of handled adds'),
   },
 
   workQueueDepth: {
     query():
-      generateTimeSeriesQuery('ovnkube_master_workqueue_depth', '{{pod}} - Depth of workqueue'),
+      generateTimeSeriesQuery('ovnkube_controller_workqueue_depth', '{{pod}} - Depth of workqueue'),
   },
 
   workQueueLatency: {
     query():
-      generateTimeSeriesQuery('ovnkube_master_workqueue_longest_running_processor_seconds', '{{pod}} - Longest processor duration'),
+      generateTimeSeriesQuery('ovnkube_controller_workqueue_longest_running_processor_seconds', '{{pod}} - Longest processor duration'),
   },
 
   workQueueUnfinishedLatency: {
     query():
-      generateTimeSeriesQuery('ovnkube_master_workqueue_unfinished_work_seconds', '{{pod}} - Unfinished work duration'),
+      generateTimeSeriesQuery('ovnkube_controller_workqueue_unfinished_work_seconds', '{{pod}} - Unfinished work duration'),
   },
 }

assets/ovn-monitoring/variables.libsonnet

@@ -8,37 +8,37 @@ local var = g.dashboard.variable;
     + var.query.generalOptions.withLabel('Datasource')
     + var.query.selectionOptions.withMulti(false)
     + var.query.selectionOptions.withIncludeAll(false)
-    + var.query.withRefresh(1),
+    + var.query.refresh.onTime(),
 
   _master_node:
     var.query.new('_master_node', 'label_values(kube_node_role{role="master"}, node)')
-    + var.datasource.withRegex('')
+    + var.query.withDatasourceFromVariable(self.Datasource)
     + var.query.generalOptions.withLabel('Master')
     + var.query.selectionOptions.withMulti(true)
     + var.query.selectionOptions.withIncludeAll(false)
-    + var.query.withRefresh(2),
+    + var.query.refresh.onTime(),
 
   _worker_node:
     var.query.new('_worker_node', 'label_values(kube_node_role{role=~"work.*"}, node)')
-    + var.datasource.withRegex('')
+    + var.query.withDatasourceFromVariable(self.Datasource)
     + var.query.generalOptions.withLabel('Worker')
     + var.query.selectionOptions.withMulti(true)
     + var.query.selectionOptions.withIncludeAll(false)
-    + var.query.withRefresh(2),
+    + var.query.refresh.onTime(),
 
   master_pod:
     var.query.new('master_pod', 'label_values({pod=~"ovnkube-master.*", namespace=~"openshift-ovn-kubernetes"}, pod)')
-    + var.datasource.withRegex('')
+    + var.query.withDatasourceFromVariable(self.Datasource)
     + var.query.generalOptions.withLabel('OVNKube-Master')
     + var.query.selectionOptions.withMulti(true)
     + var.query.selectionOptions.withIncludeAll(false)
-    + var.query.withRefresh(1),
+    + var.query.refresh.onTime(),
 
   kubenode_pod:
     var.query.new('kubenode_pod', 'label_values({pod=~"ovnkube-node.*", namespace=~"openshift-ovn-kubernetes"}, pod)')
-    + var.datasource.withRegex('')
+    + var.query.withDatasourceFromVariable(self.Datasource)
     + var.query.generalOptions.withLabel('OVNKube-Node')
     + var.query.selectionOptions.withMulti(true)
     + var.query.selectionOptions.withIncludeAll(false)
-    + var.query.withRefresh(1),
+    + var.query.refresh.onTime(),
 }