Merge branch 'master' into feature/METRON-1554-pcap-query-panel
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4e586ac5 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4e586ac5 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4e586ac5 Branch: refs/heads/feature/METRON-1554-pcap-query-panel Commit: 4e586ac553daed1eb8322b2bbc4d83fcbdfb89d8 Parents: 165c0e7 436cec4 Author: rmerriman <[email protected]> Authored: Tue Jun 26 10:35:55 2018 -0500 Committer: rmerriman <[email protected]> Committed: Tue Jun 26 10:35:55 2018 -0500 ---------------------------------------------------------------------- NOTICE | 6 + dependencies_with_url.csv | 4 + dev-utilities/committer-utils/prepare-commit | 2 +- 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 +- .../configuration/metron-enrichment-env.xml | 12 + .../configuration/metron-profiler-env.xml | 12 + .../CURRENT/configuration/metron-rest-env.xml | 12 + .../CURRENT/package/scripts/metron_service.py | 30 + .../package/scripts/params/params_linux.py | 6 + .../METRON/CURRENT/themes/metron_theme.json | 61 +- .../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 | 25 +- .../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 | 10 +- metron-interface/metron-alerts/pom.xml | 2 +- .../metron-alerts/protractor.conf.js | 31 +- .../alert-details/alert-details.component.html | 4 +- .../alert-details/alert-details.component.ts | 22 +- .../alert-filters/alert-filters.component.ts | 2 +- .../alerts-list/alerts-list.component.html | 12 +- .../alerts-list/alerts-list.component.scss | 3 +- .../alerts/alerts-list/alerts-list.component.ts | 15 +- .../src/app/alerts/alerts-list/query-builder.ts | 5 +- .../table-view/table-view.component.html | 18 +- .../table-view/table-view.component.ts | 21 +- .../tree-view/tree-view.component.html | 20 +- .../tree-view/tree-view.component.ts | 27 +- .../configure-rows/configure-rows.component.ts | 2 +- .../meta-alerts/meta-alerts.component.html | 8 +- .../alerts/meta-alerts/meta-alerts.component.ts | 9 +- .../saved-searches.component.html | 4 +- .../metron-alerts/src/app/model/filter.ts | 4 +- .../src/app/model/group-request.ts | 2 +- .../src/app/service/alerts.service.ts | 2 +- .../src/app/service/global-config.service.ts | 16 +- .../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 | 4 +- .../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 + 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 | 6 +- 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 | 29 +- .../dao/ElasticsearchMetaAlertDaoTest.java | 32 + .../ElasticsearchMetaAlertIntegrationTest.java | 2 + 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/management/KafkaFunctions.java | 173 +- .../KafkaFunctionsIntegrationTest.java | 165 +- metron-platform/metron-parsers/pom.xml | 2 +- .../parsers/topology/ParserTopologyBuilder.java | 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 | 85 +- .../KafkaSpoutRetryExponentialBackoff.java | 336 + .../storm/kafka/spout/internal/Timer.java | 9 +- metron-platform/metron-storm-kafka/pom.xml | 7 +- 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 | 6 +- site-book/pom.xml | 2 +- 132 files changed, 7790 insertions(+), 2125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/4e586ac5/dependencies_with_url.csv ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/4e586ac5/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/4e586ac5/metron-interface/metron-rest/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/4e586ac5/metron-interface/metron-rest/src/main/resources/application.yml ----------------------------------------------------------------------
