You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2016/06/07 13:02:51 UTC
incubator-metron git commit: METRON-180 Granular Control of Component
Installation with Tags (nickwallen) closes apache/incubator-metron#133
Repository: incubator-metron
Updated Branches:
refs/heads/master 025f64c4f -> 6ff9c4610
METRON-180 Granular Control of Component Installation with Tags (nickwallen) closes apache/incubator-metron#133
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/6ff9c461
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/6ff9c461
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/6ff9c461
Branch: refs/heads/master
Commit: 6ff9c46106b97644b8c0c358182aaf6822d89bee
Parents: 025f64c
Author: nickwallen <ni...@nickallen.org>
Authored: Tue Jun 7 09:02:21 2016 -0400
Committer: Nick Allen <ni...@nickallen.org>
Committed: Tue Jun 7 09:02:21 2016 -0400
----------------------------------------------------------------------
metron-deployment/amazon-ec2/run.sh | 5 +-
.../playbooks/metron_full_install.yml | 1 +
metron-deployment/playbooks/metron_install.yml | 74 ++++++++++++++------
.../roles/kafka-client/defaults/main.yml | 18 +++++
.../vagrant/full-dev-platform/run.sh | 3 +-
.../vagrant/quick-dev-platform/run.sh | 6 +-
6 files changed, 79 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/amazon-ec2/run.sh
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/run.sh b/metron-deployment/amazon-ec2/run.sh
index 41c5b52..3019167 100755
--- a/metron-deployment/amazon-ec2/run.sh
+++ b/metron-deployment/amazon-ec2/run.sh
@@ -65,4 +65,7 @@ mvn package -DskipTests
# deploy metron
cd $DEPLOYDIR
export EC2_INI_PATH=conf/ec2.ini
-ansible-playbook -i ec2.py playbook.yml --extra-vars="env=$ENV" $EXTRA_ARGS
+ansible-playbook -i ec2.py playbook.yml \
+ --skip-tags="solr" \
+ --extra-vars="env=$ENV" \
+ $EXTRA_ARGS
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/playbooks/metron_full_install.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/metron_full_install.yml b/metron-deployment/playbooks/metron_full_install.yml
index 26ffd62..97e5084 100644
--- a/metron-deployment/playbooks/metron_full_install.yml
+++ b/metron-deployment/playbooks/metron_full_install.yml
@@ -18,6 +18,7 @@
- include: ambari_install.yml
tags:
- ambari
+
- include: metron_install.yml
tags:
- metron
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/playbooks/metron_install.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/metron_install.yml b/metron-deployment/playbooks/metron_install.yml
index 69f35f5..4284234 100644
--- a/metron-deployment/playbooks/metron_install.yml
+++ b/metron-deployment/playbooks/metron_install.yml
@@ -29,6 +29,9 @@
tags:
- packer
+#
+# prerequisites
+#
- hosts: metron
become: true
roles:
@@ -44,22 +47,28 @@
- metron-prereqs
- hadoop-setup
+#
+# search
+#
- hosts: search
become: true
vars:
es_hosts: "{% set comma = joiner(',') %}{% for host in groups['search'] -%}{{ comma() }}{{ host }}{%- endfor %}"
roles:
- - { role: elasticsearch, when: install_elasticsearch | default(True) == True }
+ - role: elasticsearch
tags:
- - search
+ - elasticsearch
- hosts: search
become: true
roles:
- - { role: solr, when: install_solr | default(False) == True }
+ - role: solr
tags:
- - search
+ - solr
+#
+# mysql
+#
- hosts: mysql
become: true
roles:
@@ -74,21 +83,9 @@
tags:
- mysql-client
-- hosts: sensors
- become: true
- roles:
- - ambari_gather_facts
- - { role: tap_interface, when: install_tap | default(False) == True }
- - { role: pycapa, when: install_pycapa | default(True) == True }
- - { role: bro, when: install_bro | default(True) == True }
- - { role: flume, when: install_snort | default(True) == True }
- - { role: snort , when: install_snort | default(True) == True }
- - { role: yaf, when: install_yaf | default(True) == True }
- - { role: pcap_replay, when: install_pcap_replay | default(False) == True }
- - { role: sensor-test-mode, when: sensor_test_mode | default(False) == True }
- tags:
- - sensors
-
+#
+# parsers, enrichment, and indexing topologies
+#
- hosts: enrichment
become: true
roles:
@@ -96,25 +93,56 @@
tags:
- enrichment
+#
+# user interface
+#
- hosts: pcap_server
become: true
roles:
- - { role: metron_pcapservice, when: install_elasticsearch | default(True) == True }
+ - role: metron_pcapservice
tags:
- - pcap_service
+ - pcap-service
- hosts: web
become: true
roles:
- - { role: kibana, when: install_elasticsearch | default(True) == True }
+ - role: kibana
tags:
- - web
+ - kibana
+#
+# sensors
+#
+- hosts: sensors
+ become: true
+ roles:
+ - { role: ambari_gather_facts, tags: [ 'always'] }
+ - { role: tap_interface, tags: ['tap'] }
+ - { role: pycapa, tags: ['pycapa'] }
+ - { role: bro, tags: ['bro'] }
+ - { role: flume, tags: ['snort','flume'] }
+ - { role: snort, tags: ['snort'] }
+ - { role: yaf, tags: ['yaf'] }
+ - { role: pcap_replay, tags: ['pcap-replay'] }
+ - { role: sensor-test-mode, tags: ['sensor-test-mode'] }
+ tags:
+ - sensors
+
+#
+# monit
+#
- hosts: metron
become: true
roles:
- role: ambari_gather_facts
- role: monit
+ tags:
+ - monit
+
+- hosts: metron
+ become: true
+ roles:
+ - role: ambari_gather_facts
- role: monit-start
tags:
- start
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/roles/kafka-client/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kafka-client/defaults/main.yml b/metron-deployment/roles/kafka-client/defaults/main.yml
new file mode 100644
index 0000000..351d125
--- /dev/null
+++ b/metron-deployment/roles/kafka-client/defaults/main.yml
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+hdp_repo_def: http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.2.0/hdp.repo
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/vagrant/full-dev-platform/run.sh
----------------------------------------------------------------------
diff --git a/metron-deployment/vagrant/full-dev-platform/run.sh b/metron-deployment/vagrant/full-dev-platform/run.sh
index 44dc657..b1dea7e 100755
--- a/metron-deployment/vagrant/full-dev-platform/run.sh
+++ b/metron-deployment/vagrant/full-dev-platform/run.sh
@@ -17,5 +17,4 @@
# limitations under the License.
#
-vagrant up
-
+vagrant --ansible-skip-tags="solr" up
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6ff9c461/metron-deployment/vagrant/quick-dev-platform/run.sh
----------------------------------------------------------------------
diff --git a/metron-deployment/vagrant/quick-dev-platform/run.sh b/metron-deployment/vagrant/quick-dev-platform/run.sh
index dc91679..56e7d1a 100755
--- a/metron-deployment/vagrant/quick-dev-platform/run.sh
+++ b/metron-deployment/vagrant/quick-dev-platform/run.sh
@@ -17,5 +17,7 @@
# limitations under the License.
#
-vagrant --ansible-tags="hdp-deploy,metron" up
-
+vagrant \
+ --ansible-tags="hdp-deploy,metron" \
+ --ansible-skip-tags="solr" \
+ up