You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ot...@apache.org on 2016/10/31 13:07:48 UTC
[07/19] incubator-metron git commit: Merge remote-tracking branch
'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/587e5790
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/587e5790
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/587e5790
Branch: refs/heads/master
Commit: 587e5790460b1b05eb7d9263fb49aecf3f59f480
Parents: 85e13e5 f9b55f5
Author: Otto Fowler <of...@industrialdefender.com>
Authored: Wed Oct 5 07:41:11 2016 -0400
Committer: Otto Fowler <of...@industrialdefender.com>
Committed: Wed Oct 5 07:41:11 2016 -0400
----------------------------------------------------------------------
metron-analytics/metron-maas-common/pom.xml | 2 +-
metron-analytics/metron-maas-service/pom.xml | 2 +-
.../src/main/scripts/maas_deploy.sh | 2 +-
.../src/main/scripts/maas_service.sh | 2 +-
metron-analytics/metron-profiler-client/pom.xml | 4 +-
metron-analytics/metron-profiler/README.md | 8 +-
metron-analytics/metron-profiler/pom.xml | 2 +-
metron-analytics/pom.xml | 2 +-
metron-deployment/amazon-ec2/conf/defaults.yml | 2 +-
.../inventory/full-dev-platform/group_vars/all | 2 +-
.../inventory/metron_example/group_vars/all | 2 +-
.../inventory/multinode-vagrant/group_vars/all | 2 +-
.../inventory/quick-dev-platform/group_vars/all | 2 +-
.../packaging/ambari/metron-mpack/pom.xml | 2 +-
.../METRON/0.2.0BETA/metainfo.xml | 26 --
.../METRON/0.2.0BETA/role_command_order.json | 14 -
.../METRON/0.2.1BETA/metainfo.xml | 26 ++
.../METRON/0.2.1BETA/role_command_order.json | 14 +
.../0.2.0BETA/configuration/metron-env.xml | 174 ------------
.../METRON/0.2.0BETA/metainfo.xml | 273 -------------------
.../0.2.0BETA/package/files/addMysqlUser.sh | 44 ---
.../0.2.0BETA/package/files/bro_index.template | 217 ---------------
.../0.2.0BETA/package/files/createMysqlGeoIp.sh | 42 ---
.../0.2.0BETA/package/files/removeMysqlUser.sh | 33 ---
.../package/files/snort_index.template | 183 -------------
.../0.2.0BETA/package/files/yaf_index.template | 205 --------------
.../package/scripts/enrichment_commands.py | 161 -----------
.../package/scripts/enrichment_master.py | 87 ------
.../package/scripts/indexing_commands.py | 142 ----------
.../package/scripts/indexing_master.py | 120 --------
.../0.2.0BETA/package/scripts/metron_service.py | 76 ------
.../0.2.0BETA/package/scripts/mysql_server.py | 61 -----
.../0.2.0BETA/package/scripts/mysql_service.py | 46 ----
.../0.2.0BETA/package/scripts/mysql_users.py | 58 ----
.../0.2.0BETA/package/scripts/mysql_utils.py | 50 ----
.../package/scripts/params/__init__.py | 18 --
.../0.2.0BETA/package/scripts/params/params.py | 32 ---
.../package/scripts/params/params_linux.py | 169 ------------
.../package/scripts/params/params_windows.py | 20 --
.../package/scripts/params/status_params.py | 57 ----
.../package/scripts/parser_commands.py | 208 --------------
.../0.2.0BETA/package/scripts/parser_master.py | 89 ------
.../0.2.0BETA/package/scripts/service_check.py | 41 ---
.../package/templates/enrichment.properties.j2 | 88 ------
.../METRON/0.2.0BETA/quicklinks/quicklinks.json | 28 --
.../0.2.1BETA/configuration/metron-env.xml | 174 ++++++++++++
.../METRON/0.2.1BETA/metainfo.xml | 273 +++++++++++++++++++
.../0.2.1BETA/package/files/addMysqlUser.sh | 44 +++
.../0.2.1BETA/package/files/bro_index.template | 217 +++++++++++++++
.../0.2.1BETA/package/files/createMysqlGeoIp.sh | 42 +++
.../0.2.1BETA/package/files/removeMysqlUser.sh | 33 +++
.../package/files/snort_index.template | 183 +++++++++++++
.../0.2.1BETA/package/files/yaf_index.template | 205 ++++++++++++++
.../package/scripts/enrichment_commands.py | 161 +++++++++++
.../package/scripts/enrichment_master.py | 87 ++++++
.../package/scripts/indexing_commands.py | 142 ++++++++++
.../package/scripts/indexing_master.py | 120 ++++++++
.../0.2.1BETA/package/scripts/metron_service.py | 76 ++++++
.../0.2.1BETA/package/scripts/mysql_server.py | 61 +++++
.../0.2.1BETA/package/scripts/mysql_service.py | 46 ++++
.../0.2.1BETA/package/scripts/mysql_users.py | 58 ++++
.../0.2.1BETA/package/scripts/mysql_utils.py | 50 ++++
.../package/scripts/params/__init__.py | 18 ++
.../0.2.1BETA/package/scripts/params/params.py | 32 +++
.../package/scripts/params/params_linux.py | 169 ++++++++++++
.../package/scripts/params/params_windows.py | 20 ++
.../package/scripts/params/status_params.py | 57 ++++
.../package/scripts/parser_commands.py | 208 ++++++++++++++
.../0.2.1BETA/package/scripts/parser_master.py | 89 ++++++
.../0.2.1BETA/package/scripts/service_check.py | 41 +++
.../package/templates/enrichment.properties.j2 | 88 ++++++
.../METRON/0.2.1BETA/quicklinks/quicklinks.json | 28 ++
.../metron-mpack/src/main/resources/mpack.json | 2 +-
.../docker/rpm-docker/SPECS/metron.spec | 1 +
.../packaging/docker/rpm-docker/pom.xml | 6 +-
.../playbooks/docker_probe_install.yml | 2 +-
metron-deployment/pom.xml | 2 +-
.../roles/metron_pcapservice/defaults/main.yml | 2 +-
.../roles/mysql_server/defaults/main.yml | 1 +
.../roles/mysql_server/tasks/geoip.yml | 4 +-
metron-platform/README.md | 2 +-
metron-platform/elasticsearch-shaded/pom.xml | 2 +-
metron-platform/metron-api/pom.xml | 2 +-
metron-platform/metron-common/pom.xml | 2 +-
metron-platform/metron-data-management/pom.xml | 2 +-
metron-platform/metron-elasticsearch/pom.xml | 2 +-
metron-platform/metron-enrichment/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 +-
metron-platform/metron-pcap/pom.xml | 2 +-
metron-platform/metron-solr/pom.xml | 2 +-
metron-platform/metron-test-utilities/pom.xml | 2 +-
metron-platform/metron-writer/pom.xml | 2 +-
metron-platform/pom.xml | 2 +-
pom.xml | 3 +-
site/community/index.md | 8 +
100 files changed, 2818 insertions(+), 2809 deletions(-)
----------------------------------------------------------------------