subject:"metron git commit\: Merge branch 'master' into feature\/METRON\-1416\-upgrade\-solr"

[22/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e7233b0f
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e7233b0f
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e7233b0f

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: e7233b0f82f372e6b1339de56a115fa7e4581f07
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 09:46:46 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 28 +
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 129 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT
   .replace('.', ':');
   public static final String METAALERTS_INDEX = "metaalert_index";
-
   public static final

[21/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0717cfc2
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0717cfc2
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0717cfc2

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: 0717cfc25acc80b80121b424bed93db7014a1376
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Mon Jun 11 21:41:06 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 26 +---
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 128 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT
   .replace('.', ':');
   public static final String METAALERTS_INDEX = "metaalert_index";
-
   public static final

[34/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e0fc4758
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e0fc4758
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e0fc4758

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: e0fc47582e65e9daf1a0c85dc1b1657166ff14f5
Parents: 1767727 622d50a
Author: justinjleet 
Authored: Tue Jun 26 15:34:09 2018 -0400
Committer: justinjleet 
Committed: Tue Jun 26 16:07:29 2018 -0400

--
 .../configuration/metron-enrichment-env.xml |   12 +
 .../configuration/metron-profiler-env.xml   |   12 +
 .../CURRENT/package/scripts/metron_service.py   |   20 +
 .../package/scripts/params/params_linux.py  |4 +
 .../METRON/CURRENT/themes/metron_theme.json |   41 +-
 metron-interface/metron-alerts/README.md|   19 +-
 .../e2e/alert-details/alert-details.po.ts   |   67 +-
 .../alert-details-status.e2e-spec.ts|  168 +-
 .../alert-filters/alert-filters.e2e-spec.ts |   78 +-
 .../alert-filters/alert-filters.po.ts   |   31 +-
 .../alert-status/alerts-list-status.e2e-spec.ts |  125 +-
 .../e2e/alerts-list/alerts-list.e2e-spec.ts |  369 +-
 .../e2e/alerts-list/alerts-list.po.ts   |  308 +-
 .../configure-table/configure-table.e2e-spec.ts |   62 +-
 .../meta-alerts/meta-alert.e2e-spec.ts  |  248 +-
 .../alerts-list/meta-alerts/meta-alert.po.ts|   21 +-
 .../save-search/save-search.e2e-spec.ts |   93 +-
 .../alerts-list/tree-view/tree-view.e2e-spec.ts |  208 +-
 .../e2e/alerts-list/tree-view/tree-view.po.ts   |  170 +-
 .../metron-alerts/e2e/login/login.e2e-spec.ts   |   36 +-
 .../metron-alerts/e2e/login/login.po.ts |   44 +-
 .../e2e/utils/clean_metron_update_table.ts  |   52 +
 .../metron-alerts/e2e/utils/e2e_util.ts |  223 +-
 .../metron-alerts/package-lock.json | 6163 +++---
 metron-interface/metron-alerts/package.json |8 +-
 .../metron-alerts/protractor.conf.js|   31 +-
 .../alert-details/alert-details.component.ts|   49 +-
 .../alert-filters/alert-filters.component.ts|2 +-
 .../alerts-list/alerts-list.component.html  |8 +-
 .../alerts-list/alerts-list.component.scss  |3 +-
 .../alerts/alerts-list/alerts-list.component.ts |4 +-
 .../tree-view/tree-view.component.html  |4 +-
 .../configure-rows/configure-rows.component.ts  |2 +-
 .../saved-searches.component.html   |4 +-
 .../app/shared/group-by/group-by.component.html |2 +-
 .../shared/time-range/time-range.component.html |   12 +-
 .../shared/time-range/time-range.component.scss |4 +
 .../metron-alerts/src/app/utils/constants.ts|1 +
 .../src/environments/environment.e2e.ts |3 +-
 .../src/environments/environment.js |6 +-
 .../src/environments/environment.prod.ts|3 +-
 .../src/environments/environment.ts |3 +-
 metron-interface/metron-alerts/src/index.html   |2 +-
 metron-interface/metron-alerts/src/styles.scss  |   10 +
 44 files changed, 6761 insertions(+), 1974 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e0fc4758/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
--
diff --cc 
metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
index 58d581f,e3e48ab..9d15e93
--- 
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
+++ 
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
@@@ -148,15 -119,29 +148,35 @@@ def build_global_config_patch(params, p
  "op": "add",
  "path": "/threat.triage.score.field",
  "value": "{{threat_triage_score_field}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchSize",
+ "value": "{{enrichment_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchTimeout",
+ "value": "{{enrichment_kafka_writer_batch_timeout}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchSize",
+ "value": "{{profiler_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchTimeout",
+ "value": "{{profiler_kafka_writer_batch_timeout}}"
  }
 -  ]
"""
 +  patch_template = ambari_format(
 +  """
 +  [
 +

[25/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0e484279
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0e484279
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0e484279

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: 0e4842799f8a3afa15074cb121bdbd205e50fb58
Parents: 4c4452e 828ab71
Author: cstella 
Authored: Thu Jun 14 12:18:43 2018 -0400
Committer: cstella 
Committed: Thu Jun 14 12:18:43 2018 -0400

--
 NOTICE  |   6 +
 dependencies_with_url.csv   |   4 +
 metron-platform/metron-api/pom.xml  |   4 -
 .../parsers/topology/ParserTopologyBuilder.java |   2 +-
 .../metron-storm-kafka-override/pom.xml |  83 -
 .../KafkaSpoutRetryExponentialBackoff.java  | 336 +++
 .../storm/kafka/spout/internal/Timer.java   |   9 +-
 metron-platform/metron-storm-kafka/pom.xml  |   5 -
 pom.xml |   4 +-
 site/documentation/index.md |  14 +-
 10 files changed, 442 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/dependencies_with_url.csv
--

http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/pom.xml
--

[24/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4c4452e5
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4c4452e5
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4c4452e5

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: 4c4452e59c93306a049e6879f7b6fed2ee86c74e
Parents: 4768561
Author: cstella 
Authored: Tue Jun 12 21:40:01 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 21:40:01 2018 -0400

--
 .../dao/ElasticsearchSearchDao.java |  30 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  | 223 ++-
 2 files changed, 134 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
index 5725534..5cd0a4d 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
@@ -443,22 +443,24 @@ public class ElasticsearchSearchDao implements SearchDao {
   private List getGroupResults(GroupRequest groupRequest, int 
index, Aggregations aggregations, Map commonColumnMetadata) {
 List groups = groupRequest.getGroups();
 String field = groups.get(index).getField();
-Terms terms = aggregations.get(getGroupByAggregationName(field));
 List searchResultGroups = new ArrayList<>();
-for(Bucket bucket: terms.getBuckets()) {
-  GroupResult groupResult = new GroupResult();
-  groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
-  groupResult.setTotal(bucket.getDocCount());
-  Optional scoreField = groupRequest.getScoreField();
-  if (scoreField.isPresent()) {
-Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
-groupResult.setScore(score.getValue());
-  }
-  if (index < groups.size() - 1) {
-groupResult.setGroupedBy(groups.get(index + 1).getField());
-groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+if(aggregations != null) {
+  Terms terms = aggregations.get(getGroupByAggregationName(field));
+  for (Bucket bucket : terms.getBuckets()) {
+GroupResult groupResult = new GroupResult();
+groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
+groupResult.setTotal(bucket.getDocCount());
+Optional scoreField = groupRequest.getScoreField();
+if (scoreField.isPresent()) {
+  Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
+  groupResult.setScore(score.getValue());
+}
+if (index < groups.size() - 1) {
+  groupResult.setGroupedBy(groups.get(index + 1).getField());
+  groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+}
+searchResultGroups.add(groupResult);
   }
-  searchResultGroups.add(groupResult);
 }
 return searchResultGroups;
   }

http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
index 99f0490..224ec56 100644
--- 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
+++ 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
@@ -1,20 +1,21 @@
+
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under

[27/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a89a72c3
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a89a72c3
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a89a72c3

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: a89a72c3b2ceb5066fd7a310636507ce274c66ad
Parents: 10271c4 b081e80
Author: cstella 
Authored: Fri Jun 15 20:32:18 2018 -0400
Committer: cstella 
Committed: Fri Jun 15 20:32:18 2018 -0400

--
 .../alert-details/alert-details.component.html  |  4 +--
 .../alert-details/alert-details.component.ts| 24 ++---
 .../alerts-list/alerts-list.component.html  |  4 +--
 .../alerts/alerts-list/alerts-list.component.ts | 13 ++
 .../src/app/alerts/alerts-list/query-builder.ts |  5 ++--
 .../table-view/table-view.component.html| 18 ++---
 .../table-view/table-view.component.ts  | 19 --
 .../tree-view/tree-view.component.html  | 16 ++--
 .../tree-view/tree-view.component.ts| 27 +---
 .../meta-alerts/meta-alerts.component.html  |  2 +-
 .../alerts/meta-alerts/meta-alerts.component.ts | 11 +---
 .../src/app/model/group-request.ts  |  2 +-
 .../src/app/service/global-config.service.ts| 16 +---
 .../metron-alerts/src/app/utils/constants.ts|  3 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  |  5 ++--
 15 files changed, 120 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
index ffd7dd0,c939f04..39d47ac
--- 
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,8 -30,8 +30,9 @@@ 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_SENSOR_TYPE} from '../../utils/constants';
 -import {META_ALERTS_INDEX, META_ALERTS_SENSOR_TYPE} from 
'../../utils/constants';
 +import {CommentAddRemoveRequest} from 
"../../model/comment-add-remove-request";
++import {META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
+ import { GlobalConfigService } from '../../service/global-config.service';
  
  export enum AlertState {
NEW, OPEN, ESCALATE, DISMISS, RESOLVE

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
index 98459db,4496e37..07f7015
--- 
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
@@@ -36,10 -36,10 +36,10 @@@ import {AlertSearchDirective} from '../
  import {SearchResponse} from '../../model/search-response';
  import {ElasticsearchUtils} from '../../utils/elasticsearch-utils';
  import {Filter} from '../../model/filter';
- import {THREAT_SCORE_FIELD_NAME, TIMESTAMP_FIELD_NAME, ALL_TIME} from 
'../../utils/constants';
+ import {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';

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/utils/constants.ts

[05/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-07-10 Thread mmiklavcic

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/eb336665
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/eb336665
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/eb336665

Branch: refs/heads/feature/METRON-1554-pcap-query-panel
Commit: eb3366656de643e7436f7cf280561b94f3921c65
Parents: bc16e68 71a015f
Author: justinjleet 
Authored: Fri May 18 14:21:24 2018 -0400
Committer: justinjleet 
Committed: Fri May 18 14:21:24 2018 -0400

--
 dependencies_with_url.csv   |  56 ++-
 .../metron/profiler/ProfileMeasurement.java |   3 +-
 .../apache/metron/profiler/ProfilePeriod.java   |   3 +-
 .../metron/profiler/ProfileMeasurementTest.java | 108 +
 .../metron/profiler/ProfilePeriodTest.java  |  49 +++
 metron-analytics/metron-profiler/README.md  |  62 ++-
 .../src/main/config/profiler.properties |  13 +
 .../src/main/flux/profiler/remote.yaml  |   3 +
 .../zookeeper/profile-with-stats/profiler.json  |  12 +
 .../integration/ProfilerIntegrationTest.java|  83 +++-
 .../metron/statistics/StatisticsProvider.java   |   6 +-
 .../statistics/sampling/UniformSampler.java |   5 +-
 metron-deployment/amazon-ec2/ansible.cfg|   5 +-
 .../roles/ambari_config/vars/single_node_vm.yml |   1 +
 metron-deployment/packaging/ambari/.gitignore   |   2 +
 .../enrichment-splitjoin.properties.j2  |  63 ---
 .../templates/enrichment-unified.properties.j2  |  60 ---
 .../package/templates/profiler.properties.j2|  13 +
 metron-interface/metron-alerts/README.md|   6 +
 metron-interface/metron-alerts/proxy.conf.json  |   9 -
 .../alert-details/alert-details.component.ts|   2 +-
 .../alert-details/alerts-details.routing.ts |   2 +-
 .../alerts/alerts-list/alerts-list.component.ts |  25 +-
 .../table-view/table-view.component.ts  |  32 +-
 .../tree-view/tree-view.component.ts|  17 +-
 .../alerts/meta-alerts/meta-alerts.component.ts |  20 +-
 .../metron-alerts/src/app/app.module.ts |   4 +-
 .../src/app/model/search-request.ts |   2 +-
 .../src/app/service/authentication.service.ts   |  10 +-
 .../service/elasticsearch-localstorage-impl.ts  |   6 +-
 .../src/app/service/global-config.service.ts|  50 +++
 .../src/app/service/update.service.ts   |  10 +-
 .../metron-alerts/src/app/utils/constants.ts|   4 +-
 .../metron-alerts/src/app/utils/utils.ts|   7 +-
 metron-interface/metron-config/proxy.conf.json  |   4 +-
 metron-interface/metron-rest/README.md  |   2 +
 metron-interface/metron-rest/pom.xml|  17 +-
 .../metron/rest/MetronRestApplication.java  |   7 +
 .../apache/metron/rest/MetronRestConstants.java |   2 +
 .../metron/rest/config/JpaConfiguration.java|   6 +-
 .../metron/rest/config/WebSecurityConfig.java   |  19 +-
 .../rest/service/impl/SearchServiceImpl.java|  42 +-
 .../src/main/resources/application-test.yml |   2 +-
 .../src/main/resources/application.yml  |   2 +-
 .../metron-rest/src/main/scripts/metron-rest.sh |   2 +-
 .../SearchControllerIntegrationTest.java|   9 +-
 .../service/impl/SearchServiceImplTest.java |  60 ++-
 metron-platform/metron-common/README.md |  15 +-
 .../org/apache/metron/common/Constants.java |  10 +-
 .../configuration/SensorParserConfig.java   | 410 +++
 .../configuration/profiler/ProfileResult.java   |   4 +-
 .../profiler/ProfileResultExpressions.java  |   4 +-
 .../profiler/ProfileTriageExpressions.java  |   3 +-
 .../configuration/profiler/ProfilerConfig.java  |  12 +-
 .../common/utils/CompressionStrategies.java | 100 +
 .../common/utils/CompressionStrategy.java   |  52 +++
 .../apache/metron/common/utils/SerDeUtils.java  |   7 +-
 .../profiler/ProfilerConfigTest.java|  85 +++-
 .../common/utils/CompressionUtilsTest.java  |  62 +++
 .../nonbulk/geo/GeoEnrichmentLoader.java|  70 +++-
 .../nonbulk/geo/GeoEnrichmentLoaderTest.java|  40 +-
 .../parsers/topology/ParserTopologyBuilder.java | 139 ---
 .../parsers/topology/ParserTopologyCLI.java | 147 +--
 .../components/ParserTopologyComponent.java |  80 ++--
 .../parsers/topology/ParserTopologyCLITest.java | 122 --
 ...pleHbaseEnrichmentWriterIntegrationTest.java |  69 ++--
 .../integration/WriterBoltIntegrationTest.java  | 382 +++--
 .../apache/metron/writer/kafka/KafkaWriter.java |   5 +
 .../stellar/common/utils/BloomFilter.java   |   8 +-
 .../metron/stellar/common/utils/SerDeUtils.java |  16 +-
 .../common/utils/StellarProcessorUtils.java | 101 -
 .../metron/stellar/dsl/functions/Ordinal.java   |  36 ++
 .../stellar/dsl/functions/OrdinalFunctions.java |  48 ++-
 .../dsl/functions/OrdinalFunctionsTest.java

[42/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e7233b0f
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e7233b0f
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e7233b0f

Branch: refs/heads/master
Commit: e7233b0f82f372e6b1339de56a115fa7e4581f07
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 09:46:46 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 28 +
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 129 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT
   .replace('.', ':');
   public static final String METAALERTS_INDEX = "metaalert_index";
-
   public static final String SOURCE_TYPE_FIELD =

[11/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/1006d9d6
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/1006d9d6
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/1006d9d6

Branch: refs/heads/master
Commit: 1006d9d6e473d56d5ada2e7ff3011b98f047ec7c
Parents: 8cc8aab b48ab93
Author: Michael Miklavcic 
Authored: Tue Feb 27 14:43:31 2018 -0700
Committer: Michael Miklavcic 
Committed: Tue Feb 27 14:43:31 2018 -0700

--
 Upgrading.md|  18 +
 metron-deployment/amazon-ec2/README.md  |  25 +-
 .../metron/rest/controller/KafkaController.java |   1 +
 .../metron/rest/service/KafkaService.java   |   9 +
 .../rest/service/impl/KafkaServiceImpl.java |  33 +-
 .../rest/service/impl/KafkaServiceImplTest.java |  10 +
 .../apache/metron/common/utils/JSONUtils.java   |   7 +
 .../dao/ElasticsearchMetaAlertDao.java  |  15 +-
 .../apache/metron/indexing/dao/IndexDao.java|  23 +-
 .../indexing/dao/update/PatchRequest.java   |   7 +-
 .../paloalto/BasicPaloAltoFirewallParser.java   | 333 +
 .../BasicPaloAltoFirewallParserTest.java| 493 ++-
 .../logData/PaloAltoFirewallParserTest.txt  |   2 -
 site/_includes/footer.html  |   3 +-
 site/community/index.md |   4 +
 site/index.html |  30 ++
 16 files changed, 853 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/1006d9d6/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/JSONUtils.java
--

[47/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a89a72c3
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a89a72c3
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a89a72c3

Branch: refs/heads/master
Commit: a89a72c3b2ceb5066fd7a310636507ce274c66ad
Parents: 10271c4 b081e80
Author: cstella 
Authored: Fri Jun 15 20:32:18 2018 -0400
Committer: cstella 
Committed: Fri Jun 15 20:32:18 2018 -0400

--
 .../alert-details/alert-details.component.html  |  4 +--
 .../alert-details/alert-details.component.ts| 24 ++---
 .../alerts-list/alerts-list.component.html  |  4 +--
 .../alerts/alerts-list/alerts-list.component.ts | 13 ++
 .../src/app/alerts/alerts-list/query-builder.ts |  5 ++--
 .../table-view/table-view.component.html| 18 ++---
 .../table-view/table-view.component.ts  | 19 --
 .../tree-view/tree-view.component.html  | 16 ++--
 .../tree-view/tree-view.component.ts| 27 +---
 .../meta-alerts/meta-alerts.component.html  |  2 +-
 .../alerts/meta-alerts/meta-alerts.component.ts | 11 +---
 .../src/app/model/group-request.ts  |  2 +-
 .../src/app/service/global-config.service.ts| 16 +---
 .../metron-alerts/src/app/utils/constants.ts|  3 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  |  5 ++--
 15 files changed, 120 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
index ffd7dd0,c939f04..39d47ac
--- 
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,8 -30,8 +30,9 @@@ 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_SENSOR_TYPE} from '../../utils/constants';
 -import {META_ALERTS_INDEX, META_ALERTS_SENSOR_TYPE} from 
'../../utils/constants';
 +import {CommentAddRemoveRequest} from 
"../../model/comment-add-remove-request";
++import {META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
+ import { GlobalConfigService } from '../../service/global-config.service';
  
  export enum AlertState {
NEW, OPEN, ESCALATE, DISMISS, RESOLVE

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
index 98459db,4496e37..07f7015
--- 
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
@@@ -36,10 -36,10 +36,10 @@@ import {AlertSearchDirective} from '../
  import {SearchResponse} from '../../model/search-response';
  import {ElasticsearchUtils} from '../../utils/elasticsearch-utils';
  import {Filter} from '../../model/filter';
- import {THREAT_SCORE_FIELD_NAME, TIMESTAMP_FIELD_NAME, ALL_TIME} from 
'../../utils/constants';
+ import {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';

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/utils/constants.ts
--

[45/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0e484279
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0e484279
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0e484279

Branch: refs/heads/master
Commit: 0e4842799f8a3afa15074cb121bdbd205e50fb58
Parents: 4c4452e 828ab71
Author: cstella 
Authored: Thu Jun 14 12:18:43 2018 -0400
Committer: cstella 
Committed: Thu Jun 14 12:18:43 2018 -0400

--
 NOTICE  |   6 +
 dependencies_with_url.csv   |   4 +
 metron-platform/metron-api/pom.xml  |   4 -
 .../parsers/topology/ParserTopologyBuilder.java |   2 +-
 .../metron-storm-kafka-override/pom.xml |  83 -
 .../KafkaSpoutRetryExponentialBackoff.java  | 336 +++
 .../storm/kafka/spout/internal/Timer.java   |   9 +-
 metron-platform/metron-storm-kafka/pom.xml  |   5 -
 pom.xml |   4 +-
 site/documentation/index.md |  14 +-
 10 files changed, 442 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/dependencies_with_url.csv
--

http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/pom.xml
--

[44/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4c4452e5
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4c4452e5
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4c4452e5

Branch: refs/heads/master
Commit: 4c4452e59c93306a049e6879f7b6fed2ee86c74e
Parents: 4768561
Author: cstella 
Authored: Tue Jun 12 21:40:01 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 21:40:01 2018 -0400

--
 .../dao/ElasticsearchSearchDao.java |  30 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  | 223 ++-
 2 files changed, 134 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
index 5725534..5cd0a4d 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
@@ -443,22 +443,24 @@ public class ElasticsearchSearchDao implements SearchDao {
   private List getGroupResults(GroupRequest groupRequest, int 
index, Aggregations aggregations, Map commonColumnMetadata) {
 List groups = groupRequest.getGroups();
 String field = groups.get(index).getField();
-Terms terms = aggregations.get(getGroupByAggregationName(field));
 List searchResultGroups = new ArrayList<>();
-for(Bucket bucket: terms.getBuckets()) {
-  GroupResult groupResult = new GroupResult();
-  groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
-  groupResult.setTotal(bucket.getDocCount());
-  Optional scoreField = groupRequest.getScoreField();
-  if (scoreField.isPresent()) {
-Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
-groupResult.setScore(score.getValue());
-  }
-  if (index < groups.size() - 1) {
-groupResult.setGroupedBy(groups.get(index + 1).getField());
-groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+if(aggregations != null) {
+  Terms terms = aggregations.get(getGroupByAggregationName(field));
+  for (Bucket bucket : terms.getBuckets()) {
+GroupResult groupResult = new GroupResult();
+groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
+groupResult.setTotal(bucket.getDocCount());
+Optional scoreField = groupRequest.getScoreField();
+if (scoreField.isPresent()) {
+  Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
+  groupResult.setScore(score.getValue());
+}
+if (index < groups.size() - 1) {
+  groupResult.setGroupedBy(groups.get(index + 1).getField());
+  groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+}
+searchResultGroups.add(groupResult);
   }
-  searchResultGroups.add(groupResult);
 }
 return searchResultGroups;
   }

http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
index 99f0490..224ec56 100644
--- 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
+++ 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
@@ -1,20 +1,21 @@
+
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0

[51/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes apache/metron#1075

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes 
apache/metron#1075


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/975923e8
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/975923e8
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/975923e8

Branch: refs/heads/master
Commit: 975923e8d98ccd410c065ec5514f59f5ef89b260
Parents: 6159c6f
Author: nickwallen 
Authored: Fri Jun 22 11:00:05 2018 -0400
Committer: nickallen 
Committed: Fri Jun 22 11:00:05 2018 -0400

--
 metron-analytics/metron-maas-common/pom.xml |  2 +-
 metron-analytics/metron-maas-service/pom.xml|  2 +-
 metron-analytics/metron-profiler-client/pom.xml |  2 +-
 metron-analytics/metron-profiler-common/pom.xml |  2 +-
 metron-analytics/metron-profiler/pom.xml|  2 +-
 metron-analytics/metron-statistics/pom.xml  |  2 +-
 metron-analytics/pom.xml|  2 +-
 metron-contrib/metron-docker/pom.xml|  2 +-
 metron-contrib/metron-performance/pom.xml   |  2 +-
 metron-contrib/pom.xml  |  2 +-
 metron-deployment/Kerberos-manual-setup.md  |  4 +--
 metron-deployment/amazon-ec2/conf/defaults.yml  |  2 +-
 .../ansible/playbooks/docker_probe_install.yml  |  2 +-
 .../roles/ambari_master/defaults/main.yml   |  2 +-
 .../roles/metron_pcapservice/defaults/main.yml  |  2 +-
 .../centos6/ansible/inventory/group_vars/all|  2 +-
 .../ubuntu14/ansible/inventory/group_vars/all   |  2 +-
 .../ambari/elasticsearch-mpack/pom.xml  |  4 +--
 .../packaging/ambari/metron-mpack/pom.xml   |  4 +--
 .../CURRENT/configuration/metron-rest-env.xml   | 12 
 .../CURRENT/package/scripts/metron_service.py   | 10 +++
 .../package/scripts/params/params_linux.py  |  2 ++
 .../METRON/CURRENT/themes/metron_theme.json | 20 +
 .../metron-mpack/src/main/resources/mpack.json  |  2 +-
 .../packaging/docker/deb-docker/pom.xml |  4 +--
 .../packaging/docker/rpm-docker/pom.xml |  4 +--
 metron-deployment/pom.xml   |  2 +-
 metron-interface/metron-alerts/README.md|  6 +++-
 metron-interface/metron-alerts/package.json |  2 +-
 metron-interface/metron-alerts/pom.xml  |  2 +-
 .../table-view/table-view.component.ts  |  2 +-
 .../meta-alerts/meta-alerts.component.html  |  6 ++--
 .../alerts/meta-alerts/meta-alerts.component.ts |  4 +--
 .../metron-alerts/src/app/model/filter.ts   |  4 +--
 metron-interface/metron-config/package.json |  2 +-
 metron-interface/metron-config/pom.xml  |  2 +-
 .../metron-config/scripts/package.json  |  2 +-
 metron-interface/metron-rest-client/pom.xml |  2 +-
 metron-interface/metron-rest/pom.xml|  2 +-
 .../src/main/resources/application.yml  |  2 +-
 metron-interface/pom.xml|  2 +-
 metron-platform/Performance-tuning-guide.md |  4 +--
 metron-platform/README.md   |  2 +-
 metron-platform/elasticsearch-shaded/pom.xml|  2 +-
 metron-platform/metron-api/pom.xml  |  2 +-
 metron-platform/metron-common/README.md |  3 +-
 metron-platform/metron-common/pom.xml   |  2 +-
 .../src/main/scripts/cluster_info.py|  2 +-
 metron-platform/metron-data-management/pom.xml  |  2 +-
 metron-platform/metron-elasticsearch/pom.xml|  2 +-
 .../dao/ElasticsearchMetaAlertDao.java  | 30 
 .../dao/ElasticsearchMetaAlertDaoTest.java  |  8 ++
 metron-platform/metron-enrichment/pom.xml   |  2 +-
 metron-platform/metron-hbase-client/pom.xml |  2 +-
 metron-platform/metron-hbase/pom.xml|  2 +-
 metron-platform/metron-indexing/pom.xml |  2 +-
 metron-platform/metron-integration-test/pom.xml |  2 +-
 metron-platform/metron-management/pom.xml   |  2 +-
 metron-platform/metron-parsers/pom.xml  |  2 +-
 metron-platform/metron-pcap-backend/pom.xml |  2 +-
 .../src/main/scripts/pcap_zeppelin_run.sh   |  2 +-
 metron-platform/metron-pcap/pom.xml |  2 +-
 metron-platform/metron-solr/pom.xml |  2 +-
 .../metron-storm-kafka-override/pom.xml |  2 +-
 metron-platform/metron-storm-kafka/pom.xml  |  2 +-
 metron-platform/metron-test-utilities/pom.xml   |  2 +-
 metron-platform/metron-writer/pom.xml   |  2 +-
 metron-platform/metron-zookeeper/pom.xml|  2 +-
 metron-platform/pom.xml |  2 +-
 metron-stellar/pom.xml  |  2 +-
 .../stellar-3rd-party-example/pom.xml   |  2 +-
 metron-stellar/stellar-common/README.md |  4 +--
 metron-stellar/stellar-common/pom.xml   |  2 +-
 metron-stellar/stellar-zeppelin/README.md   |  6 ++--
 metron-stellar/stellar-zeppelin/pom.xml |  2 +-
 pom.xml

[53/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e0fc4758
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e0fc4758
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e0fc4758

Branch: refs/heads/master
Commit: e0fc47582e65e9daf1a0c85dc1b1657166ff14f5
Parents: 1767727 622d50a
Author: justinjleet 
Authored: Tue Jun 26 15:34:09 2018 -0400
Committer: justinjleet 
Committed: Tue Jun 26 16:07:29 2018 -0400

--
 .../configuration/metron-enrichment-env.xml |   12 +
 .../configuration/metron-profiler-env.xml   |   12 +
 .../CURRENT/package/scripts/metron_service.py   |   20 +
 .../package/scripts/params/params_linux.py  |4 +
 .../METRON/CURRENT/themes/metron_theme.json |   41 +-
 metron-interface/metron-alerts/README.md|   19 +-
 .../e2e/alert-details/alert-details.po.ts   |   67 +-
 .../alert-details-status.e2e-spec.ts|  168 +-
 .../alert-filters/alert-filters.e2e-spec.ts |   78 +-
 .../alert-filters/alert-filters.po.ts   |   31 +-
 .../alert-status/alerts-list-status.e2e-spec.ts |  125 +-
 .../e2e/alerts-list/alerts-list.e2e-spec.ts |  369 +-
 .../e2e/alerts-list/alerts-list.po.ts   |  308 +-
 .../configure-table/configure-table.e2e-spec.ts |   62 +-
 .../meta-alerts/meta-alert.e2e-spec.ts  |  248 +-
 .../alerts-list/meta-alerts/meta-alert.po.ts|   21 +-
 .../save-search/save-search.e2e-spec.ts |   93 +-
 .../alerts-list/tree-view/tree-view.e2e-spec.ts |  208 +-
 .../e2e/alerts-list/tree-view/tree-view.po.ts   |  170 +-
 .../metron-alerts/e2e/login/login.e2e-spec.ts   |   36 +-
 .../metron-alerts/e2e/login/login.po.ts |   44 +-
 .../e2e/utils/clean_metron_update_table.ts  |   52 +
 .../metron-alerts/e2e/utils/e2e_util.ts |  223 +-
 .../metron-alerts/package-lock.json | 6163 +++---
 metron-interface/metron-alerts/package.json |8 +-
 .../metron-alerts/protractor.conf.js|   31 +-
 .../alert-details/alert-details.component.ts|   49 +-
 .../alert-filters/alert-filters.component.ts|2 +-
 .../alerts-list/alerts-list.component.html  |8 +-
 .../alerts-list/alerts-list.component.scss  |3 +-
 .../alerts/alerts-list/alerts-list.component.ts |4 +-
 .../tree-view/tree-view.component.html  |4 +-
 .../configure-rows/configure-rows.component.ts  |2 +-
 .../saved-searches.component.html   |4 +-
 .../app/shared/group-by/group-by.component.html |2 +-
 .../shared/time-range/time-range.component.html |   12 +-
 .../shared/time-range/time-range.component.scss |4 +
 .../metron-alerts/src/app/utils/constants.ts|1 +
 .../src/environments/environment.e2e.ts |3 +-
 .../src/environments/environment.js |6 +-
 .../src/environments/environment.prod.ts|3 +-
 .../src/environments/environment.ts |3 +-
 metron-interface/metron-alerts/src/index.html   |2 +-
 metron-interface/metron-alerts/src/styles.scss  |   10 +
 44 files changed, 6761 insertions(+), 1974 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e0fc4758/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
--
diff --cc 
metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
index 58d581f,e3e48ab..9d15e93
--- 
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
+++ 
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
@@@ -148,15 -119,29 +148,35 @@@ def build_global_config_patch(params, p
  "op": "add",
  "path": "/threat.triage.score.field",
  "value": "{{threat_triage_score_field}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchSize",
+ "value": "{{enrichment_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchTimeout",
+ "value": "{{enrichment_kafka_writer_batch_timeout}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchSize",
+ "value": "{{profiler_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchTimeout",
+ "value": "{{profiler_kafka_writer_batch_timeout}}"
  }
 -  ]
"""
 +  patch_template = ambari_format(
 +  """
 +  [
 +{indexing_patches},
 +{other_patches}
 +  ]

[41/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0717cfc2
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0717cfc2
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0717cfc2

Branch: refs/heads/master
Commit: 0717cfc25acc80b80121b424bed93db7014a1376
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Mon Jun 11 21:41:06 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 26 +---
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 128 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT
   .replace('.', ':');
   public static final String METAALERTS_INDEX = "metaalert_index";
-
   public static final String SOURCE_TYPE_FIELD =

[08/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/67d6c0ed
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/67d6c0ed
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/67d6c0ed

Branch: refs/heads/master
Commit: 67d6c0edd731f528af759ca11de875cbf77f6b2c
Parents: f525dcf 38b7d5e
Author: cstella 
Authored: Wed Feb 7 11:43:34 2018 -0500
Committer: cstella 
Committed: Wed Feb 7 11:43:34 2018 -0500

--
 .../roles/java_jdk/tasks/install_jdk_ubuntu.yml |   2 +-
 .../packaging/ambari/metron-mpack/README.md |  14 +
 metron-deployment/scripts/platform-info.sh  |   4 +-
 .../advanced-config-form.component.html |   2 +-
 .../advanced-config-form.component.spec.ts  |  34 +++
 .../advanced-config-form.component.ts   |  20 +-
 .../src/main/config/rest_application.yml|   3 +-
 .../apache/metron/rest/MetronRestConstants.java |   6 +-
 .../metron/rest/controller/StormController.java |  81 +++--
 .../metron/rest/service/StormAdminService.java  |   4 +-
 .../service/impl/StormAdminServiceImpl.java |   8 +-
 .../rest/service/impl/StormCLIWrapper.java  |  16 +-
 .../src/main/resources/application-test.yml |   3 +-
 .../src/main/resources/application-vagrant.yml  |   4 +-
 .../StormControllerIntegrationTest.java | 102 ---
 .../rest/mock/MockStormCLIClientWrapper.java|  93 --
 .../metron/rest/mock/MockStormRestTemplate.java |  22 +-
 .../service/impl/StormAdminServiceImplTest.java |   8 +-
 .../rest/service/impl/StormCLIWrapperTest.java  |  17 +-
 metron-platform/metron-management/README.md |  32 +-
 .../metron/management/ShellFunctions.java   | 302 ---
 .../metron/management/ShellFunctionsTest.java   | 171 ---
 metron-stellar/stellar-common/NOTICE|   6 +
 metron-stellar/stellar-common/README.md |  74 +
 metron-stellar/stellar-common/pom.xml   |   6 +
 .../src/main/assembly/assembly.xml  |   2 +-
 .../src/main/assembly/stand-alone-assembly.xml  |  57 
 .../stellar/common/shell/cli/PausableInput.java |  23 +-
 .../stellar/dsl/functions/ShellFunctions.java   | 301 ++
 .../src/main/scripts/deployed/stellar   |  36 +++
 .../src/main/scripts/stand-alone/stellar|  21 ++
 .../stellar-common/src/main/scripts/stellar |  36 ---
 .../dsl/functions/ShellFunctionsTest.java   | 176 +++
 33 files changed, 998 insertions(+), 688 deletions(-)
--

[09/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/9b25084c
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/9b25084c
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/9b25084c

Branch: refs/heads/master
Commit: 9b25084c83e484b8119caf134a473fcb6306fa6a
Parents: 67d6c0e fa86663
Author: cstella 
Authored: Thu Feb 8 17:22:12 2018 -0500
Committer: cstella 
Committed: Thu Feb 8 17:22:12 2018 -0500

--
 .../roles/ambari_common/defaults/main.yml   |   6 +-
 .../ambari_common/tasks/elasticsearch-repo.yml  |  40 --
 .../ansible/roles/ambari_common/tasks/main.yml  |   1 -
 .../roles/ambari_config/tasks/dependencies.yml  |  11 +-
 .../packaging/ambari/metron-mpack/README.md |  14 --
 .../ELASTICSEARCH/5.6.2/repos/repoinfo.xml  |  13 ++
 .../KIBANA/5.6.2/repos/repoinfo.xml |  19 +++
 .../5.6.2/configuration/elastic-jvm-options.xml | 144 +++
 .../5.6.2/configuration/elastic-sysconfig.xml   |  12 +-
 .../ELASTICSEARCH/5.6.2/metainfo.xml|   1 +
 .../5.6.2/package/scripts/elastic_commands.py   |  13 ++
 .../5.6.2/package/scripts/params.py |   3 +
 site/documentation/index.md |   2 +-
 13 files changed, 202 insertions(+), 77 deletions(-)
--

[40/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/41708876
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/41708876
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/41708876

Branch: refs/heads/master
Commit: 41708876336d009b3a2ff2c533bdf0294af1477b
Parents: f241f87 32d132b
Author: cstella 
Authored: Mon Jun 11 17:50:48 2018 -0400
Committer: cstella 
Committed: Mon Jun 11 17:50:48 2018 -0400

--
 KEYS|59 +
 Upgrading.md| 2 +-
 dev-utilities/release-utils/metron-rc-check |77 +-
 .../release-utils/validate-jira-for-release |75 +-
 metron-analytics/metron-maas-common/pom.xml | 2 +-
 metron-analytics/metron-maas-service/pom.xml| 2 +-
 metron-analytics/metron-profiler-client/pom.xml | 2 +-
 .../profiler/client/stellar/GetProfileTest.java | 3 +-
 .../client/stellar/ProfilerFunctionsTest.java   |15 +-
 metron-analytics/metron-profiler-common/pom.xml | 2 +-
 metron-analytics/metron-profiler/README.md  |15 +
 metron-analytics/metron-profiler/pom.xml| 2 +-
 .../src/main/flux/profiler/remote.yaml  | 3 +-
 metron-analytics/metron-statistics/pom.xml  | 2 +-
 .../StellarStatisticsFunctionsTest.java | 5 +-
 .../sampling/SamplerFunctionsTest.java  | 3 +-
 metron-analytics/pom.xml| 2 +-
 metron-contrib/metron-docker/pom.xml| 2 +-
 metron-contrib/metron-performance/pom.xml   | 2 +-
 metron-contrib/pom.xml  | 2 +-
 metron-deployment/Kerberos-manual-setup.md  | 8 +-
 metron-deployment/README.md |22 +-
 metron-deployment/amazon-ec2/conf/defaults.yml  | 2 +-
 .../ansible/playbooks/docker_probe_install.yml  | 2 +-
 .../roles/ambari_master/defaults/main.yml   | 2 +-
 .../roles/metron_pcapservice/defaults/main.yml  | 2 +-
 metron-deployment/development/centos6/README.md | 8 +-
 .../centos6/ansible/inventory/group_vars/all| 2 +-
 .../development/ubuntu14/README.md  | 6 +-
 .../ubuntu14/ansible/inventory/group_vars/all   | 2 +-
 .../ambari/elasticsearch-mpack/pom.xml  | 4 +-
 .../packaging/ambari/metron-mpack/pom.xml   | 4 +-
 .../CURRENT/package/files/bro_index.template| 2 +-
 .../CURRENT/package/files/error_index.template  | 2 +-
 .../package/files/metaalert_index.template  | 2 +-
 .../CURRENT/package/files/snort_index.template  | 2 +-
 .../CURRENT/package/files/yaf_index.template| 2 +-
 .../CURRENT/package/scripts/metron_service.py   | 5 +
 .../metron-mpack/src/main/resources/mpack.json  | 2 +-
 .../packaging/docker/deb-docker/pom.xml | 4 +-
 .../packaging/docker/rpm-docker/pom.xml | 4 +-
 metron-deployment/pom.xml   | 2 +-
 .../e2e/mock-data/alerts_ui_e2e_index.template  | 2 +-
 metron-interface/metron-alerts/package.json | 2 +-
 metron-interface/metron-alerts/pom.xml  | 2 +-
 .../alert-details/alert-details.component.ts| 2 +-
 .../alerts/alerts-list/alerts-list.component.ts | 2 +-
 .../table-view/table-view.component.html|10 +-
 .../table-view/table-view.component.ts  | 2 +-
 .../metron-alerts/src/app/model/alert-source.ts | 2 +-
 .../src/app/service/global-config.service.ts|10 +-
 metron-interface/metron-config/package.json | 2 +-
 metron-interface/metron-config/pom.xml  | 2 +-
 .../metron-config/scripts/package.json  | 2 +-
 metron-interface/metron-rest-client/pom.xml | 2 +-
 metron-interface/metron-rest/pom.xml| 2 +-
 .../rest/service/impl/SearchServiceImpl.java|10 +-
 .../src/main/resources/application.yml  | 2 +-
 .../metron-rest/src/main/scripts/metron-rest.sh | 5 +-
 .../MetaAlertControllerIntegrationTest.java | 4 +-
 .../service/impl/SearchServiceImplTest.java | 3 +-
 metron-interface/pom.xml| 2 +-
 metron-platform/Performance-tuning-guide.md | 4 +-
 metron-platform/README.md   | 2 +-
 metron-platform/elasticsearch-shaded/pom.xml| 2 +-
 metron-platform/metron-api/pom.xml  | 2 +-
 metron-platform/metron-common/README.md | 5 +
 metron-platform/metron-common/pom.xml   | 2 +-
 .../org/apache/metron/common/Constants.java | 1 +
 .../metron/common/bolt/ConfiguredBolt.java  |14 +-
 .../common/bolt/ConfiguredEnrichmentBolt.java   |11 +-
 .../common/bolt/ConfiguredIndexingBolt.java |13 +-
 .../common/bolt/ConfiguredParserBolt.java   |13 +-

[9/9] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-26 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e0fc4758
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e0fc4758
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e0fc4758

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: e0fc47582e65e9daf1a0c85dc1b1657166ff14f5
Parents: 1767727 622d50a
Author: justinjleet 
Authored: Tue Jun 26 15:34:09 2018 -0400
Committer: justinjleet 
Committed: Tue Jun 26 16:07:29 2018 -0400

--
 .../configuration/metron-enrichment-env.xml |   12 +
 .../configuration/metron-profiler-env.xml   |   12 +
 .../CURRENT/package/scripts/metron_service.py   |   20 +
 .../package/scripts/params/params_linux.py  |4 +
 .../METRON/CURRENT/themes/metron_theme.json |   41 +-
 metron-interface/metron-alerts/README.md|   19 +-
 .../e2e/alert-details/alert-details.po.ts   |   67 +-
 .../alert-details-status.e2e-spec.ts|  168 +-
 .../alert-filters/alert-filters.e2e-spec.ts |   78 +-
 .../alert-filters/alert-filters.po.ts   |   31 +-
 .../alert-status/alerts-list-status.e2e-spec.ts |  125 +-
 .../e2e/alerts-list/alerts-list.e2e-spec.ts |  369 +-
 .../e2e/alerts-list/alerts-list.po.ts   |  308 +-
 .../configure-table/configure-table.e2e-spec.ts |   62 +-
 .../meta-alerts/meta-alert.e2e-spec.ts  |  248 +-
 .../alerts-list/meta-alerts/meta-alert.po.ts|   21 +-
 .../save-search/save-search.e2e-spec.ts |   93 +-
 .../alerts-list/tree-view/tree-view.e2e-spec.ts |  208 +-
 .../e2e/alerts-list/tree-view/tree-view.po.ts   |  170 +-
 .../metron-alerts/e2e/login/login.e2e-spec.ts   |   36 +-
 .../metron-alerts/e2e/login/login.po.ts |   44 +-
 .../e2e/utils/clean_metron_update_table.ts  |   52 +
 .../metron-alerts/e2e/utils/e2e_util.ts |  223 +-
 .../metron-alerts/package-lock.json | 6163 +++---
 metron-interface/metron-alerts/package.json |8 +-
 .../metron-alerts/protractor.conf.js|   31 +-
 .../alert-details/alert-details.component.ts|   49 +-
 .../alert-filters/alert-filters.component.ts|2 +-
 .../alerts-list/alerts-list.component.html  |8 +-
 .../alerts-list/alerts-list.component.scss  |3 +-
 .../alerts/alerts-list/alerts-list.component.ts |4 +-
 .../tree-view/tree-view.component.html  |4 +-
 .../configure-rows/configure-rows.component.ts  |2 +-
 .../saved-searches.component.html   |4 +-
 .../app/shared/group-by/group-by.component.html |2 +-
 .../shared/time-range/time-range.component.html |   12 +-
 .../shared/time-range/time-range.component.scss |4 +
 .../metron-alerts/src/app/utils/constants.ts|1 +
 .../src/environments/environment.e2e.ts |3 +-
 .../src/environments/environment.js |6 +-
 .../src/environments/environment.prod.ts|3 +-
 .../src/environments/environment.ts |3 +-
 metron-interface/metron-alerts/src/index.html   |2 +-
 metron-interface/metron-alerts/src/styles.scss  |   10 +
 44 files changed, 6761 insertions(+), 1974 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e0fc4758/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
--
diff --cc 
metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
index 58d581f,e3e48ab..9d15e93
--- 
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
+++ 
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
@@@ -148,15 -119,29 +148,35 @@@ def build_global_config_patch(params, p
  "op": "add",
  "path": "/threat.triage.score.field",
  "value": "{{threat_triage_score_field}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchSize",
+ "value": "{{enrichment_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/enrichment.writer.batchTimeout",
+ "value": "{{enrichment_kafka_writer_batch_timeout}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchSize",
+ "value": "{{profiler_kafka_writer_batch_size}}"
+ },
+ {
+ "op": "add",
+ "path": "/profiler.writer.batchTimeout",
+ "value": "{{profiler_kafka_writer_batch_timeout}}"
  }
 -  ]
"""
 +  patch_template = ambari_format(
 +  """
 +  [
 +{indexing_patches},
 +

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes apache/metron#1075

2018-06-22 Thread nickallen

Repository: metron
Updated Branches:
  refs/heads/feature/METRON-1416-upgrade-solr 6159c6f99 -> 975923e8d


Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes 
apache/metron#1075


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/975923e8
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/975923e8
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/975923e8

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 975923e8d98ccd410c065ec5514f59f5ef89b260
Parents: 6159c6f
Author: nickwallen 
Authored: Fri Jun 22 11:00:05 2018 -0400
Committer: nickallen 
Committed: Fri Jun 22 11:00:05 2018 -0400

--
 metron-analytics/metron-maas-common/pom.xml |  2 +-
 metron-analytics/metron-maas-service/pom.xml|  2 +-
 metron-analytics/metron-profiler-client/pom.xml |  2 +-
 metron-analytics/metron-profiler-common/pom.xml |  2 +-
 metron-analytics/metron-profiler/pom.xml|  2 +-
 metron-analytics/metron-statistics/pom.xml  |  2 +-
 metron-analytics/pom.xml|  2 +-
 metron-contrib/metron-docker/pom.xml|  2 +-
 metron-contrib/metron-performance/pom.xml   |  2 +-
 metron-contrib/pom.xml  |  2 +-
 metron-deployment/Kerberos-manual-setup.md  |  4 +--
 metron-deployment/amazon-ec2/conf/defaults.yml  |  2 +-
 .../ansible/playbooks/docker_probe_install.yml  |  2 +-
 .../roles/ambari_master/defaults/main.yml   |  2 +-
 .../roles/metron_pcapservice/defaults/main.yml  |  2 +-
 .../centos6/ansible/inventory/group_vars/all|  2 +-
 .../ubuntu14/ansible/inventory/group_vars/all   |  2 +-
 .../ambari/elasticsearch-mpack/pom.xml  |  4 +--
 .../packaging/ambari/metron-mpack/pom.xml   |  4 +--
 .../CURRENT/configuration/metron-rest-env.xml   | 12 
 .../CURRENT/package/scripts/metron_service.py   | 10 +++
 .../package/scripts/params/params_linux.py  |  2 ++
 .../METRON/CURRENT/themes/metron_theme.json | 20 +
 .../metron-mpack/src/main/resources/mpack.json  |  2 +-
 .../packaging/docker/deb-docker/pom.xml |  4 +--
 .../packaging/docker/rpm-docker/pom.xml |  4 +--
 metron-deployment/pom.xml   |  2 +-
 metron-interface/metron-alerts/README.md|  6 +++-
 metron-interface/metron-alerts/package.json |  2 +-
 metron-interface/metron-alerts/pom.xml  |  2 +-
 .../table-view/table-view.component.ts  |  2 +-
 .../meta-alerts/meta-alerts.component.html  |  6 ++--
 .../alerts/meta-alerts/meta-alerts.component.ts |  4 +--
 .../metron-alerts/src/app/model/filter.ts   |  4 +--
 metron-interface/metron-config/package.json |  2 +-
 metron-interface/metron-config/pom.xml  |  2 +-
 .../metron-config/scripts/package.json  |  2 +-
 metron-interface/metron-rest-client/pom.xml |  2 +-
 metron-interface/metron-rest/pom.xml|  2 +-
 .../src/main/resources/application.yml  |  2 +-
 metron-interface/pom.xml|  2 +-
 metron-platform/Performance-tuning-guide.md |  4 +--
 metron-platform/README.md   |  2 +-
 metron-platform/elasticsearch-shaded/pom.xml|  2 +-
 metron-platform/metron-api/pom.xml  |  2 +-
 metron-platform/metron-common/README.md |  3 +-
 metron-platform/metron-common/pom.xml   |  2 +-
 .../src/main/scripts/cluster_info.py|  2 +-
 metron-platform/metron-data-management/pom.xml  |  2 +-
 metron-platform/metron-elasticsearch/pom.xml|  2 +-
 .../dao/ElasticsearchMetaAlertDao.java  | 30 
 .../dao/ElasticsearchMetaAlertDaoTest.java  |  8 ++
 metron-platform/metron-enrichment/pom.xml   |  2 +-
 metron-platform/metron-hbase-client/pom.xml |  2 +-
 metron-platform/metron-hbase/pom.xml|  2 +-
 metron-platform/metron-indexing/pom.xml |  2 +-
 metron-platform/metron-integration-test/pom.xml |  2 +-
 metron-platform/metron-management/pom.xml   |  2 +-
 metron-platform/metron-parsers/pom.xml  |  2 +-
 metron-platform/metron-pcap-backend/pom.xml |  2 +-
 .../src/main/scripts/pcap_zeppelin_run.sh   |  2 +-
 metron-platform/metron-pcap/pom.xml |  2 +-
 metron-platform/metron-solr/pom.xml |  2 +-
 .../metron-storm-kafka-override/pom.xml |  2 +-
 metron-platform/metron-storm-kafka/pom.xml  |  2 +-
 metron-platform/metron-test-utilities/pom.xml   |  2 +-
 metron-platform/metron-writer/pom.xml   |  2 +-
 metron-platform/metron-zookeeper/pom.xml|  2 +-
 metron-platform/pom.xml |  2 +-
 metron-stellar/pom.xml  |  2 +-
 .../stellar-3rd-party-example/pom.xml   |  2 +-
 metron-stellar/stellar-common/README.md |  4 +--
 metron-stellar/stellar-common/pom.xml

[2/2] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-15 Thread cestella

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a89a72c3
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a89a72c3
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a89a72c3

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: a89a72c3b2ceb5066fd7a310636507ce274c66ad
Parents: 10271c4 b081e80
Author: cstella 
Authored: Fri Jun 15 20:32:18 2018 -0400
Committer: cstella 
Committed: Fri Jun 15 20:32:18 2018 -0400

--
 .../alert-details/alert-details.component.html  |  4 +--
 .../alert-details/alert-details.component.ts| 24 ++---
 .../alerts-list/alerts-list.component.html  |  4 +--
 .../alerts/alerts-list/alerts-list.component.ts | 13 ++
 .../src/app/alerts/alerts-list/query-builder.ts |  5 ++--
 .../table-view/table-view.component.html| 18 ++---
 .../table-view/table-view.component.ts  | 19 --
 .../tree-view/tree-view.component.html  | 16 ++--
 .../tree-view/tree-view.component.ts| 27 +---
 .../meta-alerts/meta-alerts.component.html  |  2 +-
 .../alerts/meta-alerts/meta-alerts.component.ts | 11 +---
 .../src/app/model/group-request.ts  |  2 +-
 .../src/app/service/global-config.service.ts| 16 +---
 .../metron-alerts/src/app/utils/constants.ts|  3 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  |  5 ++--
 15 files changed, 120 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alert-details/alert-details.component.ts
index ffd7dd0,c939f04..39d47ac
--- 
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,8 -30,8 +30,9 @@@ 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_SENSOR_TYPE} from '../../utils/constants';
 -import {META_ALERTS_INDEX, META_ALERTS_SENSOR_TYPE} from 
'../../utils/constants';
 +import {CommentAddRemoveRequest} from 
"../../model/comment-add-remove-request";
++import {META_ALERTS_SENSOR_TYPE} from '../../utils/constants';
+ import { GlobalConfigService } from '../../service/global-config.service';
  
  export enum AlertState {
NEW, OPEN, ESCALATE, DISMISS, RESOLVE

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
--
diff --cc 
metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
index 98459db,4496e37..07f7015
--- 
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
@@@ -36,10 -36,10 +36,10 @@@ import {AlertSearchDirective} from '../
  import {SearchResponse} from '../../model/search-response';
  import {ElasticsearchUtils} from '../../utils/elasticsearch-utils';
  import {Filter} from '../../model/filter';
- import {THREAT_SCORE_FIELD_NAME, TIMESTAMP_FIELD_NAME, ALL_TIME} from 
'../../utils/constants';
+ import {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';

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.html
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts
--

http://git-wip-us.apache.org/repos/asf/metron/blob/a89a72c3/metron-interface/metron-alerts/src/app/utils/constants.ts

[3/3] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-14 Thread cestella

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0e484279
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0e484279
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0e484279

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 0e4842799f8a3afa15074cb121bdbd205e50fb58
Parents: 4c4452e 828ab71
Author: cstella 
Authored: Thu Jun 14 12:18:43 2018 -0400
Committer: cstella 
Committed: Thu Jun 14 12:18:43 2018 -0400

--
 NOTICE  |   6 +
 dependencies_with_url.csv   |   4 +
 metron-platform/metron-api/pom.xml  |   4 -
 .../parsers/topology/ParserTopologyBuilder.java |   2 +-
 .../metron-storm-kafka-override/pom.xml |  83 -
 .../KafkaSpoutRetryExponentialBackoff.java  | 336 +++
 .../storm/kafka/spout/internal/Timer.java   |   9 +-
 metron-platform/metron-storm-kafka/pom.xml  |   5 -
 pom.xml |   4 +-
 site/documentation/index.md |  14 +-
 10 files changed, 442 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/dependencies_with_url.csv
--

http://git-wip-us.apache.org/repos/asf/metron/blob/0e484279/pom.xml
--

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-12 Thread cestella

Repository: metron
Updated Branches:
  refs/heads/feature/METRON-1416-upgrade-solr 476856192 -> 4c4452e59


Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4c4452e5
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4c4452e5
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4c4452e5

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 4c4452e59c93306a049e6879f7b6fed2ee86c74e
Parents: 4768561
Author: cstella 
Authored: Tue Jun 12 21:40:01 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 21:40:01 2018 -0400

--
 .../dao/ElasticsearchSearchDao.java |  30 +--
 .../ElasticsearchMetaAlertIntegrationTest.java  | 223 ++-
 2 files changed, 134 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
index 5725534..5cd0a4d 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java
@@ -443,22 +443,24 @@ public class ElasticsearchSearchDao implements SearchDao {
   private List getGroupResults(GroupRequest groupRequest, int 
index, Aggregations aggregations, Map commonColumnMetadata) {
 List groups = groupRequest.getGroups();
 String field = groups.get(index).getField();
-Terms terms = aggregations.get(getGroupByAggregationName(field));
 List searchResultGroups = new ArrayList<>();
-for(Bucket bucket: terms.getBuckets()) {
-  GroupResult groupResult = new GroupResult();
-  groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
-  groupResult.setTotal(bucket.getDocCount());
-  Optional scoreField = groupRequest.getScoreField();
-  if (scoreField.isPresent()) {
-Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
-groupResult.setScore(score.getValue());
-  }
-  if (index < groups.size() - 1) {
-groupResult.setGroupedBy(groups.get(index + 1).getField());
-groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+if(aggregations != null) {
+  Terms terms = aggregations.get(getGroupByAggregationName(field));
+  for (Bucket bucket : terms.getBuckets()) {
+GroupResult groupResult = new GroupResult();
+groupResult.setKey(formatKey(bucket.getKey(), 
commonColumnMetadata.get(field)));
+groupResult.setTotal(bucket.getDocCount());
+Optional scoreField = groupRequest.getScoreField();
+if (scoreField.isPresent()) {
+  Sum score = 
bucket.getAggregations().get(getSumAggregationName(scoreField.get()));
+  groupResult.setScore(score.getValue());
+}
+if (index < groups.size() - 1) {
+  groupResult.setGroupedBy(groups.get(index + 1).getField());
+  groupResult.setGroupResults(getGroupResults(groupRequest, index + 1, 
bucket.getAggregations(), commonColumnMetadata));
+}
+searchResultGroups.add(groupResult);
   }
-  searchResultGroups.add(groupResult);
 }
 return searchResultGroups;
   }

http://git-wip-us.apache.org/repos/asf/metron/blob/4c4452e5/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
index 99f0490..224ec56 100644
--- 
a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
+++ 
b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java
@@ -1,20 +1,21 @@
+
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for

[1/2] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-12 Thread cestella

Repository: metron
Updated Branches:
  refs/heads/feature/METRON-1416-upgrade-solr 0717cfc25 -> 476856192


Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/e7233b0f
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/e7233b0f
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/e7233b0f

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: e7233b0f82f372e6b1339de56a115fa7e4581f07
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Tue Jun 12 09:46:46 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 28 +
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 129 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/e7233b0f/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-11 Thread cestella

Repository: metron
Updated Branches:
  refs/heads/feature/METRON-1416-upgrade-solr 417088763 -> 0717cfc25


Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0717cfc2
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0717cfc2
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0717cfc2

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 0717cfc25acc80b80121b424bed93db7014a1376
Parents: 4170887
Author: cstella 
Authored: Mon Jun 11 21:41:06 2018 -0400
Committer: cstella 
Committed: Mon Jun 11 21:41:06 2018 -0400

--
 .../org/apache/metron/common/Constants.java |  1 +
 .../elasticsearch/dao/ElasticsearchDao.java |  4 ++
 .../dao/ElasticsearchMetaAlertDao.java  | 30 +-
 .../dao/ElasticsearchMetaAlertUpdateDao.java|  4 +-
 .../indexing/dao/metaalert/MetaAlertConfig.java | 43 
 .../AbstractLuceneMetaAlertUpdateDao.java   |  3 ++
 .../dao/metaalert/MetaAlertIntegrationTest.java |  2 +-
 .../AbstractLuceneMetaAlertUpdateDaoTest.java   | 26 +---
 .../metron/solr/dao/SolrMetaAlertDao.java   | 29 +
 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 15 ---
 .../metron/solr/dao/SolrMetaAlertUpdateDao.java |  2 +-
 .../SolrMetaAlertIntegrationTest.java   | 28 +
 12 files changed, 128 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
--
diff --git 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
index f74660c..4a8bea2 100644
--- 
a/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
+++ 
b/metron-platform/metron-common/src/main/java/org/apache/metron/common/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
   public static final long DEFAULT_CONFIGURED_BOLT_TIMEOUT = 5000;
   public static final String SENSOR_TYPE = "source.type";
   public static final String SENSOR_TYPE_FIELD_PROPERTY = "source.type.field";
+  public static final String THREAT_SCORE_FIELD_PROPERTY = 
"threat.triage.score.field";
   public static final String ENRICHMENT_TOPIC = "enrichments";
   public static final String INDEXING_TOPIC = "indexing";
   public static final String ERROR_STREAM = "error";

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
index eae0a39..3eb86ce 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java
@@ -85,6 +85,10 @@ public class ElasticsearchDao implements IndexDao {
 //uninitialized.
   }
 
+  public AccessConfig getAccessConfig() {
+return accessConfig;
+  }
+
   @Override
   public synchronized void init(AccessConfig config) {
 if (this.client == null) {

http://git-wip-us.apache.org/repos/asf/metron/blob/0717cfc2/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
--
diff --git 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
index f73a640..649077e 100644
--- 
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
+++ 
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java
@@ -68,6 +68,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.apache.metron.common.Constants.GUID;
@@ -83,10 +84,8 @@ public class ElasticsearchMetaAlertDao implements 
MetaAlertDao {
   public static final String THREAT_TRIAGE_FIELD = 
MetaAlertConstants.THREAT_FIELD_DEFAULT

[50/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-06-11 Thread cestella

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/41708876
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/41708876
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/41708876

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 41708876336d009b3a2ff2c533bdf0294af1477b
Parents: f241f87 32d132b
Author: cstella 
Authored: Mon Jun 11 17:50:48 2018 -0400
Committer: cstella 
Committed: Mon Jun 11 17:50:48 2018 -0400

--
 KEYS|59 +
 Upgrading.md| 2 +-
 dev-utilities/release-utils/metron-rc-check |77 +-
 .../release-utils/validate-jira-for-release |75 +-
 metron-analytics/metron-maas-common/pom.xml | 2 +-
 metron-analytics/metron-maas-service/pom.xml| 2 +-
 metron-analytics/metron-profiler-client/pom.xml | 2 +-
 .../profiler/client/stellar/GetProfileTest.java | 3 +-
 .../client/stellar/ProfilerFunctionsTest.java   |15 +-
 metron-analytics/metron-profiler-common/pom.xml | 2 +-
 metron-analytics/metron-profiler/README.md  |15 +
 metron-analytics/metron-profiler/pom.xml| 2 +-
 .../src/main/flux/profiler/remote.yaml  | 3 +-
 metron-analytics/metron-statistics/pom.xml  | 2 +-
 .../StellarStatisticsFunctionsTest.java | 5 +-
 .../sampling/SamplerFunctionsTest.java  | 3 +-
 metron-analytics/pom.xml| 2 +-
 metron-contrib/metron-docker/pom.xml| 2 +-
 metron-contrib/metron-performance/pom.xml   | 2 +-
 metron-contrib/pom.xml  | 2 +-
 metron-deployment/Kerberos-manual-setup.md  | 8 +-
 metron-deployment/README.md |22 +-
 metron-deployment/amazon-ec2/conf/defaults.yml  | 2 +-
 .../ansible/playbooks/docker_probe_install.yml  | 2 +-
 .../roles/ambari_master/defaults/main.yml   | 2 +-
 .../roles/metron_pcapservice/defaults/main.yml  | 2 +-
 metron-deployment/development/centos6/README.md | 8 +-
 .../centos6/ansible/inventory/group_vars/all| 2 +-
 .../development/ubuntu14/README.md  | 6 +-
 .../ubuntu14/ansible/inventory/group_vars/all   | 2 +-
 .../ambari/elasticsearch-mpack/pom.xml  | 4 +-
 .../packaging/ambari/metron-mpack/pom.xml   | 4 +-
 .../CURRENT/package/files/bro_index.template| 2 +-
 .../CURRENT/package/files/error_index.template  | 2 +-
 .../package/files/metaalert_index.template  | 2 +-
 .../CURRENT/package/files/snort_index.template  | 2 +-
 .../CURRENT/package/files/yaf_index.template| 2 +-
 .../CURRENT/package/scripts/metron_service.py   | 5 +
 .../metron-mpack/src/main/resources/mpack.json  | 2 +-
 .../packaging/docker/deb-docker/pom.xml | 4 +-
 .../packaging/docker/rpm-docker/pom.xml | 4 +-
 metron-deployment/pom.xml   | 2 +-
 .../e2e/mock-data/alerts_ui_e2e_index.template  | 2 +-
 metron-interface/metron-alerts/package.json | 2 +-
 metron-interface/metron-alerts/pom.xml  | 2 +-
 .../alert-details/alert-details.component.ts| 2 +-
 .../alerts/alerts-list/alerts-list.component.ts | 2 +-
 .../table-view/table-view.component.html|10 +-
 .../table-view/table-view.component.ts  | 2 +-
 .../metron-alerts/src/app/model/alert-source.ts | 2 +-
 .../src/app/service/global-config.service.ts|10 +-
 metron-interface/metron-config/package.json | 2 +-
 metron-interface/metron-config/pom.xml  | 2 +-
 .../metron-config/scripts/package.json  | 2 +-
 metron-interface/metron-rest-client/pom.xml | 2 +-
 metron-interface/metron-rest/pom.xml| 2 +-
 .../rest/service/impl/SearchServiceImpl.java|10 +-
 .../src/main/resources/application.yml  | 2 +-
 .../metron-rest/src/main/scripts/metron-rest.sh | 5 +-
 .../MetaAlertControllerIntegrationTest.java | 4 +-
 .../service/impl/SearchServiceImplTest.java | 3 +-
 metron-interface/pom.xml| 2 +-
 metron-platform/Performance-tuning-guide.md | 4 +-
 metron-platform/README.md   | 2 +-
 metron-platform/elasticsearch-shaded/pom.xml| 2 +-
 metron-platform/metron-api/pom.xml  | 2 +-
 metron-platform/metron-common/README.md | 5 +
 metron-platform/metron-common/pom.xml   | 2 +-
 .../org/apache/metron/common/Constants.java | 1 +
 .../metron/common/bolt/ConfiguredBolt.java  |14 +-
 .../common/bolt/ConfiguredEnrichmentBolt.java   |11 +-
 .../common/bolt/ConfiguredIndexingBolt.java |13 +-

[13/13] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-05-18 Thread leet

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/eb336665
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/eb336665
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/eb336665

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: eb3366656de643e7436f7cf280561b94f3921c65
Parents: bc16e68 71a015f
Author: justinjleet 
Authored: Fri May 18 14:21:24 2018 -0400
Committer: justinjleet 
Committed: Fri May 18 14:21:24 2018 -0400

--
 dependencies_with_url.csv   |  56 ++-
 .../metron/profiler/ProfileMeasurement.java |   3 +-
 .../apache/metron/profiler/ProfilePeriod.java   |   3 +-
 .../metron/profiler/ProfileMeasurementTest.java | 108 +
 .../metron/profiler/ProfilePeriodTest.java  |  49 +++
 metron-analytics/metron-profiler/README.md  |  62 ++-
 .../src/main/config/profiler.properties |  13 +
 .../src/main/flux/profiler/remote.yaml  |   3 +
 .../zookeeper/profile-with-stats/profiler.json  |  12 +
 .../integration/ProfilerIntegrationTest.java|  83 +++-
 .../metron/statistics/StatisticsProvider.java   |   6 +-
 .../statistics/sampling/UniformSampler.java |   5 +-
 metron-deployment/amazon-ec2/ansible.cfg|   5 +-
 .../roles/ambari_config/vars/single_node_vm.yml |   1 +
 metron-deployment/packaging/ambari/.gitignore   |   2 +
 .../enrichment-splitjoin.properties.j2  |  63 ---
 .../templates/enrichment-unified.properties.j2  |  60 ---
 .../package/templates/profiler.properties.j2|  13 +
 metron-interface/metron-alerts/README.md|   6 +
 metron-interface/metron-alerts/proxy.conf.json  |   9 -
 .../alert-details/alert-details.component.ts|   2 +-
 .../alert-details/alerts-details.routing.ts |   2 +-
 .../alerts/alerts-list/alerts-list.component.ts |  25 +-
 .../table-view/table-view.component.ts  |  32 +-
 .../tree-view/tree-view.component.ts|  17 +-
 .../alerts/meta-alerts/meta-alerts.component.ts |  20 +-
 .../metron-alerts/src/app/app.module.ts |   4 +-
 .../src/app/model/search-request.ts |   2 +-
 .../src/app/service/authentication.service.ts   |  10 +-
 .../service/elasticsearch-localstorage-impl.ts  |   6 +-
 .../src/app/service/global-config.service.ts|  50 +++
 .../src/app/service/update.service.ts   |  10 +-
 .../metron-alerts/src/app/utils/constants.ts|   4 +-
 .../metron-alerts/src/app/utils/utils.ts|   7 +-
 metron-interface/metron-config/proxy.conf.json  |   4 +-
 metron-interface/metron-rest/README.md  |   2 +
 metron-interface/metron-rest/pom.xml|  17 +-
 .../metron/rest/MetronRestApplication.java  |   7 +
 .../apache/metron/rest/MetronRestConstants.java |   2 +
 .../metron/rest/config/JpaConfiguration.java|   6 +-
 .../metron/rest/config/WebSecurityConfig.java   |  19 +-
 .../rest/service/impl/SearchServiceImpl.java|  42 +-
 .../src/main/resources/application-test.yml |   2 +-
 .../src/main/resources/application.yml  |   2 +-
 .../metron-rest/src/main/scripts/metron-rest.sh |   2 +-
 .../SearchControllerIntegrationTest.java|   9 +-
 .../service/impl/SearchServiceImplTest.java |  60 ++-
 metron-platform/metron-common/README.md |  15 +-
 .../org/apache/metron/common/Constants.java |  10 +-
 .../configuration/SensorParserConfig.java   | 410 +++
 .../configuration/profiler/ProfileResult.java   |   4 +-
 .../profiler/ProfileResultExpressions.java  |   4 +-
 .../profiler/ProfileTriageExpressions.java  |   3 +-
 .../configuration/profiler/ProfilerConfig.java  |  12 +-
 .../common/utils/CompressionStrategies.java | 100 +
 .../common/utils/CompressionStrategy.java   |  52 +++
 .../apache/metron/common/utils/SerDeUtils.java  |   7 +-
 .../profiler/ProfilerConfigTest.java|  85 +++-
 .../common/utils/CompressionUtilsTest.java  |  62 +++
 .../nonbulk/geo/GeoEnrichmentLoader.java|  70 +++-
 .../nonbulk/geo/GeoEnrichmentLoaderTest.java|  40 +-
 .../parsers/topology/ParserTopologyBuilder.java | 139 ---
 .../parsers/topology/ParserTopologyCLI.java | 147 +--
 .../components/ParserTopologyComponent.java |  80 ++--
 .../parsers/topology/ParserTopologyCLITest.java | 122 --
 ...pleHbaseEnrichmentWriterIntegrationTest.java |  69 ++--
 .../integration/WriterBoltIntegrationTest.java  | 382 +++--
 .../apache/metron/writer/kafka/KafkaWriter.java |   5 +
 .../stellar/common/utils/BloomFilter.java   |   8 +-
 .../metron/stellar/common/utils/SerDeUtils.java |  16 +-
 .../common/utils/StellarProcessorUtils.java | 101 -
 .../metron/stellar/dsl/functions/Ordinal.java   |  36 ++
 .../stellar/dsl/functions/OrdinalFunctions.java |  48 ++-

[5/5] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-02-08 Thread cestella

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/9b25084c
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/9b25084c
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/9b25084c

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 9b25084c83e484b8119caf134a473fcb6306fa6a
Parents: 67d6c0e fa86663
Author: cstella 
Authored: Thu Feb 8 17:22:12 2018 -0500
Committer: cstella 
Committed: Thu Feb 8 17:22:12 2018 -0500

--
 .../roles/ambari_common/defaults/main.yml   |   6 +-
 .../ambari_common/tasks/elasticsearch-repo.yml  |  40 --
 .../ansible/roles/ambari_common/tasks/main.yml  |   1 -
 .../roles/ambari_config/tasks/dependencies.yml  |  11 +-
 .../packaging/ambari/metron-mpack/README.md |  14 --
 .../ELASTICSEARCH/5.6.2/repos/repoinfo.xml  |  13 ++
 .../KIBANA/5.6.2/repos/repoinfo.xml |  19 +++
 .../5.6.2/configuration/elastic-jvm-options.xml | 144 +++
 .../5.6.2/configuration/elastic-sysconfig.xml   |  12 +-
 .../ELASTICSEARCH/5.6.2/metainfo.xml|   1 +
 .../5.6.2/package/scripts/elastic_commands.py   |  13 ++
 .../5.6.2/package/scripts/params.py |   3 +
 site/documentation/index.md |   2 +-
 13 files changed, 202 insertions(+), 77 deletions(-)
--

[8/8] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

2018-02-07 Thread cestella

Merge branch 'master' into feature/METRON-1416-upgrade-solr


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/67d6c0ed
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/67d6c0ed
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/67d6c0ed

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 67d6c0edd731f528af759ca11de875cbf77f6b2c
Parents: f525dcf 38b7d5e
Author: cstella 
Authored: Wed Feb 7 11:43:34 2018 -0500
Committer: cstella 
Committed: Wed Feb 7 11:43:34 2018 -0500

--
 .../roles/java_jdk/tasks/install_jdk_ubuntu.yml |   2 +-
 .../packaging/ambari/metron-mpack/README.md |  14 +
 metron-deployment/scripts/platform-info.sh  |   4 +-
 .../advanced-config-form.component.html |   2 +-
 .../advanced-config-form.component.spec.ts  |  34 +++
 .../advanced-config-form.component.ts   |  20 +-
 .../src/main/config/rest_application.yml|   3 +-
 .../apache/metron/rest/MetronRestConstants.java |   6 +-
 .../metron/rest/controller/StormController.java |  81 +++--
 .../metron/rest/service/StormAdminService.java  |   4 +-
 .../service/impl/StormAdminServiceImpl.java |   8 +-
 .../rest/service/impl/StormCLIWrapper.java  |  16 +-
 .../src/main/resources/application-test.yml |   3 +-
 .../src/main/resources/application-vagrant.yml  |   4 +-
 .../StormControllerIntegrationTest.java | 102 ---
 .../rest/mock/MockStormCLIClientWrapper.java|  93 --
 .../metron/rest/mock/MockStormRestTemplate.java |  22 +-
 .../service/impl/StormAdminServiceImplTest.java |   8 +-
 .../rest/service/impl/StormCLIWrapperTest.java  |  17 +-
 metron-platform/metron-management/README.md |  32 +-
 .../metron/management/ShellFunctions.java   | 302 ---
 .../metron/management/ShellFunctionsTest.java   | 171 ---
 metron-stellar/stellar-common/NOTICE|   6 +
 metron-stellar/stellar-common/README.md |  74 +
 metron-stellar/stellar-common/pom.xml   |   6 +
 .../src/main/assembly/assembly.xml  |   2 +-
 .../src/main/assembly/stand-alone-assembly.xml  |  57 
 .../stellar/common/shell/cli/PausableInput.java |  23 +-
 .../stellar/dsl/functions/ShellFunctions.java   | 301 ++
 .../src/main/scripts/deployed/stellar   |  36 +++
 .../src/main/scripts/stand-alone/stellar|  21 ++
 .../stellar-common/src/main/scripts/stellar |  36 ---
 .../dsl/functions/ShellFunctionsTest.java   | 176 +++
 33 files changed, 998 insertions(+), 688 deletions(-)
--

[22/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[21/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[34/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[25/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[24/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[27/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[05/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[42/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[11/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[47/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[45/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[44/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[51/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes apache/metron#1075

[53/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[41/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[08/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[09/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[40/53] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[9/9] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr (nickwallen) closes apache/metron#1075

[2/2] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[3/3] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[1/2] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[50/50] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[13/13] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[5/5] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

[8/8] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

29 matches

Site Navigation

Mail list logo

Footer information