metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject incubator-metron git commit: METRON-117 Deployment Report Created for All Deployments (nickwallen via cestella) closes apache/incubator-metron#179
Date Fri, 15 Jul 2016 14:56:15 GMT
Repository: incubator-metron
Updated Branches:
  refs/heads/master a045159d0 -> 861336f0d


METRON-117 Deployment Report Created for All Deployments (nickwallen via cestella) closes
apache/incubator-metron#179


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/861336f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/861336f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/861336f0

Branch: refs/heads/master
Commit: 861336f0d4610df881f855bf6b2096f5bc7bb74d
Parents: a045159
Author: nickwallen <nick@nickallen.org>
Authored: Fri Jul 15 10:56:05 2016 -0400
Committer: cstella <cestella@gmail.com>
Committed: Fri Jul 15 10:56:05 2016 -0400

----------------------------------------------------------------------
 metron-deployment/amazon-ec2/playbook.yml       | 12 +------
 .../amazon-ec2/tasks/provisioning-report.yml    | 36 -------------------
 metron-deployment/playbooks/metron_install.yml  | 37 ++++++++++---------
 .../roles/deployment-report/defaults/main.yml   | 18 ++++++++++
 .../roles/deployment-report/meta/main.yml       | 19 ++++++++++
 .../roles/deployment-report/tasks/main.yml      | 38 ++++++++++++++++++++
 6 files changed, 94 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/amazon-ec2/playbook.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/playbook.yml b/metron-deployment/amazon-ec2/playbook.yml
index 2ae6767..1204b52 100644
--- a/metron-deployment/amazon-ec2/playbook.yml
+++ b/metron-deployment/amazon-ec2/playbook.yml
@@ -62,19 +62,9 @@
     - include: tasks/check-volume.yml vol_name=xvda vol_src=/dev/xvda vol_size={{ xvda_vol_size
}}
   tags:
     - ec2
+    - mount
 
 #
 # build the metron cluster
 #
 - include: ../playbooks/metron_full_install.yml
-
-#
-# provisioning report
-#
-- hosts: localhost
-  vars_files:
-    - conf/defaults.yml
-  tasks:
-    - include: tasks/provisioning-report.yml
-  tags:
-    - ec2

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/amazon-ec2/tasks/provisioning-report.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/tasks/provisioning-report.yml b/metron-deployment/amazon-ec2/tasks/provisioning-report.yml
deleted file mode 100644
index f22d0a9..0000000
--- a/metron-deployment/amazon-ec2/tasks/provisioning-report.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  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.
-#
----
-- name: Known hosts groups
-  debug: var=groups
-
-- name: Sanity check Metron web
-  local_action: wait_for host="{{ groups.web[0] }}" port=5000 timeout=20
-
-- name: Sanity check Ambari web
-  local_action: wait_for host="{{ groups.ambari_master[0] }}" port="{{ ambari_port }}" timeout=20
-
-- set_fact:
-    Success:
-      - "Apache Metron deployed successfully"
-      - "   Metron          @ http://{{ groups.web[0] }}:5000"
-      - "   Ambari          @ http://{{ groups.ambari_master[0] }}:{{ ambari_port }}"
-      - "   Sensor Status   @ http://{{ groups.sensors[0] }}:2812"
-      - "   Topology Status @ http://{{ groups.enrichment[0] }}:2812"
-      - For additional information, see https://metron.incubator.apache.org/'
-
-- debug: var=Success

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/playbooks/metron_install.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/metron_install.yml b/metron-deployment/playbooks/metron_install.yml
index cdeac82..21ecebd 100644
--- a/metron-deployment/playbooks/metron_install.yml
+++ b/metron-deployment/playbooks/metron_install.yml
@@ -125,33 +125,32 @@
 - 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'] }
+    - { 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
+# monitor and start metron services with monit
 #
 - hosts: metron
   become: true
   roles:
-    - role: ambari_gather_facts
-    - role: monit
-  tags:
-    - monit
+    - { role: ambari_gather_facts,    tags: ['always'] }
+    - { role: monit,                  tags: ['monit'] }
+    - { role: monit-start,            tags: ['start'] }
 
+#
+# deployment report
+#
 - hosts: metron
-  become: true
+  become: false
   roles:
-    - role: ambari_gather_facts
-    - role: monit-start
-  tags:
-    - start
+    - { role: deployment-report,      tags: ['report'] }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/roles/deployment-report/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/deployment-report/defaults/main.yml b/metron-deployment/roles/deployment-report/defaults/main.yml
new file mode 100644
index 0000000..0a8afb8
--- /dev/null
+++ b/metron-deployment/roles/deployment-report/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.
+#
+---
+timeout_secs: 120

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/roles/deployment-report/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/deployment-report/meta/main.yml b/metron-deployment/roles/deployment-report/meta/main.yml
new file mode 100644
index 0000000..c3d807b
--- /dev/null
+++ b/metron-deployment/roles/deployment-report/meta/main.yml
@@ -0,0 +1,19 @@
+#
+#  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.
+#
+---
+dependencies:
+  - ambari_gather_facts

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/861336f0/metron-deployment/roles/deployment-report/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/deployment-report/tasks/main.yml b/metron-deployment/roles/deployment-report/tasks/main.yml
new file mode 100644
index 0000000..3f947f3
--- /dev/null
+++ b/metron-deployment/roles/deployment-report/tasks/main.yml
@@ -0,0 +1,38 @@
+#
+#  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.
+#
+---
+- name: Sanity check Metron web
+  local_action: wait_for host="{{ groups.web[0] }}" port=5000 timeout="{{ timeout_secs }}"
+
+- name: Sanity check Ambari web
+  local_action: wait_for host="{{ groups.ambari_master[0] }}" port="{{ ambari_port }}" timeout="{{
timeout_secs }}"
+
+- name: Known hosts groups
+  debug: var=groups
+
+- set_fact:
+    Success:
+      - "Apache Metron deployed successfully"
+      - "   Metron          @ http://{{ groups.web[0] }}:5000"
+      - "   Ambari          @ http://{{ groups.ambari_master[0] }}:{{ ambari_port }}"
+      - "   Sensor Status   @ http://{{ groups.sensors[0] }}:2812"
+      - "   Topology Status @ http://{{ groups.enrichment[0] }}:2812"
+      - "   Zookeeper       @ {{ zookeeper_url }}"
+      - "   Kafka           @ {{ kafka_broker_url }}"
+      - For additional information, see https://metron.incubator.apache.org/'
+
+- debug: var=Success


Mime
View raw message