[metron] branch master updated: METRON-2179 [UI] Make navigation in both UIs consistent (sardell) closes apache/metron#1464
This is an automated email from the ASF dual-hosted git repository.
sardell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new 4ab1fdb METRON-2179 [UI] Make navigation in both UIs consistent
(sardell) closes apache/metron#1464
4ab1fdb is described below
commit 4ab1fdba2f93cfb90dea55d315fb7f45c63d2fa6
Author: sardell
AuthorDate: Fri Aug 23 17:16:48 2019 +0200
METRON-2179 [UI] Make navigation in both UIs consistent (sardell) closes
apache/metron#1464
---
.../common-services/METRON/CURRENT/metainfo.xml| 2 +
.../package/templates/alerts-ui-app-config.json.j2 | 4 +-
.../templates/management-ui-app-config.json.j2 | 4 +-
metron-interface/metron-alerts/package-lock.json | 61 +-
metron-interface/metron-alerts/package.json| 2 +
.../metron-alerts/src/app/app.component.html | 69 ++---
.../metron-alerts/src/app/app.component.scss | 31 +++--
.../metron-alerts/src/app/app.component.spec.ts| 37 ++-
.../metron-alerts/src/app/app.component.ts | 37 ++-
.../metron-alerts/src/app/app.module.ts| 28 +++--
.../src/app/service/app-config.service.ts | 14 +
.../metron-alerts/src/assets/app-config.json | 4 +-
.../metron-alerts/src/assets/images/logo-name.png | Bin 0 -> 3760 bytes
.../src/assets/images/logo-symbol.png | Bin 0 -> 19063 bytes
metron-interface/metron-alerts/src/styles.scss | 64 +++
metron-interface/metron-config/package-lock.json | 55
metron-interface/metron-config/package.json| 1 +
.../metron-config/src/app/app.component.html | 69 -
.../metron-config/src/app/app.component.scss | 23 +++
.../metron-config/src/app/app.component.ts | 37 ++-
.../metron-config/src/app/app.module.ts| 21 ++-
.../src/app/navbar/navbar.component.scss | 10 +++
.../metron-config/src/app/navbar/navbar.html | 8 +--
.../src/app/service/app-config.service.ts | 14 +
.../src/app/service/mock.app-config.service.ts | 9 +++
.../metron-config/src/assets/app-config.json | 4 +-
.../metron-config/src/assets/images/logo-name.png | Bin 0 -> 3760 bytes
.../src/assets/images/logo-symbol.png | Bin 0 -> 19063 bytes
metron-interface/metron-config/src/styles.scss | 66
29 files changed, 611 insertions(+), 63 deletions(-)
diff --git
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/metainfo.xml
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/metainfo.xml
index cb044c2..417c225 100644
---
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/metainfo.xml
+++
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/metainfo.xml
@@ -375,6 +375,7 @@
metron-security-env
metron-rest-env
metron-management-ui-env
+metron-alerts-ui-env
@@ -401,6 +402,7 @@
metron-security-env
metron-rest-env
+metron-management-ui-env
metron-alerts-ui-env
diff --git
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/alerts-ui-app-config.json.j2
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/alerts-ui-app-config.json.j2
index cdc064e..192e830 100644
---
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/alerts-ui-app-config.json.j2
+++
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/alerts-ui-app-config.json.j2
@@ -1,5 +1,7 @@
{
"apiRoot": "{{metron_rest_path}}",
"loginPath": "{{metron_alerts_ui_login_path}}",
- "contextMenuConfigURL": "{{metron_alerts_ui_context_menu_config_url}}"
+ "contextMenuConfigURL": "{{metron_alerts_ui_context_menu_config_url}}",
+ "managementUIHost": "{{metron_management_ui_host}}",
+ "managementUIPort": "{{metron_management_ui_port}}"
}
\ No newline at end of file
diff --git
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/management-ui-app-config.json.j2
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/management-ui-app-config.json.j2
index 12c3168..c03a35f 100644
---
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-ser
[metron] branch feature/METRON-2088-support-hdp-3.1 updated: METRON-2224 Upgrade to Zeppelin 0.8.0 (merrimanr via nickwallen) closes apache/metron#1491
This is an automated email from the ASF dual-hosted git repository.
nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to
refs/heads/feature/METRON-2088-support-hdp-3.1 by this push:
new 1a41a2c METRON-2224 Upgrade to Zeppelin 0.8.0 (merrimanr via
nickwallen) closes apache/metron#1491
1a41a2c is described below
commit 1a41a2cf1bd394cdf15eb83e3a182b4e1addaff5
Author: merrimanr
AuthorDate: Fri Aug 23 13:37:21 2019 -0400
METRON-2224 Upgrade to Zeppelin 0.8.0 (merrimanr via nickwallen) closes
apache/metron#1491
---
dependencies_with_url.csv | 5 +
metron-stellar/stellar-zeppelin/README.md | 7 ---
metron-stellar/stellar-zeppelin/pom.xml | 2 +-
.../apache/metron/stellar/zeppelin/StellarInterpreter.java| 11 +++
.../metron/stellar/zeppelin/StellarInterpreterTest.java | 9 +
pom.xml | 3 +++
6 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv
index 04f7935..0065f9b 100644
--- a/dependencies_with_url.csv
+++ b/dependencies_with_url.csv
@@ -50,6 +50,7 @@
javax.xml.bind:jaxb-api:jar:2.2.2:compile,CDDL,https://jaxb.dev.java.net/
javax.xml.bind:jaxb-api:jar:2.3.0:compile,CDDL,https://jaxb.dev.java.net/
javax.xml.stream:stax-api:jar:1.0-2:compile,COMMON DEVELOPMENT AND
DISTRIBUTION LICENSE (CDDL) Version
1.0,https://docs.oracle.com/javase/7/docs/api/javax/xml/stream/package-summary.html
jline:jline:jar:0.9.94:compile,BSD,http://jline.sourceforge.net
+jline:jline:jar:2.12.1:compile,BSD,http://jline.sourceforge.net
junit:junit:jar:4.12:compile,Eclipse Public License 1.0,http://junit.org
junit:junit:jar:4.4:compile,Common Public License Version 1.0,http://junit.org
net.razorvine:pyrolite:jar:4.13:compile,MIT,https://github.com/irmen/Pyrolite
@@ -61,6 +62,7 @@
org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1:compile,BSD 3-Clause "N
org.adrianwalker:multiline-string:jar:0.1.2:compile,Common Public License
Version 1.0,https://github.com/benelog/multiline
org.antlr:antlr4-runtime:jar:4.5:compile,BSD 3-Clause
License,http://www.antlr.org
org.bouncycastle:bcprov-jdk15on:jar:1.52:compile,MIT,https://www.bouncycastle.org/license.html
+org.bouncycastle:bcpkix-jdk15on:jar:1.52:compile,MIT,https://www.bouncycastle.org/license.html
org.clojure:clojure:jar:1.6.0:compile,Eclipse Public License
1.0,http://clojure.org/
org.clojure:clojure:jar:1.7.0:compile,Eclipse Public License
1.0,http://clojure.org/
org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile,Apache
v2,http://jackson.codehaus.org
@@ -185,6 +187,7 @@
com.fasterxml:classmate:jar:1.3.4:compile,ASLv2,http://github.com/cowtowncoder/j
com.google.code.gson:gson:jar:2.2.2:compile,The Apache Software License,
Version 2.0,http://code.google.com/p/google-gson/
com.google.code.gson:gson:jar:2.2.4:compile,The Apache Software License,
Version 2.0,http://code.google.com/p/google-gson/
com.google.code.gson:gson:jar:2.7:compile,The Apache Software License, Version
2.0,http://code.google.com/p/google-gson/
+com.google.code.gson:gson:jar:2.8.5:compile,The Apache Software License,
Version 2.0,http://code.google.com/p/google-gson/
com.google.guava:guava:jar:11.0.2:compile,ASLv2,
com.google.guava:guava:jar:12.0.1:compile,ASLv2,
com.google.guava:guava:jar:12.0:compile,ASLv2,
@@ -224,6 +227,7 @@
commons-collections:commons-collections:jar:3.2.1:compile,ASLv2,http://commons.a
commons-collections:commons-collections:jar:3.2.2:compile,ASLv2,http://commons.apache.org/collections/
commons-configuration:commons-configuration:jar:1.10:compile,ASLv2,http://commons.apache.org/configuration/
commons-configuration:commons-configuration:jar:1.6:compile,The Apache
Software License, Version
2.0,http://commons.apache.org/${pom.artifactId.substring(8)}/
+commons-configuration:commons-configuration:jar:1.9:compile,The Apache
Software License, Version
2.0,http://commons.apache.org/${pom.artifactId.substring(8)}/
commons-daemon:commons-daemon:jar:1.0.13:compile,ASLv2,http://commons.apache.org/daemon/
commons-digester:commons-digester:jar:1.8.1:compile,ASLv2,http://commons.apache.org/digester/
commons-digester:commons-digester:jar:1.8:compile,The Apache Software License,
Version 2.0,http://jakarta.apache.org/commons/digester/
@@ -504,3 +508,4 @@ org.elasticsearch:securesm:jar:1.2:compile
com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile,ASLv2,http://stephenc.github.io/jcip-annotations/
com.nimbusds:nimbus-jose-jwt:jar:4.41.2:compile,ASLv2,https://bitbucket.org/connect2id/nimbus-jose-jwt/wiki/Home
tomcat:jasper-compiler:jar:5.5.23:compile,ASLv2,https://tomcat.apache.org/
+org.danilopianini:gson-extras:jar:0.2.1:compile,ASLv2,https://github.com/DanySK/gson-extras
diff --git a/metro
[metron] branch master updated: METRON-2149 Shaded jar classifier is not consistent (merrimanr) closes apache/metron#1436
This is an automated email from the ASF dual-hosted git repository. rmerriman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git The following commit(s) were added to refs/heads/master by this push: new e6ca3c7 METRON-2149 Shaded jar classifier is not consistent (merrimanr) closes apache/metron#1436 e6ca3c7 is described below commit e6ca3c71d8120516afcf816be2cda81093088b72 Author: merrimanr AuthorDate: Fri Aug 23 16:42:01 2019 -0500 METRON-2149 Shaded jar classifier is not consistent (merrimanr) closes apache/metron#1436 --- metron-analytics/metron-maas-common/pom.xml| 1 + metron-analytics/metron-maas-service/pom.xml | 6 ++ metron-analytics/metron-profiler-client/pom.xml| 8 ++ .../src/main/assembly/assembly.xml | 2 +- metron-analytics/metron-profiler-common/pom.xml| 6 ++ metron-analytics/metron-profiler-repl/pom.xml | 8 ++ .../src/main/assembly/assembly.xml | 2 +- metron-analytics/metron-profiler-spark/pom.xml | 3 + .../src/main/assembly/assembly.xml | 2 +- .../src/main/scripts/start_batch_profiler.sh | 4 +- metron-analytics/metron-profiler-storm/pom.xml | 8 ++ .../src/main/scripts/start_profiler_topology.sh| 3 +- metron-analytics/metron-statistics/pom.xml | 3 + metron-contrib/metron-performance/pom.xml | 8 ++ .../src/main/assembly/assembly.xml | 2 +- .../src/main/scripts/load_tool.sh | 2 +- .../common-services/METRON/CURRENT/metainfo.xml| 3 + .../packaging/docker/rpm-docker/SPECS/metron.spec | 35 +++-- .../packaging/docker/rpm-docker/pom.xml| 6 ++ metron-interface/metron-rest/pom.xml | 22 ++ .../metron-rest/src/main/assembly/assembly.xml | 2 +- .../metron-rest/src/main/scripts/metron-rest.sh| 2 + metron-platform/elasticsearch-shaded/pom.xml | 2 + .../metron-common-storm/pom.xml| 6 ++ metron-platform/metron-common/pom.xml | 51 +++-- .../metron-common/src/main/assembly/assembly.xml | 2 +- .../metron-common/src/main/scripts/stellar | 5 +- .../src/main/scripts/zk_load_configs.sh| 3 +- metron-platform/metron-data-management/pom.xml | 89 ++ .../src/main/assembly/assembly.xml | 2 +- .../src/main/scripts/flatfile_loader.sh| 7 +- .../src/main/scripts/flatfile_summarizer.sh| 7 +- .../src/main/scripts/maxmind_enrichment_load.sh| 10 +-- .../src/main/scripts/prune_hdfs_files.sh | 2 +- .../src/main/scripts/threatintel_bulk_prune.sh | 2 +- .../src/main/scripts/threatintel_taxii_load.sh | 2 +- .../metron-elasticsearch-common/pom.xml| 27 ++- .../metron-elasticsearch-storm/pom.xml | 19 + .../main/scripts/start_elasticsearch_topology.sh | 5 +- .../metron-enrichment-common/pom.xml | 1 + .../metron-enrichment-storm/pom.xml| 6 ++ .../src/main/scripts/start_enrichment_topology.sh | 3 +- metron-platform/metron-hbase-client/pom.xml| 2 + metron-platform/metron-hbase-server/pom.xml| 6 ++ .../metron-indexing/metron-indexing-common/pom.xml | 11 +-- .../metron-indexing/metron-indexing-storm/pom.xml | 6 ++ .../src/main/scripts/start_hdfs_topology.sh| 3 +- metron-platform/metron-integration-test/pom.xml| 1 + metron-platform/metron-management/pom.xml | 3 + .../src/main/assembly/assembly.xml | 2 +- .../metron-parsing/metron-parsers-common/pom.xml | 6 ++ .../metron-parsing/metron-parsers/pom.xml | 6 ++ .../metron-parsing/metron-parsing-storm/pom.xml| 6 ++ .../src/main/scripts/start_parser_topology.sh | 8 +- metron-platform/metron-pcap-backend/pom.xml| 40 ++ .../src/main/assembly/assembly.xml | 2 +- .../src/main/scripts/pcap_inspector.sh | 2 +- .../src/main/scripts/pcap_query.sh | 2 +- .../src/main/scripts/start_pcap_topology.sh| 6 +- metron-platform/metron-pcap/pom.xml| 14 .../metron-solr/metron-solr-common/pom.xml | 6 ++ .../metron-solr/metron-solr-storm/pom.xml | 6 ++ .../src/main/scripts/start_solr_topology.sh| 3 +- .../metron-storm-kafka-override/pom.xml| 2 + metron-platform/metron-storm-kafka/pom.xml | 1 + .../metron-writer/metron-writer-common/pom.xml | 45 ++- .../metron-writer/metron-writer-storm/pom.xml | 6 ++ metron-stellar/stellar-common/pom.xml | 10 ++- .../stellar-common/src/main/assembly/assembly.xml | 12 --- .../src/main/scripts/deployed/stellar | 4 +- metron-stellar/stellar-zeppelin/pom.xml| 1 + 71 files changed, 444 insertions(+), 167 deletions(-) diff --git a/metron-analytics/m
