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

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

installers/helm/osm/values.yaml

@@ -417,7 +417,7 @@ prometheus:
             - name: osm_metric_rules
               rules:
               - record: vm_status_extended
-                expr: (last_over_time(vm_status[1m]) * on (vm_id, vim_id) group_left(ns_id, vnf_id, vdu_id, project_id, job, vdu_name, vnf_member_index) last_over_time(ns_topology[1m])) or (last_over_time(ns_topology[1m]) * -1)
+                expr: (last_over_time(vm_status[1m]) * on (vm_id, vim_id) group_left(ns_id, vnf_id, vdu_id, project_id, job, vdu_name, ns_name, vnf_member_index) last_over_time(ns_topology[1m])) or (last_over_time(ns_topology[1m]) * -1)
                 labels:
                   job: osm_prometheus
               - record: vnf_status