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 <n...@nickallen.org> Authored: Fri Jun 22 11:00:05 2018 -0400 Committer: nickallen <nickal...@apache.org> 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 | 2 +- site-book/pom.xml | 2 +- 77 files changed, 141 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-maas-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-common/pom.xml b/metron-analytics/metron-maas-common/pom.xml index 235d3af..e7160fe 100644 --- a/metron-analytics/metron-maas-common/pom.xml +++ b/metron-analytics/metron-maas-common/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-analytics</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-maas-common</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-maas-service/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml index c31caea..771f247 100644 --- a/metron-analytics/metron-maas-service/pom.xml +++ b/metron-analytics/metron-maas-service/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-analytics</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-maas-service</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-profiler-client/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler-client/pom.xml b/metron-analytics/metron-profiler-client/pom.xml index 68e38b4..3a66db4 100644 --- a/metron-analytics/metron-profiler-client/pom.xml +++ b/metron-analytics/metron-profiler-client/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-analytics</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-profiler-client</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-profiler-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler-common/pom.xml b/metron-analytics/metron-profiler-common/pom.xml index ee21086..928515f 100644 --- a/metron-analytics/metron-profiler-common/pom.xml +++ b/metron-analytics/metron-profiler-common/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>metron-analytics</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-profiler-common</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-profiler/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler/pom.xml b/metron-analytics/metron-profiler/pom.xml index 403e998..ea58021 100644 --- a/metron-analytics/metron-profiler/pom.xml +++ b/metron-analytics/metron-profiler/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-analytics</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-profiler</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/metron-statistics/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-statistics/pom.xml b/metron-analytics/metron-statistics/pom.xml index bde76ab..5f43227 100644 --- a/metron-analytics/metron-statistics/pom.xml +++ b/metron-analytics/metron-statistics/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>metron-analytics</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-statistics</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-analytics/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/pom.xml b/metron-analytics/pom.xml index c004877..b6460ea 100644 --- a/metron-analytics/pom.xml +++ b/metron-analytics/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Stream analytics for Metron</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-contrib/metron-docker/pom.xml ---------------------------------------------------------------------- diff --git a/metron-contrib/metron-docker/pom.xml b/metron-contrib/metron-docker/pom.xml index 5f23c1e..6834066 100644 --- a/metron-contrib/metron-docker/pom.xml +++ b/metron-contrib/metron-docker/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-contrib</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Metron Docker</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-contrib/metron-performance/pom.xml ---------------------------------------------------------------------- diff --git a/metron-contrib/metron-performance/pom.xml b/metron-contrib/metron-performance/pom.xml index c511445..0d596af 100644 --- a/metron-contrib/metron-performance/pom.xml +++ b/metron-contrib/metron-performance/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-contrib</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Performance Testing Utilities</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-contrib/pom.xml ---------------------------------------------------------------------- diff --git a/metron-contrib/pom.xml b/metron-contrib/pom.xml index fba2441..9abd640 100644 --- a/metron-contrib/pom.xml +++ b/metron-contrib/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Contributed Tooling for Metron</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/Kerberos-manual-setup.md ---------------------------------------------------------------------- diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md index 0b84236..ecda858 100644 --- a/metron-deployment/Kerberos-manual-setup.md +++ b/metron-deployment/Kerberos-manual-setup.md @@ -568,7 +568,7 @@ New settings have been added to configure the Elasticsearch client. By default t Add the es settings to global.json ``` -/usr/metron/0.5.0/config/zookeeper/global.json -> +/usr/metron/0.5.1/config/zookeeper/global.json -> "es.client.settings" : { "es.client.class" : "org.elasticsearch.xpack.client.PreBuiltXPackTransportClient", @@ -728,7 +728,7 @@ The last step before restarting the topology is to create a custom X-Pack shaded Once you've built the elasticsearch-xpack-shaded-5.6.2.jar, it needs to be made available to Storm when you submit the topology. Create a contrib directory for indexing and put the jar file in this directory. ``` -/usr/metron/0.5.0/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar +/usr/metron/0.5.1/indexing_contrib/elasticsearch-xpack-shaded-5.6.2.jar ``` Now you can restart the Elasticsearch topology. Note, you should perform this step manually, as follows. http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/amazon-ec2/conf/defaults.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/amazon-ec2/conf/defaults.yml b/metron-deployment/amazon-ec2/conf/defaults.yml index 2adf572..e572da1 100644 --- a/metron-deployment/amazon-ec2/conf/defaults.yml +++ b/metron-deployment/amazon-ec2/conf/defaults.yml @@ -58,7 +58,7 @@ num_partitions: 3 retention_in_gb: 25 # metron variables -metron_version: 0.5.0 +metron_version: 0.5.1 metron_directory: /usr/metron/{{ metron_version }} pcapservice_port: 8081 http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/ansible/playbooks/docker_probe_install.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/playbooks/docker_probe_install.yml b/metron-deployment/ansible/playbooks/docker_probe_install.yml index 03eb9bc..3de212e 100644 --- a/metron-deployment/ansible/playbooks/docker_probe_install.yml +++ b/metron-deployment/ansible/playbooks/docker_probe_install.yml @@ -30,7 +30,7 @@ - hosts: sensors vars: - metron_version: 0.5.0 + metron_version: 0.5.1 metron_directory: /usr/metron/{{ metron_version }} bro_version: "2.5.2" fixbuf_version: "1.7.1" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/ansible/roles/ambari_master/defaults/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml index 754f8ba..1b8b847 100644 --- a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml +++ b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml @@ -16,7 +16,7 @@ # --- ambari_server_mem: 2048 -ambari_mpack_version: 0.5.0.0 +ambari_mpack_version: 0.5.1.0 metron_mpack_name: metron_mpack-{{ ambari_mpack_version }}.tar.gz metron_mpack_path: "{{ playbook_dir }}/../../packaging/ambari/metron-mpack/target/{{ metron_mpack_name }}" elasticsearch_mpack_name: elasticsearch_mpack-{{ ambari_mpack_version }}.tar.gz http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/ansible/roles/metron_pcapservice/defaults/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/metron_pcapservice/defaults/main.yml b/metron-deployment/ansible/roles/metron_pcapservice/defaults/main.yml index 1d0af7a..b129b82 100644 --- a/metron-deployment/ansible/roles/metron_pcapservice/defaults/main.yml +++ b/metron-deployment/ansible/roles/metron_pcapservice/defaults/main.yml @@ -15,7 +15,7 @@ # limitations under the License. # --- -metron_version: 0.5.0 +metron_version: 0.5.1 metron_directory: /usr/metron/{{ metron_version }} pcapservice_jar_name: metron-api-{{ metron_version }}.jar pcapservice_jar_src: "{{ playbook_dir }}/../../../metron-platform/metron-api/target/{{ pcapservice_jar_name }}" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/development/centos6/ansible/inventory/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/development/centos6/ansible/inventory/group_vars/all b/metron-deployment/development/centos6/ansible/inventory/group_vars/all index 2f2068d..95792c3 100644 --- a/metron-deployment/development/centos6/ansible/inventory/group_vars/all +++ b/metron-deployment/development/centos6/ansible/inventory/group_vars/all @@ -35,7 +35,7 @@ threatintel_hbase_table: threatintel enrichment_hbase_table: enrichment # metron -metron_version: 0.5.0 +metron_version: 0.5.1 metron_directory: /usr/metron/{{ metron_version }} bro_version: "2.5.2" fixbuf_version: "1.7.1" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/development/ubuntu14/ansible/inventory/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/development/ubuntu14/ansible/inventory/group_vars/all b/metron-deployment/development/ubuntu14/ansible/inventory/group_vars/all index dce772b..6276fc0 100644 --- a/metron-deployment/development/ubuntu14/ansible/inventory/group_vars/all +++ b/metron-deployment/development/ubuntu14/ansible/inventory/group_vars/all @@ -35,7 +35,7 @@ threatintel_hbase_table: threatintel enrichment_hbase_table: enrichment # metron -metron_version: 0.5.0 +metron_version: 0.5.1 metron_directory: /usr/metron/{{ metron_version }} bro_version: "2.5.2" fixbuf_version: "1.7.1" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/elasticsearch-mpack/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/pom.xml b/metron-deployment/packaging/ambari/elasticsearch-mpack/pom.xml index b8948c0..4c31a47 100644 --- a/metron-deployment/packaging/ambari/elasticsearch-mpack/pom.xml +++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/pom.xml @@ -20,13 +20,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.metron.packaging.mpacks</groupId> <artifactId>elasticsearch_mpack</artifactId> - <version>0.5.0.0</version> + <version>0.5.1.0</version> <name>Elasticsearch Ambari Management Pack</name> <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-deployment</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> <relativePath>../../..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/pom.xml b/metron-deployment/packaging/ambari/metron-mpack/pom.xml index a753d27..507b63e 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/pom.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/pom.xml @@ -20,13 +20,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.metron.packaging.mpacks</groupId> <artifactId>metron_mpack</artifactId> - <version>0.5.0.0</version> + <version>0.5.1.0</version> <name>Metron Ambari Management Pack</name> <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-deployment</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> <relativePath>../../..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml index 78ea27e..066b527 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml @@ -156,4 +156,16 @@ <description>The HBase column family which will hold user settings in HBase.</description> <display-name>User Settings HBase Column Family</display-name> </property> + <property> + <name>source_type_field</name> + <display-name>Source Type Field Name</display-name> + <description>The field name where the source type can be found in the search indices. This setting primarily affects the Alerts UI.</description> + <value>source:type</value> + </property> + <property> + <name>threat_triage_score_field</name> + <display-name>Threat Triage Score Field Name</display-name> + <description>The field name where the threat triage score can be found in the search indices. This setting primarily affects the Alerts UI.</description> + <value>threat:triage:score</value> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py ---------------------------------------------------------------------- diff --git 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 index 4a55f8a..58d581f 100644 --- 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 @@ -138,6 +138,16 @@ def build_global_config_patch(params, patch_file): "op": "add", "path": "/bootstrap.servers", "value": "{{kafka_brokers}}" + }, + { + "op": "add", + "path": "/source.type.field", + "value": "{{source_type_field}}" + }, + { + "op": "add", + "path": "/threat.triage.score.field", + "value": "{{threat_triage_score_field}}" } """ patch_template = ambari_format( http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py index 667a926..dc1b450 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py @@ -272,6 +272,8 @@ metron_rest_classpath = config['configurations']['metron-rest-env']['metron_rest metron_sysconfig = config['configurations']['metron-rest-env']['metron_sysconfig'] user_settings_hbase_table = status_params.user_settings_hbase_table user_settings_hbase_cf = status_params.user_settings_hbase_cf +source_type_field = config['configurations']['metron-rest-env']['source_type_field'] +threat_triage_score_field = config['configurations']['metron-rest-env']['threat_triage_score_field'] # Enrichment metron_enrichment_topology = status_params.metron_enrichment_topology http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json index 0bb63de..2b2d648 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json @@ -796,6 +796,14 @@ "subsection-name": "subsection-rest" }, { + "config": "metron-rest-env/source_type_field", + "subsection-name": "subsection-rest" + }, + { + "config": "metron-rest-env/threat_triage_score_field", + "subsection-name": "subsection-rest" + }, + { "config": "metron-management-ui-env/metron_management_ui_port", "subsection-name": "subsection-management-ui" }, @@ -843,6 +851,18 @@ } }, { + "config": "metron-rest-env/source_type_field", + "widget": { + "type": "text-field" + } + }, + { + "config": "metron-rest-env/threat_triage_score_field", + "widget": { + "type": "text-field" + } + }, + { "config": "metron-parsers-env/parsers", "widget": { "type": "text-field" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json index 8814f03..3b512fe 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json @@ -1,7 +1,7 @@ { "type": "full-release", "name": "metron-ambari.mpack", - "version": "0.5.0.0", + "version": "0.5.1.0", "description": "Ambari Management Pack for Apache Metron", "prerequisites": { "min-ambari-version": "2.4.0.0", http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/docker/deb-docker/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/docker/deb-docker/pom.xml b/metron-deployment/packaging/docker/deb-docker/pom.xml index f12a874..4d406d0 100644 --- a/metron-deployment/packaging/docker/deb-docker/pom.xml +++ b/metron-deployment/packaging/docker/deb-docker/pom.xml @@ -21,11 +21,11 @@ <artifactId>metron-debs</artifactId> <packaging>pom</packaging> <name>metron-debs</name> - <version>0.5.0</version> + <version>0.5.1</version> <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-deployment</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> <relativePath>../../..</relativePath> </parent> <description>DEB Package Builder for Apache Metron</description> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/packaging/docker/rpm-docker/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/docker/rpm-docker/pom.xml b/metron-deployment/packaging/docker/rpm-docker/pom.xml index 9c455da..ba57079 100644 --- a/metron-deployment/packaging/docker/rpm-docker/pom.xml +++ b/metron-deployment/packaging/docker/rpm-docker/pom.xml @@ -21,11 +21,11 @@ <artifactId>metron-rpm</artifactId> <packaging>pom</packaging> <name>metron-rpm</name> - <version>0.5.0</version> + <version>0.5.1</version> <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-deployment</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> <relativePath>../../..</relativePath> </parent> <description>RPM Builder for Apache Metron</description> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-deployment/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/pom.xml b/metron-deployment/pom.xml index ac194d1..63d3270 100644 --- a/metron-deployment/pom.xml +++ b/metron-deployment/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Building and deploying Metron</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/README.md ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/README.md b/metron-interface/metron-alerts/README.md index 486a885..d349c16 100644 --- a/metron-interface/metron-alerts/README.md +++ b/metron-interface/metron-alerts/README.md @@ -104,7 +104,11 @@ rest: ### `source.type.field` -The source type format used. Defaults to `source:type`. +The source type field name used in the real-time store. Defaults to `source:type`. + +### `threat.triage.score.field` + +The threat triage score field name used in the real-time store. Defaults to `threat:triage:score`. ## Usage http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/package.json ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/package.json b/metron-interface/metron-alerts/package.json index 31c9ce6..cb6f170 100644 --- a/metron-interface/metron-alerts/package.json +++ b/metron-interface/metron-alerts/package.json @@ -1,6 +1,6 @@ { "name": "metron-alerts", - "version": "0.5.0", + "version": "0.5.1", "license": "Apache-2.0", "angular-cli": {}, "scripts": { http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/pom.xml b/metron-interface/metron-alerts/pom.xml index 3f23910..e7706b3 100644 --- a/metron-interface/metron-alerts/pom.xml +++ b/metron-interface/metron-alerts/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-interface</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-alerts</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts index 7e49654..4d915cd 100644 --- a/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts +++ b/metron-interface/metron-alerts/src/app/alerts/alerts-list/table-view/table-view.component.ts @@ -283,7 +283,7 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy { } doDeleteOneAlertFromMetaAlert(alert, metaAlertIndex) { - let alertToRemove = alert.source.alert[metaAlertIndex]; + let alertToRemove = alert.source.metron_alert[metaAlertIndex]; let metaAlertAddRemoveRequest = new MetaAlertAddRemoveRequest(); metaAlertAddRemoveRequest.metaAlertGuid = alert.source.guid; metaAlertAddRemoveRequest.alerts = [new GetRequest(alertToRemove.guid, alertToRemove[this.globalConfig['source.type.field']], '')]; http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.html ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.html b/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.html index a9298e0..87c0585 100644 --- a/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.html +++ b/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.html @@ -35,8 +35,10 @@ <div class="col-11 px-0"> <span class="severity" appAlertSeverity [severity]="getScore(alert)"></span><sup> {{ getScore(alert) }} </sup> <div class="px-0 guid-name-container"> - <div [ngClass]="{'selected': selectedMetaAlert===alert.source.guid}"> {{(alert.source.name && alert.source.name.length > 0) ? alert.source.name : alert.source.guid | centerEllipses:20 }} ({{ alert.source.alert.length }})</div> - <span class="pull-left sub-text"> {{ (alert.source.alert_status && alert.source.alert_status.length > 0) ? alert.source.alert_status : 'NEW' }} </span> + <div [ngClass]="{'selected': selectedMetaAlert===alert.source.guid}" *ngIf="alert.source.name && alert.source.name.length > 0">{{ alert.source.name }} ({{ alert.source.metron_alert.length }})</div> + <div [ngClass]="{'selected': selectedMetaAlert===alert.source.guid}" *ngIf="!alert.source.name || alert.source.name.length === 0">{{ alert.source.guid | centerEllipses:20 }} ({{ alert.source.metron_alert.length }})</div> + <span class="pull-left sub-text" *ngIf="alert.source.status && alert.source.status.length > 0">{{ alert.source.status }}</span> + <span class="pull-left sub-text" *ngIf="!alert.source.status || alert.source.status.length === 0">NEW</span> <span class="pull-right sub-text"> {{ alert.source.timestamp | timeLapse }} </span> </div> </div> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.ts ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.ts b/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.ts index c1997b6..1c72904 100644 --- a/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.ts +++ b/metron-interface/metron-alerts/src/app/alerts/meta-alerts/meta-alerts.component.ts @@ -65,10 +65,8 @@ export class MetaAlertsComponent implements OnInit, OnDestroy { searchRequest.indices = [META_ALERTS_SENSOR_TYPE]; this.configSubscription = this.globalConfigService.get().subscribe((config: {}) => { this.globalConfig = config; + searchRequest.sort = [new SortField(this.globalConfig['threat.triage.score.field'], 'desc')]; }); - - searchRequest.sort = [new SortField(this.globalConfig['threat.triage.score.field'], 'desc')]; - this.searchService.search(searchRequest).subscribe(resp => this.searchResponse = resp); } http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-alerts/src/app/model/filter.ts ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/model/filter.ts b/metron-interface/metron-alerts/src/app/model/filter.ts index 200e33c..c90c7a6 100644 --- a/metron-interface/metron-alerts/src/app/model/filter.ts +++ b/metron-interface/metron-alerts/src/app/model/filter.ts @@ -63,12 +63,12 @@ export class Filter { private createNestedQuery(field: string, value: string): string { return '(' + Utils.escapeESField(field) + ':' + Utils.escapeESValue(value) + ' OR ' + - Utils.escapeESField('alert.' + field) + ':' + Utils.escapeESValue(value) + ')'; + Utils.escapeESField('metron_alert.' + field) + ':' + Utils.escapeESValue(value) + ')'; } private createNestedQueryWithoutValueEscaping(field: string, value: string): string { return '(' + Utils.escapeESField(field) + ':' + value + ' OR ' + - Utils.escapeESField('alert.' + field) + ':' + value + ')'; + Utils.escapeESField('metron_alert.' + field) + ':' + value + ')'; } } http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-config/package.json ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/package.json b/metron-interface/metron-config/package.json index 17a8ac9..0b7420a 100644 --- a/metron-interface/metron-config/package.json +++ b/metron-interface/metron-config/package.json @@ -1,6 +1,6 @@ { "name": "metron-management-ui", - "version": "0.5.0", + "version": "0.5.1", "license": "Apache-2.0", "config": { "node_ace": "node_modules/ace-builds/src-min-noconflict/" http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-config/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/pom.xml b/metron-interface/metron-config/pom.xml index 3aafe6d..14acdc6 100644 --- a/metron-interface/metron-config/pom.xml +++ b/metron-interface/metron-config/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-interface</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-config</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-config/scripts/package.json ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/scripts/package.json b/metron-interface/metron-config/scripts/package.json index 59b0d33..24d17e0 100644 --- a/metron-interface/metron-config/scripts/package.json +++ b/metron-interface/metron-config/scripts/package.json @@ -1,6 +1,6 @@ { "name": "metron-management-ui-web-server", - "version": "0.5.0", + "version": "0.5.1", "description": "Metron management ui web server", "main": "server.js", "dependencies": { http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest-client/pom.xml b/metron-interface/metron-rest-client/pom.xml index 9909113..9ef9ae6 100644 --- a/metron-interface/metron-rest-client/pom.xml +++ b/metron-interface/metron-rest-client/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-interface</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-rest-client</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-rest/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index 9c9c372..543d5b4 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-interface</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-rest</artifactId> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/metron-rest/src/main/resources/application.yml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/resources/application.yml b/metron-interface/metron-rest/src/main/resources/application.yml index 97359b9..e0f91d8 100644 --- a/metron-interface/metron-rest/src/main/resources/application.yml +++ b/metron-interface/metron-rest/src/main/resources/application.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. metron: - version: 0.5.0 + version: 0.5.1 logging: level: http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-interface/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/pom.xml b/metron-interface/pom.xml index 9e9749a..e6ccd2d 100644 --- a/metron-interface/pom.xml +++ b/metron-interface/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Interfaces for Metron</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/Performance-tuning-guide.md ---------------------------------------------------------------------- diff --git a/metron-platform/Performance-tuning-guide.md b/metron-platform/Performance-tuning-guide.md index c5d32f1..f875a0f 100644 --- a/metron-platform/Performance-tuning-guide.md +++ b/metron-platform/Performance-tuning-guide.md @@ -410,7 +410,7 @@ And we ran our bro parser topology with the following options. We did not need t though you could certainly do so if necessary. Notice that we only needed 1 worker. ``` -/usr/metron/0.5.0/bin/start_parser_topology.sh \ +/usr/metron/0.5.1/bin/start_parser_topology.sh \ -e ~metron/.storm/storm-bro.config \ -esc ~/.storm/spout-bro.config \ -k $BROKERLIST \ @@ -594,7 +594,7 @@ export KAFKA_HOME=$HDP_HOME/kafka-broker export STORM_UI=http://node1:8744 export ELASTIC=http://node1:9200 export ZOOKEEPER=node1:2181 -export METRON_VERSION=0.5.0 +export METRON_VERSION=0.5.1 export METRON_HOME=/usr/metron/${METRON_VERSION} ``` http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/README.md ---------------------------------------------------------------------- diff --git a/metron-platform/README.md b/metron-platform/README.md index 37a99e6..551a689 100644 --- a/metron-platform/README.md +++ b/metron-platform/README.md @@ -17,7 +17,7 @@ limitations under the License. # Current Build -The latest build of metron-platform is 0.5.0. +The latest build of metron-platform is 0.5.1. We are still in the process of merging/porting additional features from our production code base into this open source release. This release will be followed by a number of additional beta releases until the port is complete. We will also work on getting additional documentation and user/developer guides to the community as soon as we can. At this time we offer no support for the beta software, but will try to respond to requests as promptly as we can. http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/elasticsearch-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/elasticsearch-shaded/pom.xml b/metron-platform/elasticsearch-shaded/pom.xml index ac8e579..e1b4b28 100644 --- a/metron-platform/elasticsearch-shaded/pom.xml +++ b/metron-platform/elasticsearch-shaded/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>metron-platform</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>elasticsearch-shaded</artifactId> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-api/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-api/pom.xml b/metron-platform/metron-api/pom.xml index 59b1622..22b953c 100644 --- a/metron-platform/metron-api/pom.xml +++ b/metron-platform/metron-api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-api</artifactId> <name>metron-api</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-common/README.md ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/README.md b/metron-platform/metron-common/README.md index dae2e22..dac1974 100644 --- a/metron-platform/metron-common/README.md +++ b/metron-platform/metron-common/README.md @@ -100,7 +100,8 @@ but a convenient index is provided here: | [`enrichment.writer.batchSize`](../metron-enrichment#enrichmentwriterbatchsize) | Enrichment | Integer | N/A | | [`enrichment.writer.batchTimeout`](../metron-enrichment#enrichmentwriterbatchtimeout) | Enrichment | Integer | N/A | | [`geo.hdfs.file`](../metron-enrichment#geohdfsfile) | Enrichment | String | `geo_hdfs_file` | -| [`source.type.field`](../../metron-interface/metron-alerts#sourcetypefield) | UI | String | N/A | +| [`source.type.field`](../../metron-interface/metron-alerts#sourcetypefield) | UI | String | `source_type_field` | +| [`threat.triage.score.field`](../../metron-interface/metron-alerts#threattriagescorefield) | UI | String | `threat_triage_score_field` | ## Note Configs in Ambari If a field is managed via ambari, you should change the field via http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 800bfeb..dafd1e4 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-common</artifactId> <name>metron-common</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-common/src/main/scripts/cluster_info.py ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/main/scripts/cluster_info.py b/metron-platform/metron-common/src/main/scripts/cluster_info.py index e4d86da..749ae74 100755 --- a/metron-platform/metron-common/src/main/scripts/cluster_info.py +++ b/metron-platform/metron-common/src/main/scripts/cluster_info.py @@ -338,7 +338,7 @@ class ClusterInfo: type="string", dest="metron_home", help="Metron home directory", - default="/usr/metron/0.5.0", + default="/usr/metron/0.5.1", metavar="DIRECTORY") parser.add_option("-p", "--hdp_home", action="store", http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-data-management/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml index a29fc2f..1c248ba 100644 --- a/metron-platform/metron-data-management/pom.xml +++ b/metron-platform/metron-data-management/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-data-management</artifactId> <name>metron-data-management</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/pom.xml b/metron-platform/metron-elasticsearch/pom.xml index ae508c6..b6c8053 100644 --- a/metron-platform/metron-elasticsearch/pom.xml +++ b/metron-platform/metron-elasticsearch/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-elasticsearch</artifactId> <name>metron-elasticsearch</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/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 649077e..55123a5 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 @@ -18,13 +18,7 @@ package org.apache.metron.elasticsearch.dao; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import org.apache.lucene.search.join.ScoreMode; import org.apache.metron.common.Constants; -import org.apache.metron.common.configuration.ConfigurationsUtils; import org.apache.metron.indexing.dao.AccessConfig; import org.apache.metron.indexing.dao.IndexDao; import org.apache.metron.indexing.dao.MultiIndexDao; @@ -43,41 +37,17 @@ import org.apache.metron.indexing.dao.search.InvalidCreateException; import org.apache.metron.indexing.dao.search.InvalidSearchException; import org.apache.metron.indexing.dao.search.SearchRequest; import org.apache.metron.indexing.dao.search.SearchResponse; -import org.apache.metron.indexing.dao.search.SearchResult; import org.apache.metron.indexing.dao.update.CommentAddRemoveRequest; import org.apache.metron.indexing.dao.update.Document; import org.apache.metron.indexing.dao.update.OriginalNotFoundException; import org.apache.metron.indexing.dao.update.PatchRequest; -import org.apache.metron.stellar.common.utils.ConversionUtils; -import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryStringQueryBuilder; -import org.elasticsearch.search.SearchHit; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -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; -import static org.apache.metron.common.Constants.SENSOR_TYPE_FIELD_PROPERTY; -import static org.elasticsearch.index.query.QueryBuilders.boolQuery; -import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery; -import static org.elasticsearch.index.query.QueryBuilders.existsQuery; -import static org.elasticsearch.index.query.QueryBuilders.nestedQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; public class ElasticsearchMetaAlertDao implements MetaAlertDao { http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java index 70197ea..b1da2a4 100644 --- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java +++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java @@ -18,6 +18,14 @@ package org.apache.metron.elasticsearch.dao; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import org.apache.metron.indexing.dao.AccessConfig; import org.apache.metron.indexing.dao.HBaseDao; import org.apache.metron.indexing.dao.IndexDao; http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-enrichment/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-enrichment/pom.xml b/metron-platform/metron-enrichment/pom.xml index 06467e9..a5c692e 100644 --- a/metron-platform/metron-enrichment/pom.xml +++ b/metron-platform/metron-enrichment/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-enrichment</artifactId> <name>metron-enrichment</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-hbase-client/pom.xml b/metron-platform/metron-hbase-client/pom.xml index e22a62d..f655f95 100644 --- a/metron-platform/metron-hbase-client/pom.xml +++ b/metron-platform/metron-hbase-client/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <!-- The purpose of this project is to provide a version of the hbase client which has a shaded and relocated gauva. http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-hbase/pom.xml b/metron-platform/metron-hbase/pom.xml index c26b0b1..47044cc 100644 --- a/metron-platform/metron-hbase/pom.xml +++ b/metron-platform/metron-hbase/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-hbase</artifactId> <name>metron-hbase</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-indexing/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-indexing/pom.xml b/metron-platform/metron-indexing/pom.xml index ff95c94..ace6e6c 100644 --- a/metron-platform/metron-indexing/pom.xml +++ b/metron-platform/metron-indexing/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-indexing</artifactId> <name>metron-indexing</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-integration-test/pom.xml b/metron-platform/metron-integration-test/pom.xml index 03a93c6..c478cec 100644 --- a/metron-platform/metron-integration-test/pom.xml +++ b/metron-platform/metron-integration-test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-integration-test</artifactId> <name>metron-integration-test</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-management/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml index 3a8c532..5d40de4 100644 --- a/metron-platform/metron-management/pom.xml +++ b/metron-platform/metron-management/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-management</artifactId> <name>metron-management</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-parsers/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-parsers/pom.xml b/metron-platform/metron-parsers/pom.xml index 17e93ef..1f62865 100644 --- a/metron-platform/metron-parsers/pom.xml +++ b/metron-platform/metron-parsers/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-parsers</artifactId> <name>metron-parsers</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-pcap-backend/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml index 60609a2..c3b1a69 100644 --- a/metron-platform/metron-pcap-backend/pom.xml +++ b/metron-platform/metron-pcap-backend/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-pcap-backend</artifactId> <name>metron-pcap-backend</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-pcap-backend/src/main/scripts/pcap_zeppelin_run.sh ---------------------------------------------------------------------- diff --git a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_zeppelin_run.sh b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_zeppelin_run.sh index 64ad095..b96ebb6 100755 --- a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_zeppelin_run.sh +++ b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_zeppelin_run.sh @@ -17,7 +17,7 @@ # limitations under the License. # -METRON_VERSION=0.5.0 +METRON_VERSION=0.5.1 METRON_HOME=${METRON_HOME:-"/usr/metron/$METRON_VERSION"} DATE_FORMAT=${DATE_FORMAT:-"yyyyMMdd"} USER=$(whoami) http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-pcap/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-pcap/pom.xml b/metron-platform/metron-pcap/pom.xml index 598ddf6..c9f873e 100644 --- a/metron-platform/metron-pcap/pom.xml +++ b/metron-platform/metron-pcap/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-pcap</artifactId> <name>metron-pcap</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-solr/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-solr/pom.xml b/metron-platform/metron-solr/pom.xml index 03e8d87..2e2dfe2 100644 --- a/metron-platform/metron-solr/pom.xml +++ b/metron-platform/metron-solr/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-solr</artifactId> <name>metron-solr</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-storm-kafka-override/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-storm-kafka-override/pom.xml b/metron-platform/metron-storm-kafka-override/pom.xml index a38d3bf..1e8ec1b 100644 --- a/metron-platform/metron-storm-kafka-override/pom.xml +++ b/metron-platform/metron-storm-kafka-override/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-storm-kafka-override</artifactId> <name>metron-storm-kafka-override</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-storm-kafka/pom.xml b/metron-platform/metron-storm-kafka/pom.xml index fdcde4f..9acaaa9 100644 --- a/metron-platform/metron-storm-kafka/pom.xml +++ b/metron-platform/metron-storm-kafka/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-storm-kafka</artifactId> <name>metron-storm-kafka</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-test-utilities/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml index b94e5f3..f6dc600 100644 --- a/metron-platform/metron-test-utilities/pom.xml +++ b/metron-platform/metron-test-utilities/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-test-utilities</artifactId> <name>metron-test-utilities</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-writer/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index 30e01e2..20a6ec2 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-writer</artifactId> <name>metron-writer</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/metron-zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-zookeeper/pom.xml b/metron-platform/metron-zookeeper/pom.xml index 32e70c5..b7062b9 100644 --- a/metron-platform/metron-zookeeper/pom.xml +++ b/metron-platform/metron-zookeeper/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>metron-platform</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>metron-zookeeper</artifactId> <name>metron-zookeeper</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-platform/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/pom.xml b/metron-platform/pom.xml index 63acd44..048eabb 100644 --- a/metron-platform/pom.xml +++ b/metron-platform/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>Stream analytics for Metron</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/pom.xml ---------------------------------------------------------------------- diff --git a/metron-stellar/pom.xml b/metron-stellar/pom.xml index e1d7883..53b609c 100644 --- a/metron-stellar/pom.xml +++ b/metron-stellar/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>Metron</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>DSL for stream analytics</description> <url>https://metron.apache.org/</url> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/stellar-3rd-party-example/pom.xml ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-3rd-party-example/pom.xml b/metron-stellar/stellar-3rd-party-example/pom.xml index 4a63ae3..b147c92 100644 --- a/metron-stellar/stellar-3rd-party-example/pom.xml +++ b/metron-stellar/stellar-3rd-party-example/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>metron-stellar</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>stellar-3rd-party-example</artifactId> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/stellar-common/README.md ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/README.md b/metron-stellar/stellar-common/README.md index dcf0dbf..d8d09b4 100644 --- a/metron-stellar/stellar-common/README.md +++ b/metron-stellar/stellar-common/README.md @@ -1463,7 +1463,7 @@ operating system. ```bash -metron-stellar/stellar-common/target/stellar-common-0.5.0-stand-alone.tar.gz +metron-stellar/stellar-common/target/stellar-common-0.5.1-stand-alone.tar.gz ``` When unpacked, the following structure will be created: @@ -1473,7 +1473,7 @@ When unpacked, the following structure will be created: âââ bin â  âââ stellar âââ lib - âââ stellar-common-0.5.0-uber.jar + âââ stellar-common-0.5.1-uber.jar ``` To run the Stellar Shell run the following from the directory you unpacked to: http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/stellar-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml index 0090917..ab2c69f 100644 --- a/metron-stellar/stellar-common/pom.xml +++ b/metron-stellar/stellar-common/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>metron-stellar</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <artifactId>stellar-common</artifactId> <name>stellar-common</name> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/stellar-zeppelin/README.md ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-zeppelin/README.md b/metron-stellar/stellar-zeppelin/README.md index 90e7733..1858e44 100644 --- a/metron-stellar/stellar-zeppelin/README.md +++ b/metron-stellar/stellar-zeppelin/README.md @@ -56,10 +56,10 @@ To install the Stellar Interpreter in your Apache Zeppelin installation, follow 1. Use Zeppelin's installation utility to install the Stellar Interpreter. - If Zeppelin was already installed, make sure that it is stopped before running this command. Update the version, '0.5.0' in the example below, to whatever is appropriate for your environment. + If Zeppelin was already installed, make sure that it is stopped before running this command. Update the version, '0.5.1' in the example below, to whatever is appropriate for your environment. ``` - bin/install-interpreter.sh --name stellar --artifact org.apache.metron:stellar-zeppelin:0.5.0 + bin/install-interpreter.sh --name stellar --artifact org.apache.metron:stellar-zeppelin:0.5.1 ``` 1. Start Zeppelin. @@ -106,7 +106,7 @@ Usage 1. Go back to the Stellar interpreter configuration and add another dependency as follows. ``` - org.apache.metron:metron-statistics:0.5.0 + org.apache.metron:metron-statistics:0.5.1 ``` 1. Go back to your notebook and run `%functions` again. You will now see the additional functions defined within the `metron-statistics` project. http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/metron-stellar/stellar-zeppelin/pom.xml ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-zeppelin/pom.xml b/metron-stellar/stellar-zeppelin/pom.xml index c8f3b5e..269fa08 100644 --- a/metron-stellar/stellar-zeppelin/pom.xml +++ b/metron-stellar/stellar-zeppelin/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>metron-stellar</artifactId> <groupId>org.apache.metron</groupId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <name>stellar-zeppelin</name> <description>Stellar Interpreter for Apache Zeppelin</description> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b40c5e6..1947b37 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> <packaging>pom</packaging> <name>Metron</name> <description>Metron Top Level Project</description> http://git-wip-us.apache.org/repos/asf/metron/blob/975923e8/site-book/pom.xml ---------------------------------------------------------------------- diff --git a/site-book/pom.xml b/site-book/pom.xml index 46e25c1..d7037e8 100644 --- a/site-book/pom.xml +++ b/site-book/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.metron</groupId> <artifactId>Metron</artifactId> - <version>0.5.0</version> + <version>0.5.1</version> </parent> <description>User Documentation for Metron</description> <url>https://metron.apache.org/</url>