Avoid Multiple series error
Change-Id: I3e027ba24a13f14db9eac1e538752194c12acc28
Related-PROD: PROD-17878
Related-PROD: PROD-21683
diff --git a/ceph/files/grafana_dashboards/ceph_cluster_prometheus.json b/ceph/files/grafana_dashboards/ceph_cluster_prometheus.json
index 4aee527..eb1fe5c 100644
--- a/ceph/files/grafana_dashboards/ceph_cluster_prometheus.json
+++ b/ceph/files/grafana_dashboards/ceph_cluster_prometheus.json
@@ -74,7 +74,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_overall_health",
+ "expr": "min(ceph_overall_health) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -251,7 +251,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_in_osds",
+ "expr": "min(ceph_osdmap_num_in_osds) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -331,7 +331,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_osds - ceph_osdmap_num_in_osds",
+ "expr": "min(ceph_osdmap_num_osds - ceph_osdmap_num_in_osds) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -411,7 +411,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_up_osds",
+ "expr": "min(ceph_osdmap_num_up_osds) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -491,7 +491,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_osds - ceph_osdmap_num_up_osds",
+ "expr": "min(ceph_osdmap_num_osds - ceph_osdmap_num_up_osds) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -573,7 +573,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_pgmap_num_pgs/ceph_osdmap_num_in_osds",
+ "expr": "min(ceph_pgmap_num_pgs/ceph_osdmap_num_in_osds) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -656,7 +656,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_pgmap_num_pgs",
+ "expr": "min(ceph_pgmap_num_pgs) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -749,7 +749,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "count(ceph_pool_usage_objects)",
+ "expr": "max(count(ceph_pool_usage_objects) by (instance))",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -830,7 +830,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_usage_total_bytes",
+ "expr": "min(ceph_usage_total_bytes) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -911,7 +911,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_usage_total_used_bytes",
+ "expr": "min(ceph_usage_total_used_bytes) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
@@ -992,7 +992,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_usage_total_avail_bytes/ceph_usage_total_bytes",
+ "expr": "min(ceph_usage_total_avail_bytes/ceph_usage_total_bytes) without (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
diff --git a/ceph/files/grafana_dashboards/ceph_osd_prometheus.json b/ceph/files/grafana_dashboards/ceph_osd_prometheus.json
index b26f6ee..13789df 100644
--- a/ceph/files/grafana_dashboards/ceph_osd_prometheus.json
+++ b/ceph/files/grafana_dashboards/ceph_osd_prometheus.json
@@ -84,7 +84,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_up_osds",
+ "expr": "min(ceph_osdmap_num_up_osds) without (instance)",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
@@ -186,7 +186,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_in_osds",
+ "expr": "min(ceph_osdmap_num_in_osds) without (instance)",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
@@ -278,7 +278,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "ceph_osdmap_num_osds",
+ "expr": "min(ceph_osdmap_num_osds) without (instance)",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,