You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by mm...@apache.org on 2018/07/11 01:32:42 UTC
[26/50] [abbrv] metron git commit: METRON-1613 Metaalerts status
update broken in Alerts UI (merrimanr) closes apache/metron#1059
METRON-1613 Metaalerts status update broken in Alerts UI (merrimanr) closes apache/metron#1059
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/10271c41
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/10271c41
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/10271c41
Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: 10271c41b1df2815041317a36f7b65def5dab831
Parents: 0e48427
Author: merrimanr <me...@gmail.com>
Authored: Fri Jun 15 08:17:37 2018 -0500
Committer: merrimanr <me...@gmail.com>
Committed: Fri Jun 15 08:17:37 2018 -0500
----------------------------------------------------------------------
.../src/app/alerts/alert-details/alert-details.component.ts | 5 ++---
.../src/app/alerts/alerts-list/alerts-list.component.ts | 5 ++---
.../alerts/alerts-list/table-view/table-view.component.html | 2 +-
.../alerts/alerts-list/table-view/table-view.component.ts | 8 +++-----
.../metron-alerts/src/app/service/update.service.ts | 4 ----
metron-interface/metron-alerts/src/app/utils/constants.ts | 1 -
6 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts b/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
index 2625502..ffd7dd0 100644
--- a/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
+++ b/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
@@ -29,7 +29,7 @@ import {Patch} from '../../model/patch';
import {AlertComment} from './alert-comment';
import {AuthenticationService} from '../../service/authentication.service';
import {MetronDialogBox} from '../../shared/metron-dialog-box';
-import {META_ALERTS_INDEX, META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
+import {META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
import {CommentAddRemoveRequest} from "../../model/comment-add-remove-request";
export enum AlertState {
@@ -127,7 +127,7 @@ export class AlertDetailsComponent implements OnInit {
this.alertId = params['guid'];
this.alertSourceType = params['source.type.field'];
this.alertIndex = params['index'];
- this.isMetaAlert = (this.alertIndex === META_ALERTS_INDEX && this.alertSourceType !== META_ALERTS_SENSOR_TYPE) ? true : false;
+ this.isMetaAlert = this.alertSourceType === META_ALERTS_SENSOR_TYPE;
this.getData();
});
};
@@ -195,7 +195,6 @@ export class AlertDetailsComponent implements OnInit {
let patchRequest = new PatchRequest();
patchRequest.guid = this.alertId;
patchRequest.sensorType = 'metaalert';
- patchRequest.index = META_ALERTS_INDEX;
patchRequest.patch = [new Patch('add', '/name', this.alertName)];
this.updateService.patch(patchRequest).subscribe(rep => {
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts b/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
index a70f2b4..98459db 100644
--- a/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
+++ b/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
@@ -39,7 +39,7 @@ import {Filter} from '../../model/filter';
import {THREAT_SCORE_FIELD_NAME, TIMESTAMP_FIELD_NAME, ALL_TIME} from '../../utils/constants';
import {TableViewComponent} from './table-view/table-view.component';
import {Pagination} from '../../model/pagination';
-import {META_ALERTS_SENSOR_TYPE, META_ALERTS_INDEX} from '../../utils/constants';
+import {META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
import {MetaAlertService} from '../../service/meta-alert.service';
import {Facets} from '../../model/facets';
import { GlobalConfigService } from '../../service/global-config.service';
@@ -396,8 +396,7 @@ export class AlertsListComponent implements OnInit, OnDestroy {
this.selectedAlerts = [];
this.selectedAlerts = [alert];
this.saveRefreshState();
- let sourceType = (alert.index === META_ALERTS_INDEX && !alert.source[this.globalConfig['source.type.field']])
- ? META_ALERTS_SENSOR_TYPE : alert.source[this.globalConfig['source.type.field']];
+ let sourceType = alert.source[this.globalConfig['source.type.field']];
let url = '/alerts-list(dialog:details/' + sourceType + '/' + alert.source.guid + '/' + alert.index + ')';
this.router.navigateByUrl(url);
}
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
index 78410af..a41d37f 100644
--- a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
+++ b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
@@ -69,7 +69,7 @@
{{ alert.source['alert_status'] ?alert.source['alert_status'] : 'New' | centerEllipses:20:cell }}
</a>
</td>
- <td width="20" class="icon-cell" (click)="deleteMetaAlert($event, alert, alertIndex)">
+ <td width="20" class="icon-cell" (click)="deleteMetaAlert($event, alert)">
<i class="fa fa-chain-broken" aria-hidden="true"></i>
</td>
<td width="20" class="icon-cell">
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
index 411baab..97613de 100644
--- a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
+++ b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
@@ -33,7 +33,6 @@ import {AlertSource} from '../../../model/alert-source';
import {PatchRequest} from '../../../model/patch-request';
import {Patch} from '../../../model/patch';
import {UpdateService} from '../../../service/update.service';
-import {META_ALERTS_INDEX} from '../../../utils/constants';
import {MetaAlertService} from '../../../service/meta-alert.service';
import {MetaAlertAddRemoveRequest} from '../../../model/meta-alert-add-remove-request';
import {GetRequest} from '../../../model/get-request';
@@ -226,7 +225,6 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy {
showMetaAlertDetails($event, alertSource: AlertSource) {
let alert = new Alert();
alert.source = alertSource;
- alert.index = META_ALERTS_INDEX;
this.showDetails($event, alert);
}
@@ -260,10 +258,10 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy {
$event.stopPropagation();
}
- deleteMetaAlert($event, alert: Alert, index: number) {
+ deleteMetaAlert($event, alert: Alert) {
this.metronDialogBox.showConfirmationMessage('Do you wish to remove all the alerts from meta alert?').subscribe(response => {
if (response) {
- this.doDeleteMetaAlert(alert, index);
+ this.doDeleteMetaAlert(alert);
}
});
$event.stopPropagation();
@@ -279,7 +277,7 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy {
});
}
- doDeleteMetaAlert(alert: Alert, index: number) {
+ doDeleteMetaAlert(alert: Alert) {
this.metaAlertService.updateMetaAlertStatus(alert.source.guid, 'inactive').subscribe(() => {
});
}
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/service/update.service.ts
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/service/update.service.ts b/metron-interface/metron-alerts/src/app/service/update.service.ts
index 42a4944..3a18fc2 100644
--- a/metron-interface/metron-alerts/src/app/service/update.service.ts
+++ b/metron-interface/metron-alerts/src/app/service/update.service.ts
@@ -29,7 +29,6 @@ import {Http} from '@angular/http';
import {PatchRequest} from '../model/patch-request';
import {Utils} from '../utils/utils';
import {Patch} from '../model/patch';
-import {META_ALERTS_INDEX, META_ALERTS_SENSOR_TYPE} from '../utils/constants';
import { GlobalConfigService } from './global-config.service';
import {CommentAddRemoveRequest} from "../model/comment-add-remove-request";
@@ -92,9 +91,6 @@ export class UpdateService {
patchRequest.guid = alert.source.guid;
patchRequest.sensorType = Utils.getAlertSensorType(alert, this.sourceType);
patchRequest.patch = [new Patch('add', '/alert_status', state)];
- if (patchRequest.sensorType === META_ALERTS_SENSOR_TYPE) {
- patchRequest.index = META_ALERTS_INDEX;
- }
return patchRequest;
});
let patchObservables = [];
http://git-wip-us.apache.org/repos/asf/metron/blob/10271c41/metron-interface/metron-alerts/src/app/utils/constants.ts
----------------------------------------------------------------------
diff --git a/metron-interface/metron-alerts/src/app/utils/constants.ts b/metron-interface/metron-alerts/src/app/utils/constants.ts
index b7a9298..0cd68d8 100644
--- a/metron-interface/metron-alerts/src/app/utils/constants.ts
+++ b/metron-interface/metron-alerts/src/app/utils/constants.ts
@@ -19,7 +19,6 @@
import { environment } from '../../environments/environment';
export const META_ALERTS_SENSOR_TYPE = 'metaalert';
-export const META_ALERTS_INDEX = 'metaalert_index';
export const NUM_SAVED_SEARCH = 10;
export const ALERTS_RECENT_SEARCH = 'metron-alerts-recent-saved-search';