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