Merge pull request #605 from mgirgisf/mgirgis_vm_dashboard

Add ceilometer_power_state metric to vm dashboard

Author: openshift-merge-bot[bot]

pkg/dashboards/openstack-vm.go

@@ -59,15 +59,98 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"dashLength": 10,
 					"dashes": false,
 					"datasource": { "name": "` + dsName + `", "type": "prometheus" },
+					"fieldConfig": {
+						"defaults": {
+						  "mappings": [],
+						  "thresholds": {
+							"mode": "absolute",
+							"steps": [
+							  {
+								"color": "green",
+								"value": null
+							  },
+							  {
+								"color": "red",
+								"value": 80
+							  }
+							]
+						  }
+						},
+						"overrides": []
+					  },
 					"fill": 10,
 					"fillGradient": 0,
 					"gridPos": {
-						"h": 9,
+						"h": 12,
 						"w": 12,
 						"x": 0,
 						"y": 0
 					},
 					"hiddenSeries": false,
+					"id": 14,
+					"lines": true,
+					"linewidth": 1,
+					"nullPointMode": "null",
+					"options": {
+						"colorMode": "value",
+						"dataLinks": [],
+						"graphMode": "area",
+						"justifyMode": "auto",
+						"orientation": "auto",
+						"percentChangeColorMode": "standard",
+						"reduceOptions": {
+							"calcs": [
+							"lastNotNull"
+							],
+							"fields": "",
+							"values": false
+						},
+						"showPercentChange": false,
+						"textMode": "name",
+						"wideLayout": true
+					},
+					"percentage": false,
+					"pointradius": 2,
+					"points": false,
+					"renderer": "flot",
+					"seriesOverrides": [],
+					"spaceLength": 10,
+					"stack": false,
+					"steppedLine": false,
+					"targets": [
+						{
+							"expr": "label_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 7, \n  \"state\", \n  \"suspended\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 6, \n  \"state\", \n  \"crashed\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 5, \n  \"state\", \n  \"shut off\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 4, \n  \"state\", \n  \"shut down\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 3, \n  \"state\", \n  \"paused\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 2, \n  \"state\", \n  \"blocked\", \n  \"__name__\", \n  \".*\"\n)or \nlabel_replace(\n  ceilometer_power_state{resource_name=~\"$VM.*\"} == 1, \n  \"state\", \n  \"running\", \n  \"__name__\", \n  \".*\"\n)",
+							"instant": true,
+							"legendFormat": "$VM is {{state}}",
+							"range": false,
+							"refId": "A"
+						}
+						],
+					"thresholds": [],
+					"timeRegions": [],
+					"title": "Power State",
+					"type": "singlestat",
+					"tooltip": {
+						"shared": true,
+						"sort": 0,
+						"value_type": "individual"
+					}
+					},
+					{
+					"aliasColors": {},
+					"bars": false,
+					"dashLength": 10,
+					"dashes": false,
+					"datasource": { "name": "` + dsName + `", "type": "prometheus" },
+					"fill": 10,
+					"fillGradient": 0,
+					"gridPos": {
+						"h": 9,
+						"w": 12,
+						"x": 12,
+						"y": 0
+					},
+					"hiddenSeries": false,
 					"id": 2,
 					"legend": {
 						"avg": false,
@@ -152,10 +235,10 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"fill": 10,
 					"fillGradient": 0,
 					"gridPos": {
-						"h": 9,
+						"h": 8,
 						"w": 12,
-						"x": 12,
-						"y": 0
+						"x": 0,
+						"y": 5
 					},
 					"hiddenSeries": false,
 					"id": 4,
@@ -241,9 +324,9 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"fill": 10,
 					"fillGradient": 0,
 					"gridPos": {
-						"h": 8,
+						"h": 9,
 						"w": 12,
-						"x": 0,
+						"x": 12,
 						"y": 9
 					},
 					"hiddenSeries": false,
@@ -332,8 +415,8 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"gridPos": {
 						"h": 8,
 						"w": 12,
-						"x": 12,
-						"y": 9
+						"x": 0,
+						"y": 13
 					},
 					"hiddenSeries": false,
 					"id": 8,
@@ -427,8 +510,8 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"gridPos": {
 						"h": 8,
 						"w": 12,
-						"x": 0,
-						"y": 17
+						"x": 12,
+						"y": 18
 					},
 					"hiddenSeries": false,
 					"id": 10,
@@ -523,8 +606,8 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 					"gridPos": {
 						"h": 8,
 						"w": 12,
-						"x": 12,
-						"y": 17
+						"x": 0,
+						"y": 21
 					},
 					"hiddenSeries": false,
 					"id": 12,
@@ -620,7 +703,7 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 						"h": 8,
 						"w": 12,
 						"x": 12,
-						"y": 17
+						"y": 26
 					},
 					"hiddenSeries": false,
 					"id": 12,
@@ -771,7 +854,7 @@ func OpenstackVM(dsName string) *corev1.ConfigMap {
 						"datasource": { "name": "` + dsName + `", "type": "prometheus" },
 						"definition": "label_values(ceilometer_cpu{project =~ \"$project\"}, vm_instance)",
 						"hide": 0,
-						"includeAll": true,
+						"includeAll": false,
 						"index": -1,
 						"label": null,
 						"multi": true,