Rework Nova Top dashboards
- add possibility to switch between instance name/id
on Nova Top Instances
- decrease the default time frame from 1h to 30m
Change-Id: Id77d5b554442d34906fb3caa91895a64ab4db287
Related-PROD: PROD-33332
diff --git a/nova/files/grafana_dashboards/nova_top_instances_prometheus.json b/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
index 54e658a..89c5a99 100644
--- a/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
@@ -36,7 +36,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those request most CPU in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those request most CPU in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -73,11 +73,11 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,libvirt_domain_info_virtual_cpus{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
+ "expr": "topk($topx,libvirt_domain_info_virtual_cpus{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -127,7 +127,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those use most CPU in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those use most CPU in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -165,10 +165,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,libvirt_domain_info_cpu_time_seconds:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
+ "expr": "topk($topx,libvirt_domain_info_cpu_time_seconds:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -232,7 +232,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those request most RAM in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those request most RAM in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -269,10 +269,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,libvirt_domain_memory_actual_balloon_bytes{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
+ "expr": "topk($topx,libvirt_domain_memory_actual_balloon_bytes{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -322,7 +322,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those use most RAM in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those use most RAM in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -359,10 +359,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,libvirt_domain_memory_rss_bytes{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
+ "expr": "topk($topx,libvirt_domain_memory_rss_bytes{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"})",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -426,7 +426,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most read throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most read throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -464,10 +464,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -517,7 +517,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most write throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most write throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -554,10 +554,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -607,7 +607,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most read throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most read throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -644,10 +644,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -697,7 +697,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most write throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most write throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -734,10 +734,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -801,7 +801,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most read IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most read IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -839,10 +839,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -892,7 +892,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most write IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most write IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -929,10 +929,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -982,7 +982,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1019,10 +1019,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1072,7 +1072,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most write IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most write IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1109,10 +1109,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1176,7 +1176,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those request most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those request most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1213,10 +1213,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_capacity{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_capacity{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1266,7 +1266,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those use most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those use most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1303,10 +1303,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_physical{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_physical{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"file\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1356,7 +1356,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those request most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those request most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1393,10 +1393,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_capacity{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_capacity{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1446,7 +1446,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those use most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those use most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1483,10 +1483,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_block_stats_physical{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_block_stats_physical{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1550,7 +1550,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most network receiver bandwidth in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most network receiver bandwidth in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1587,10 +1587,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_interface_stats_receive_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"}) without(source_bridge,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_interface_stats_receive_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"}) without(source_bridge,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1640,7 +1640,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
- "description": "Shows Top N instances those consume most network transmitter bandwidth in the following format: Host / Tenant Name / User Name / Instance Name (Flavor Name)",
+ "description": "Shows Top N instances those consume most network transmitter bandwidth in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
"fill": 1,
"gridPos": {
"h": 7,
@@ -1677,10 +1677,10 @@
"steppedLine": false,
"targets": [
{
- "expr": "topk($topx,sum(libvirt_domain_interface_stats_transmit_bytes:rate5m{host=~\"$host\",instance_name=~\"$instance_name\",project_name=~\"$project_name\",user_name=~\"$user_name\"}) without(source_bridge,target_device))",
+ "expr": "topk($topx,sum(libvirt_domain_interface_stats_transmit_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\"}) without(source_bridge,target_device))",
"format": "time_series",
"intervalFactor": 1,
- "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{instance_name}} ({{flavor}})",
+ "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
"refId": "A"
}
],
@@ -1903,14 +1903,14 @@
]
},
"datasource": "prometheus",
- "definition": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\"},instance_name)",
+ "definition": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\"},$ident)",
"hide": 0,
"includeAll": true,
- "label": "Instance Name",
+ "label": "Instance Name/UUID",
"multi": true,
- "name": "instance_name",
+ "name": "instance_ident",
"options": [],
- "query": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\"},instance_name)",
+ "query": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\"},$ident)",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@@ -1920,11 +1920,39 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "allValue": null,
+ "current": {
+ "tags": [],
+ "text": "instance_name",
+ "value": "instance_name"
+ },
+ "hide": 0,
+ "includeAll": false,
+ "label": "Identifier",
+ "multi": false,
+ "name": "ident",
+ "options": [
+ {
+ "selected": true,
+ "text": "instance_name",
+ "value": "instance_name"
+ },
+ {
+ "selected": false,
+ "text": "instance_uuid",
+ "value": "instance_uuid"
+ }
+ ],
+ "query": "instance_name,instance_uuid",
+ "skipUrlSync": false,
+ "type": "custom"
}
]
},
"time": {
- "from": "now-1h",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {
diff --git a/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json b/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
index d1957d9..ed997a5 100644
--- a/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
@@ -1872,7 +1872,7 @@
]
},
"time": {
- "from": "now-1h",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {
diff --git a/nova/files/grafana_dashboards/nova_top_users_prometheus.json b/nova/files/grafana_dashboards/nova_top_users_prometheus.json
index ddb2764..f35d192 100644
--- a/nova/files/grafana_dashboards/nova_top_users_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_users_prometheus.json
@@ -1899,7 +1899,7 @@
]
},
"time": {
- "from": "now-1h",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {