Bug 2337 - Grafana dashboards do not work when NG-SA is enabled

Change-Id: I7f730e4ba40fb8c58d887fcb9c828b9f452247ed
Signed-off-by: Rahul Zamre <rzamre@indracompany.com>

diff --git a/osm_mon/dashboarder/templates/project_scoped.json b/osm_mon/dashboarder/templates/project_scoped.json
index 2f49164..49455e7 100644 (file)
--- a/osm_mon/dashboarder/templates/project_scoped.json
+++ b/osm_mon/dashboarder/templates/project_scoped.json
@@ -101,7 +101,7 @@
           "instant": true,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{vim_account_id}}",
+          "legendFormat": " {{vim_name}} / {{vim_account_id}}",
           "refId": "A"
         }
       ],
@@ -269,6 +269,11 @@
           "expr": "count(max(osm_vm_status{project_id=\"$project_id\"}) by (ns_name))",
           "instant": true,
           "refId": "A"
+        },
+        {
+          "expr": "count(max(vm_status_extended{project_id=\"$project_id\"}) by (ns_name))",
+          "instant": true,
+          "refId": "B"
         }
       ],
       "thresholds": "0.1,1000",
@@ -333,6 +338,15 @@
           "intervalFactor": 1,
           "legendFormat": "NS {{nsr_id}}",
           "refId": "A"
+        },
+        {
+          "expr": "count(vm_status_extended{project_id=\"$project_id\"}) by (ns_name)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "NS {{ns_name}}",
+          "refId": "B"
         }
       ],
       "timeFrom": null,
@@ -439,6 +453,15 @@
           "intervalFactor": 1,
           "legendFormat": "NS {{nsr_id}} - VNF {{vnf_member_index}} - VDU {{vdur_name}}",
           "refId": "A"
+        },
+        {
+          "expr": "min(vm_status_extended{project_id=\"$project_id\"}) by (ns_name)",
+          "format": "table",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "NS {{ns_name}} - VNF {{vnf_member_index}} - VDU {{vdu_name}}",
+          "refId": "B"
         }
       ],
       "timeFrom": null,
@@ -499,6 +522,15 @@
           "intervalFactor": 1,
           "legendFormat": "{{nsr_id}} - {{vdur_name}}",
           "refId": "A"
+        },
+        {
+          "expr": "vm_status_extended{project_id=\"$project_id\"}",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "{{nsr_id}} - {{vdu_name}}",
+          "refId": "B"
         }
       ],
       "thresholds": [],