Replace libvirt domain name by nova instance name
Change-Id: I1a5a69dcc30c380defd513db435d6f79d74e0af2
Related-PROD: PROD-33330
diff --git a/nova/files/grafana_dashboards/nova_instances_prometheus.json b/nova/files/grafana_dashboards/nova_instances_prometheus.json
index f98b327..4273df2 100644
--- a/nova/files/grafana_dashboards/nova_instances_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_instances_prometheus.json
@@ -599,14 +599,14 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(libvirt_domain_info_cpu_time_seconds_total{host=~\"$host\",domain=~\"$instance\"}[$rate_interval])",
+ "expr": "rate(libvirt_domain_info_cpu_time_seconds_total{host=~\"$host\",instance_name=~\"$instance\"}[$rate_interval])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "usage",
"refId": "C"
},
{
- "expr": "libvirt_domain_info_virtual_cpus{host=~\"$host\",domain=~\"$instance\"}",
+ "expr": "libvirt_domain_info_virtual_cpus{host=~\"$host\",instance_name=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "total",
@@ -701,7 +701,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "libvirt_domain_info_memory_usage_bytes{host=~\"$host\",domain=~\"$instance\"}",
+ "expr": "libvirt_domain_info_memory_usage_bytes{host=~\"$host\",instance_name=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "usage",
@@ -798,7 +798,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(libvirt_domain_block_stats_read_bytes_total{host=~\"$host\",domain=~\"$instance\"}[$rate_interval]))",
+ "expr": "sum(rate(libvirt_domain_block_stats_read_bytes_total{host=~\"$host\",instance_name=~\"$instance\"}[$rate_interval]))",
"format": "time_series",
"instant": false,
"intervalFactor": 2,
@@ -806,7 +806,7 @@
"refId": "A"
},
{
- "expr": "sum(rate(libvirt_domain_block_stats_write_bytes_total{host=~\"$host\",domain=~\"$instance\"}[$rate_interval]))",
+ "expr": "sum(rate(libvirt_domain_block_stats_write_bytes_total{host=~\"$host\",instance_name=~\"$instance\"}[$rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "write",
@@ -908,7 +908,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(libvirt_domain_interface_stats_receive_bytes_total{host=~\"$host\",domain=~\"$instance\"}[$rate_interval]))",
+ "expr": "sum(rate(libvirt_domain_interface_stats_receive_bytes_total{host=~\"$host\",instance_name=~\"$instance\"}[$rate_interval]))",
"format": "time_series",
"instant": false,
"intervalFactor": 2,
@@ -916,7 +916,7 @@
"refId": "A"
},
{
- "expr": "sum(rate(libvirt_domain_interface_stats_transmit_bytes_total{host=~\"$host\",domain=~\"$instance\"}[$rate_interval]))",
+ "expr": "sum(rate(libvirt_domain_interface_stats_transmit_bytes_total{host=~\"$host\",instance_name=~\"$instance\"}[$rate_interval]))",
"format": "time_series",
"instant": false,
"intervalFactor": 2,
@@ -1013,7 +1013,7 @@
"multi": true,
"name": "instance",
"options": [],
- "query": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\"},domain)",
+ "query": "label_values(libvirt_domain_info_virtual_cpus{host=~\"$host\"},instance_name)",
"refresh": 1,
"regex": "",
"sort": 1,