Skip to content

Commit 5701eb0

Browse files
committed
fix org/site alarms QL
1 parent 686a689 commit 5701eb0

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

angular/src/app/pages/api/manage/manage.component.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ export class ApiManageComponent implements OnInit {
9090
const sle_details_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>serviceLevels|wiredserviceLevels|wanServiceLevels|juniperGateway)\/page2\/(stats|timeline)\/[a-zA-Z-]+\/[a-zA-Z-]+\/(?<scope>site|device|client|juniperSwitch|juniperGateway)\/(?<scope_id>[a-f0-9-]*)\/(?<sle_name>[a-z-]*)\/(?<sle_sub_1>[a-zA-Z-]+)\/(?<sle_sub_2>[a-zA-Z-]+)(\/(?<period>[0-9a-z]*))?(\/(?<start>[0-9]*))?(\/(?<stop>[0-9]*))?\/(?<site_id>[a-f0-9-]*)/iys;
9191
const sle_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>serviceLevels|wiredserviceLevels|wanServiceLevels|juniperGateway|applicationServiceLevels)(\/(?<scope>org|site|device|client|juniperSwitch|juniperGateway))?(\/(?<scope_id>[a-f0-9-]*))?(\/(?<period>[0-9a-z-]*))?(\/(?<start>[0-9]*))?(\/(?<stop>[0-9]*))?\/(?<site_id>[a-f0-9-]*)(\?app=(?<app>[a-zA-Z]*))?/iys;
9292
const insights_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>insights|insights-full-stack)\/((?<obj>[a-z]+)\/)?((?<obj_id>[a-z0-9-]+)\/)?((?<period>[a-z0-9]+)\/)?((?<start>[0-9]*)\/)?((?<stop>[0-9]*)\/)?(?<site_id>[0-9a-f-]{36})?/iys;
93-
const alarm_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!alerts\/?(?<scope>org|site)?\/?(?<uuid>[0-9a-z-]*)\/?(?<period>[0-9a-z]*)?\/?(?<start>[0-9]*)?\/?(?<stop>[0-9]*)?\/?(?<show_ack>true|false)?\/?(?<group>[a-z%0-9]*)?\/?(?<show_crit>true|false)?\/?(?<show_warn>true|false)?\/?(?<show_info>true|false)?\/?(?<site_id>[0-9a-z-]*)?/iys;
93+
//const alarm_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!alerts\/?(?<scope>org|site)?\/?(?<uuid>[0-9a-z-]*)\/?(?<period>[0-9a-z]*)?\/?(?<start>[0-9]*)?\/?(?<stop>[0-9]*)?\/?(?<show_ack>true|false)?\/?(?<group>[a-z%0-9]*)?\/?(?<show_crit>true|false)?\/?(?<show_warn>true|false)?\/?(?<show_info>true|false)?\/?(?<site_id>[0-9a-z-]*)?/iys;
94+
const alarm_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!alerts\/?(?<site_id>[0-9a-z-]*)\??(?<query_param>.*)?$/iys;
9495
const events_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!marvis\/?(?<scope>org|site)?\/?(?<period>[0-9a-z]*)?\/?(?<start>[0-9]*)?\/?(?<stop>[0-9]*)?\/?(?<site_id>[0-9a-z-]*)?/iys;
9596
const floorplans_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!cliLocation\/(?<detail>view|config|validationPath|wayfinding)?\/?(?<uuid>[0-9a-f-]{36})\/?(floorplan|beaconsAndZones)?\/?(?<site_id>[0-9a-f-]{36})?/iys;
9697
const site_evpn_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!evpn\/site\/?([0-9]\/)?(?<site_id>[0-9a-z_-]*)?(\/(?<topology_id>[0-9a-f-]{36}))?/yis;
@@ -1181,7 +1182,7 @@ export class ApiManageComponent implements OnInit {
11811182
alarmUrl(res: RegExpExecArray): void {
11821183
this.org_id = res?.groups?.org_id;
11831184
let extra_params = "";
1184-
let severity_array: string[] = [];
1185+
let extra_params_array: string[] = [];
11851186
let scope = "";
11861187
let scope_id: string | undefined = undefined;
11871188
if (res?.groups?.uuid) {
@@ -1197,20 +1198,22 @@ export class ApiManageComponent implements OnInit {
11971198
scope_id = res?.groups?.org_id;
11981199
}
11991200

1200-
if (res?.groups?.start && res?.groups?.stop) {
1201-
extra_params = "start=" + res?.groups?.start + "&end=" + res?.groups?.stop;
1201+
if (res?.groups?.query_param) {
1202+
res?.groups?.query_param.split("&").forEach(param => {
1203+
let key = param.split("=")[0];
1204+
let value = param.split("=")[1];
1205+
switch (key.toLowerCase()){
1206+
case "start":
1207+
extra_params_array.push("start="+value);
1208+
break;
1209+
case "end":
1210+
extra_params_array.push("end="+value);
1211+
break;
1212+
}
1213+
})
12021214
}
1203-
if (res?.groups?.show_crit && res?.groups?.show_crit == "true") severity_array.push("critical");
1204-
if (res?.groups?.show_warn && res?.groups?.show_warn == "true") severity_array.push("warn");
1205-
if (res?.groups?.show_info && res?.groups?.show_info == "true") severity_array.push("info");
1206-
if (severity_array.length > 0) extra_params += "&severity=" + severity_array.join(",");
1207-
//else extra_params += "&severity=none"
1208-
1209-
if (res?.groups?.group && res?.groups?.group != "any%20type") extra_params += "&group=" + res?.groups?.group;
1210-
1211-
if (res?.groups?.show_ack && res?.groups?.show_ack == "false") extra_params += "&acked=false";
12121215

1213-
if (extra_params) extra_params = "?" + extra_params;
1216+
if (extra_params_array) extra_params = "?" + extra_params_array.join("&");
12141217
this.quick_links.push({
12151218
url: "https://api." + res?.groups?.host + "/api/v1/" + scope + "/" + scope_id + "/alarms/search" + extra_params,
12161219
name: scope + " Alarms"

0 commit comments

Comments
 (0)