metron git commit: METRON-1631 Alerts UI: Dash score does not show if only filtering by one group (sardell via merrimanr) closes apache/metron#1079
Repository: metron
Updated Branches:
refs/heads/master 55d46b0ec -> be9a92198
METRON-1631 Alerts UI: Dash score does not show if only filtering by one group
(sardell via merrimanr) closes apache/metron#1079
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/be9a9219
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/be9a9219
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/be9a9219
Branch: refs/heads/master
Commit: be9a9219875f8c6a2b0c07aa7b2d62484983d932
Parents: 55d46b0
Author: sardell
Authored: Fri Jun 29 09:49:24 2018 -0500
Committer: rmerriman
Committed: Fri Jun 29 09:49:24 2018 -0500
--
.../src/app/alerts/alerts-list/alerts-list.component.html| 5 +++--
.../src/app/alerts/alerts-list/alerts-list.component.ts | 2 ++
.../app/alerts/alerts-list/tree-view/tree-view.component.ts | 8 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/metron/blob/be9a9219/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.html
--
diff --git
a/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.html
b/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.html
index 77f24d5..2a1802c 100644
---
a/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.html
+++
b/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.html
@@ -80,7 +80,7 @@
-http://git-wip-us.apache.org/repos/asf/metron/blob/be9a9219/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 ca1bd50..15a87a4 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
@@ -77,6 +77,7 @@ export class AlertsListComponent implements OnInit, OnDestroy
{
groupFacets: Facets;
globalConfig: {} = {};
configSubscription: Subscription;
+ groups = [];
constructor(private router: Router,
private searchService: SearchService,
@@ -239,6 +240,7 @@ export class AlertsListComponent implements OnInit,
OnDestroy {
}
onGroupsChange(groups) {
+this.groups = groups;
this.queryBuilder.setGroupby(groups);
this.search();
}
http://git-wip-us.apache.org/repos/asf/metron/blob/be9a9219/metron-interface/metron-alerts/src/app/alerts/alerts-list/tree-view/tree-view.component.ts
--
diff --git
a/metron-interface/metron-alerts/src/app/alerts/alerts-list/tree-view/tree-view.component.ts
b/metron-interface/metron-alerts/src/app/alerts/alerts-list/tree-view/tree-view.component.ts
index 9a7c78c..7b2e62c 100644
---
a/metron-interface/metron-alerts/src/app/alerts/alerts-list/tree-view/tree-view.component.ts
+++
b/metron-interface/metron-alerts/src/app/alerts/alerts-list/tree-view/tree-view.component.ts
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import { Component, OnInit, OnChanges, SimpleChanges, OnDestroy } from
'@angular/core';
+import { Component, OnInit, OnChanges, SimpleChanges, OnDestroy, Input } from
'@angular/core';
import {Router} from '@angular/router';
import {Subscription, Observable} from 'rxjs/Rx';
@@ -47,12 +47,12 @@ import { GlobalConfigService } from
'../../../service/global-config.service';
export class TreeViewComponent extends TableViewComponent implements OnInit,
OnChanges, OnDestroy {
+ @Input() globalConfig: {} = {};
groupByFields: string[] = [];
topGroups: TreeGroupData[] = [];
groupResponse: GroupResponse = new GroupResponse();
treeGroupSubscriptionMap: {[key: string]: TreeAlertsSubscription } = {};
alertsChangedSubscription: Subscription;
- globalConfig: {} = {};
configSubscription: Subscription;
constructor(router: Router,
@@ -186,14 +186,10 @@ export class TreeViewComponent extends TableViewComponent
implements OnInit, OnC
ngOnInit() {
this.addAlertChangedListner();
-this.configSubscription =
this.globalConfigService.get().subscribe((config: {}) => {
- this.globalConfig = config;
-});
}
ngOnDestroy(): void {
this.removeAlertChangedLister();
-this.configSubscription.unsubscribe();
}
searchGroup(selectedGroup: TreeGroupData, searchRequest: SearchRequest):
Subscription {
metron git commit: METRON-1647 Fix logging level score closes apache/incubator-metron#1089
Repository: metron
Updated Branches:
refs/heads/master 4519f7210 -> 55d46b0ec
METRON-1647 Fix logging level score closes apache/incubator-metron#1089
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/55d46b0e
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/55d46b0e
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/55d46b0e
Branch: refs/heads/master
Commit: 55d46b0ec630fc926a6deeafaa079ae3841a3677
Parents: 4519f72
Author: Pravin Rahangdale
Authored: Fri Jun 29 09:22:43 2018 -0400
Committer: cstella
Committed: Fri Jun 29 09:22:43 2018 -0400
--
.../main/java/org/apache/metron/maas/service/runner/Runner.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/metron/blob/55d46b0e/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/runner/Runner.java
--
diff --git
a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/runner/Runner.java
b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/runner/Runner.java
index 8f0b9e5..4103d3d 100644
---
a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/runner/Runner.java
+++
b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/runner/Runner.java
@@ -177,7 +177,7 @@ public class Runner {
String hostname = RunnerOptions.HOSTNAME.get(cli);
CuratorFramework client = null;
-LOG.error("Running script " + script);
+LOG.info("Running script " + script);
LOG.info("Local Directory Contents");
for(File f : new File(".").listFiles()) {
LOG.info(" " + f.getName());
metron git commit: METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088
Repository: metron
Updated Branches:
refs/heads/master c4c790dbe -> 4519f7210
METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4519f721
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4519f721
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4519f721
Branch: refs/heads/master
Commit: 4519f72104b294c2f0eb8135181a3fa68eee9088
Parents: c4c790d
Author: tiborm
Authored: Fri Jun 29 09:17:27 2018 -0400
Committer: cstella
Committed: Fri Jun 29 09:17:27 2018 -0400
--
.../alert-filters/alert-filters.e2e-spec.ts | 2 +-
.../e2e/alerts-list/alerts-list.po.ts | 6 +-
.../meta-alerts/meta-alert.e2e-spec.ts | 2 +-
.../table-view/table-view.e2e-spec.ts | 90
.../e2e/alerts-list/table-view/table-view.po.ts | 26 ++
.../alerts-list/tree-view/tree-view.e2e-spec.ts | 4 +-
.../e2e/mock-data/alerts_ui_e2e_index.data | 16 ++--
.../metron-alerts/e2e/utils/e2e_util.ts | 62 --
.../metron-alerts/protractor.conf.js| 1 +
.../table-view/table-view.component.html| 10 +--
10 files changed, 172 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts
--
diff --git
a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts
b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts
index d9caf7c..6783d3d 100644
---
a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts
+++
b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts
@@ -47,7 +47,7 @@ describe('Test spec for facet filters', function() {
});
it('should display facets data', async function() : Promise {
-let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr
2', 'source:type 1' ];
+let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr
6', 'source:type 1' ];
await page.navgateToAlertList();
expect(await page.getFacetsTitle()).toEqualBcoz('Filters', 'for Title as
Filters');
http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts
--
diff --git a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts
b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts
index 13aeb27..389d218 100644
--- a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts
+++ b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import {browser, element, by, protractor} from 'protractor';
+import {browser, element, by, protractor, ElementArrayFinder} from
'protractor';
import * as moment from 'moment/moment';
import {
waitForElementVisibility, waitForElementPresence, waitForElementInVisibility,
@@ -446,10 +446,6 @@ export class MetronAlertsPage {
.element(by.xpath('../..')).all(by.css('td a')).get(8).getText();
}
- sortTable(colName: string) {
-element.all(by.css('table thead
th')).all(by.linkText(colName)).get(0).click();
- }
-
getCellValue(rowIndex: number, colIndex: number, previousText: string) {
let cellElement = element.all(by.css('table tbody
tr')).get(rowIndex).all(by.css('td')).get(colIndex);
return this.waitForTextChange(cellElement, previousText).then(() =>
cellElement.getText());
http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts
--
diff --git
a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts
b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts
index 5425523..5bf7fd8 100644
---
a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts
+++
b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts
@@ -158,7 +158,7 @@ describe('Test spec for meta alerts workflow', function() {
'source:type': '1',
'ip_dst_addr': '7',
'enrichm...:country': '3',
- 'ip_src_addr': '2'
+ 'ip_src_addr': '4'
};
let alertsInMetaAlerts = [
'82f8046d-d...03b17480dd',
http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/table-view/table-view.e2e-spec.ts
