Skip to content

Commit 25cdb44

Browse files
author
Rohit Yadav
authored
Merge pull request #21 from shapeblue/metrics-view-context-based-filtering
APPLE-309: Use context to filter items in a metrics view
2 parents 0841471 + a5d6b55 commit 25cdb44

File tree

1 file changed

+60
-0
lines changed

1 file changed

+60
-0
lines changed

ui/scripts/metrics.js

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,19 @@
358358
dataProvider: function(args) {
359359
var data = {};
360360
listViewDataProvider(args, data);
361+
362+
if ("zones" in args.context && args.context.zones[0]) {
363+
data['zoneid'] = args.context.zones[0].id;
364+
}
365+
366+
if ("pods" in args.context && args.context.pods[0]) {
367+
data['podid'] = args.context.pods[0].id;
368+
}
369+
361370
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
362371
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
363372
}
373+
364374
$.ajax({
365375
url: createURL('listClusters'),
366376
data: data,
@@ -636,9 +646,29 @@
636646
var data = {};
637647
data.type = 'routing';
638648
listViewDataProvider(args, data);
649+
650+
if (!args.context.instances) {
651+
if ("zones" in args.context && args.context.zones[0]) {
652+
data['zoneid'] = args.context.zones[0].id;
653+
}
654+
655+
if ("pods" in args.context && args.context.pods[0]) {
656+
data['podid'] = args.context.pods[0].id;
657+
}
658+
659+
if ("clusters" in args.context && args.context.clusters[0]) {
660+
data['clusterid'] = args.context.clusters[0].id;
661+
}
662+
} else {
663+
if (args.context.instances[0]) {
664+
data['id'] = args.context.instances[0].hostid;
665+
}
666+
}
667+
639668
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
640669
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
641670
}
671+
642672
$.ajax({
643673
url: createURL('listHosts'),
644674
data: data,
@@ -859,9 +889,15 @@
859889
dataProvider: function(args) {
860890
var data = {};
861891
listViewDataProvider(args, data);
892+
893+
if ("hosts" in args.context && args.context.hosts[0]) {
894+
data['hostid'] = args.context.hosts[0].id;
895+
}
896+
862897
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
863898
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
864899
}
900+
865901
$.ajax({
866902
url: createURL('listVirtualMachines'),
867903
data: data,
@@ -958,9 +994,19 @@
958994
dataProvider: function(args) {
959995
var data = {listAll: true};
960996
listViewDataProvider(args, data);
997+
998+
if ("instances" in args.context && args.context.instances[0]) {
999+
data['virtualmachineid'] = args.context.instances[0].id;
1000+
}
1001+
1002+
if ("primarystorages" in args.context && args.context.primarystorages[0]) {
1003+
data['storageid'] = args.context.primarystorages[0].id;
1004+
}
1005+
9611006
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
9621007
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
9631008
}
1009+
9641010
$.ajax({
9651011
url: createURL('listVolumes'),
9661012
data: data,
@@ -1060,9 +1106,23 @@
10601106
dataProvider: function(args) {
10611107
var data = {};
10621108
listViewDataProvider(args, data);
1109+
1110+
if ("zones" in args.context && args.context.zones[0]) {
1111+
data['zoneid'] = args.context.zones[0].id;
1112+
}
1113+
1114+
if ("pods" in args.context && args.context.pods[0]) {
1115+
data['podid'] = args.context.pods[0].id;
1116+
}
1117+
1118+
if ("clusters" in args.context && args.context.clusters[0]) {
1119+
data['clusterid'] = args.context.clusters[0].id;
1120+
}
1121+
10631122
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
10641123
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
10651124
}
1125+
10661126
$.ajax({
10671127
url: createURL('listStoragePools'),
10681128
data: data,

0 commit comments

Comments
 (0)