Repository: metron Updated Branches: refs/heads/master a5b13777a -> ab87bdf67
METRON-1007 Ship the metron-management jar as part of the mpack install (ottobackwards) closes apache/metron#627 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/ab87bdf6 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/ab87bdf6 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/ab87bdf6 Branch: refs/heads/master Commit: ab87bdf673e151da4b6352da6b0f4a6957f4777b Parents: a5b1377 Author: ottobackwards <[email protected]> Authored: Tue Jul 4 07:47:43 2017 -0400 Committer: otto <[email protected]> Committed: Tue Jul 4 07:47:43 2017 -0400 ---------------------------------------------------------------------- .../common-services/METRON/CURRENT/metainfo.xml | 3 +++ .../docker/rpm-docker/SPECS/metron.spec | 25 ++++++++++++++++++-- .../packaging/docker/rpm-docker/pom.xml | 6 +++++ metron-platform/metron-management/README.md | 10 ++++---- 4 files changed, 38 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/ab87bdf6/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/metainfo.xml ---------------------------------------------------------------------- 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 35828c4..cd86432 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 @@ -296,6 +296,9 @@ <name>metron-data-management</name> </package> <package> + <name>metron-management</name> + </package> + <package> <name>metron-parsers</name> </package> <package> http://git-wip-us.apache.org/repos/asf/metron/blob/ab87bdf6/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec index 2706e05..f3e351f 100644 --- a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec +++ b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec @@ -52,6 +52,7 @@ Source7: metron-pcap-backend-%{full_version}-archive.tar.gz Source8: metron-profiler-%{full_version}-archive.tar.gz Source9: metron-rest-%{full_version}-archive.tar.gz Source10: metron-config-%{full_version}-archive.tar.gz +Source11: metron-management-%{full_version}-archive.tar.gz %description Apache Metron provides a scalable advanced security analytics framework @@ -85,6 +86,7 @@ tar -xzf %{SOURCE7} -C %{buildroot}%{metron_home} tar -xzf %{SOURCE8} -C %{buildroot}%{metron_home} tar -xzf %{SOURCE9} -C %{buildroot}%{metron_home} tar -xzf %{SOURCE10} -C %{buildroot}%{metron_home} +tar -xzf %{SOURCE11} -C %{buildroot}%{metron_home} install %{buildroot}%{metron_home}/bin/metron-rest %{buildroot}/etc/init.d/ install %{buildroot}%{metron_home}/bin/metron-management-ui %{buildroot}/etc/init.d/ @@ -214,7 +216,7 @@ This package installs the Metron Solr files %{metron_home}/config/solr.properties %attr(0644,root,root) %{metron_home}/lib/metron-solr-%{full_version}-uber.jar -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~â¨â¨ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %package enrichment Summary: Metron Enrichment Files @@ -246,7 +248,7 @@ This package installs the Metron Enrichment files %exclude %{metron_home}/flux/enrichment/test.yaml %attr(0644,root,root) %{metron_home}/lib/metron-enrichment-%{full_version}-uber.jar -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~â¨â¨ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %package indexing Summary: Metron Indexing Files @@ -276,6 +278,23 @@ This package installs the Metron Indexing files # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +%package metron-management +Summary: Metron Management Libary +Group: Applications/Internet +Provides: metron-management = %{version} + +%description metron-management +This package installs the Metron Management Library + +%files metron-management +%defattr(-,root,root,755) +%dir %{metron_root} +%dir %{metron_home}/lib +%attr(0644,root,root) %{metron_home}/lib/metron-management-%{full_version}.jar + + +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + %package pcap Summary: Metron PCAP Group: Applications/Internet @@ -409,6 +428,8 @@ chkconfig --del metron-management-ui # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %changelog +* Thu Jun 29 2017 Apache Metron <[email protected]> - 0.4.0+1 +- Add Metron Management jar * Thu May 15 2017 Apache Metron <[email protected]> - 0.4.0 - Added Management UI * Tue May 9 2017 Apache Metron <[email protected]> - 0.4.0 http://git-wip-us.apache.org/repos/asf/metron/blob/ab87bdf6/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 8feeb2b..1bdb242 100644 --- a/metron-deployment/packaging/docker/rpm-docker/pom.xml +++ b/metron-deployment/packaging/docker/rpm-docker/pom.xml @@ -132,6 +132,12 @@ </includes> </resource> <resource> + <directory>${metron_dir}/metron-platform/metron-management/target/</directory> + <includes> + <include>*.tar.gz</include> + </includes> + </resource> + <resource> <directory>${metron_dir}/metron-platform/metron-parsers/target/</directory> <includes> <include>*.tar.gz</include> http://git-wip-us.apache.org/repos/asf/metron/blob/ab87bdf6/metron-platform/metron-management/README.md ---------------------------------------------------------------------- diff --git a/metron-platform/metron-management/README.md b/metron-platform/metron-management/README.md index b920460..d256885 100644 --- a/metron-platform/metron-management/README.md +++ b/metron-platform/metron-management/README.md @@ -244,10 +244,12 @@ The functions are split roughly into a few sections: * Returns: The String representation of the enrichment config ## Deployment Instructions - -Deployment is as simple as dropping the jar created by this project into -`$METRON_HOME/lib` and starting the Stellar shell via -`$METRON_HOME/bin/stellar` +* Clusters installed via Ambari Management Pack (default) + * Automatically deployed +* Manual installation + * Deployment is as simple as dropping the jar created by this project into + `$METRON_HOME/lib` and starting the Stellar shell via + `$METRON_HOME/bin/stellar` ## Examples Included for description and education purposes are a couple example Stellar REPL transcripts
