Merge pull request #544 from openshift-cherrypick-robot/cherry-pick-5…

…33-to-18.0-fr1 [18.0-fr1] Instead of uuids, list out node hostnames in Kepler dashboard
openstack-k8s-operators · Nov 22, 2024 · d90034d · d90034d
2 parents 2ef48ec + 9b67156
commit d90034d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -667,11 +667,14 @@ func getNodeExporterTargets(nodes []ConnectionInfo) ([]metricstorage.LabeledTarg
 	return tls, nonTLS
 }
 
-func getKeplerTargets(nodes []ConnectionInfo) ([]string, []string) {
-	tls := []string{}
-	nonTLS := []string{}
+func getKeplerTargets(nodes []ConnectionInfo) ([]metricstorage.LabeledTarget, []metricstorage.LabeledTarget) {
+	tls := []metricstorage.LabeledTarget{}
+	nonTLS := []metricstorage.LabeledTarget{}
 	for _, node := range nodes {
-		target := fmt.Sprintf("%s:%d", node.IP, telemetryv1.DefaultKeplerPort)
+		target := metricstorage.LabeledTarget{
+			IP:   fmt.Sprintf("%s:%d", node.IP, telemetryv1.DefaultKeplerPort),
+			FQDN: node.FQDN,
+		}
 		if node.TLS {
 			tls = append(tls, target)
 		} else {

diff --git a/pkg/dashboards/openstack-kepler.go b/pkg/dashboards/openstack-kepler.go
@@ -102,11 +102,11 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"seriesOverrides": [],
 								"spaceLength": 10,
 								"span": 6,
-								"stack": true,
+								"stack": false,
 								"steppedLine": false,
 								"targets": [
 									{
-									"expr": "sum(rate(kepler_vm_platform_joules_total[1m])) by (vm_id,instance) + on(instance) group_left(exported_instance) (0*sum(kepler_node_platform_joules_total{exported_instance=\"$compute\"}) by (instance,exported_instance))",
+									"expr": "sum(rate(kepler_vm_platform_joules_total{fqdn=\"$compute\"}[1m])) by (vm_id,fqdn)",
 									"legendFormat": "{{ vm_id }}",
 									"refId": "A"
 									}
@@ -193,11 +193,11 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"seriesOverrides": [],
 								"spaceLength": 10,
 								"span": 6,
-								"stack": true,
+								"stack": false,
 								"steppedLine": false,
 								"targets": [
 								{
-									"expr": "sum by (vm_id, instance) (increase(kepler_vm_platform_joules_total[24h:1m])) * 0.000000277777777777778 + on(instance) group_left(exported_instance) (0*sum(kepler_node_platform_joules_total{exported_instance=\"$compute\"}) by (instance, exported_instance))",
+									"expr": "sum by (vm_id, fqdn) (increase(kepler_vm_platform_joules_total{fqdn=\"$compute\"}[24h:1m])) * 0.000000277777777777778",
 									"legendFormat": "{{ vm_id }}",
 									"refId": "A"
 								}
@@ -300,8 +300,8 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"steppedLine": false,
 								"targets": [
 									{
-									"expr": "sum by (exported_instance) (rate(kepler_node_platform_joules_total{exported_instance=\"$compute\"}[1m])) ",
-									"legendFormat": "{{ exported_instance }}",
+									"expr": "sum by (fqdn) (rate(kepler_node_platform_joules_total{fqdn=\"$compute\"}[1m]))",
+									"legendFormat": "{{ fqdn }}",
 									"refId": "A"
 									}
 								],
@@ -391,8 +391,8 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"steppedLine": false,
 								"targets": [
 								{
-									"expr": "sum by (exported_instance) (increase((kepler_node_platform_joules_total{exported_instance=\"$compute\"}[24h:1m]))) * 0.000000277777777777778",
-									"legendFormat": "{{ exported_instance }}",
+									"expr": "sum by (fqdn) (increase((kepler_node_platform_joules_total{fqdn=\"$compute\"}[24h:1m]))) * 0.000000277777777777778",
+									"legendFormat": "{{ fqdn }}",
 									"refId": "A"
 								}
 								],
@@ -491,7 +491,7 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"steppedLine": false,
 								"targets": [
 									{
-									"expr": "sum(rate(kepler_process_joules_total{vm_id=\"\",container_id=\"system_processes\",command=~\"virt.+|ovn.+|nova.+|ceil.+|neut.+|node.+|ovs.+|kepler|multi.+|haproxy|ceph.+|swift.+|chronyd\"}[1m])) by (command,instance) + on(instance) group_left(exported_instance) (0*sum(kepler_node_platform_joules_total{exported_instance=\"$compute\"}) by (instance, exported_instance))",
+									"expr": "sum(rate(kepler_process_joules_total{vm_id=\"\",container_id=\"system_processes\",command=~\"virt.+|ovn.+|nova.+|ceil.+|neut.+|node.+|ovs.+|kepler|multi.+|haproxy|ceph.+|swift.+|chronyd\", fqdn=\"$compute\"}[1m])) by (command,fqdn)",
 									"legendFormat": "{{ command }}",
 									"refId": "A"
 									}
@@ -588,11 +588,11 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 								"seriesOverrides": [],
 								"spaceLength": 10,
 								"span": 6,
-								"stack": true,
+								"stack": false,
 								"steppedLine": false,
 								"targets": [
 									{
-									"expr": "sum by (container_namespace,instance) (rate(kepler_container_joules_total{}[1m])) + on(instance) group_left(exported_instance) (0*sum(kepler_node_platform_joules_total{exported_instance=\"$compute\"}) by (instance, exported_instance))",
+									"expr": "sum by (container_namespace,fqdn) (rate(kepler_container_joules_total{fqdn=\"$compute\"}[1m]))",
 									"legendFormat": "{{ container_namespace }}",
 									"refId": "A"
 									}
@@ -655,10 +655,10 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 						"value": ""
 						},
 						"datasource": { "name": "` + dsName + `", "type": "prometheus" },
-						"definition": "label_values(kepler_node_platform_joules_total, exported_instance)",
+						"definition": "label_values(kepler_node_info, fqdn)",
 						"hide": 0,
 						"includeAll": false,
-						"label": "Compute",
+						"label": null,
 						"multi": false,
 						"name": "compute",
 						"options": [
@@ -668,7 +668,7 @@ func OpenstackKepler(dsName string) *corev1.ConfigMap {
 							"value": ""
 						}
 						],
-						"query": "label_values(kepler_node_platform_joules_total, exported_instance)",
+						"query": "label_values(kepler_node_info, fqdn)",
 						"refresh": 0,
 						"regex": "",
 						"skipUrlSync": false,

diff --git a/tests/kuttl/suites/metricstorage/tests/07-assert.yaml b/tests/kuttl/suites/metricstorage/tests/07-assert.yaml
@@ -22,7 +22,9 @@ spec:
   - action: labeldrop
     regex: publisher
   staticConfigs:
-  - targets:
+  - labels:
+      fqdn: edpm-compute-0.ctlplane.example.com
+    targets:
     - 192.168.122.100:8888
 ---
 apiVersion: v1