metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject [4/6] incubator-metron git commit: METRON-671 Refactor existing Ansible deployment to use Ambari MPack (dlyle via justinleet) closes apache/incubator-metron#436
Date Fri, 10 Mar 2017 14:32:39 GMT
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/playbooks/metron_build.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/metron_build.yml b/metron-deployment/playbooks/metron_build.yml
new file mode 100644
index 0000000..70d2ae5
--- /dev/null
+++ b/metron-deployment/playbooks/metron_build.yml
@@ -0,0 +1,21 @@
+#
+#  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.
+#
+---
+- hosts: all
+  become: false
+  roles:
+    - role: metron-builder

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/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 97e5084..3f1fa9a 100644
--- a/metron-deployment/playbooks/metron_full_install.yml
+++ b/metron-deployment/playbooks/metron_full_install.yml
@@ -15,6 +15,10 @@
 #  limitations under the License.
 #
 ---
+- include: metron_build.yml
+  tags:
+    - build
+
 - include: ambari_install.yml
   tags:
     - ambari

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/playbooks/metron_install.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/metron_install.yml b/metron-deployment/playbooks/metron_install.yml
index 359808a..6d31800 100644
--- a/metron-deployment/playbooks/metron_install.yml
+++ b/metron-deployment/playbooks/metron_install.yml
@@ -15,6 +15,16 @@
 #  limitations under the License.
 #
 ---
+- hosts: metron
+  become: true
+  roles:
+    - role: ambari_slave
+    - role: metron-builder
+    - role: metron-rpms
+    - role: quick_dev
+  tags:
+    - quick_dev
+    -
 - hosts: ec2
   become: true
   tasks:
@@ -29,65 +39,6 @@
   tags:
     - packer
 
-#
-# prerequisites
-#
-- hosts: metron
-  become: true
-  roles:
-    - role: metron_common
-  tags:
-    - metron-prereqs
-
-#
-# search
-#
-- hosts: search
-  become: true
-  vars:
-    es_hosts: "{% set comma = joiner(',') %}{% for host in groups['search'] -%}{{ comma() }}{{ host }}{%- endfor %}"
-  roles:
-    - role: elasticsearch
-    - { role: metron_elasticsearch_templates, tags: ['load_es_templates'] }
-  tags:
-    - elasticsearch
-
-- hosts: search
-  become: true
-  roles:
-    - role: solr
-  tags:
-    - solr
-
-#
-# parsers, enrichment, and indexing topologies
-#
-- hosts: metron_hbase_tables
-  become: true
-  roles:
-    - role: ambari_gather_facts
-    - role: metron_hbase_tables
-  tags:
-    - metron-hbase-tables
-
-- hosts: metron_kafka_topics
-  become: true
-  roles:
-    - role: ambari_gather_facts
-    - role: metron_kafka_topics
-  tags:
-    - metron-kafka-topics
-
-- hosts: enrichment
-  become: true
-  tags:
-    - enrichment
-  roles:
-    - role: metron_streaming
-
-#
-# user interface
-#
 - hosts: pcap_server
   become: true
   roles:
@@ -95,13 +46,6 @@
   tags:
     - pcap-service
 
-- hosts: web
-  become: true
-  roles:
-    - role: kibana
-  tags:
-    - kibana
-
 #
 # sensors
 #
@@ -134,7 +78,7 @@
 #
 # monitor and start metron services with monit
 #
-- hosts: metron
+- hosts: monit
   become: true
   roles:
     - { role: ambari_gather_facts,    tags: ['always'] }
@@ -144,7 +88,7 @@
 #
 # deployment report
 #
-- hosts: metron
+- hosts: monit
   become: false
   roles:
     - { role: deployment-report,      tags: ['report'] }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/pom.xml
----------------------------------------------------------------------
diff --git a/metron-deployment/pom.xml b/metron-deployment/pom.xml
index 0d7e9bb..1179906 100644
--- a/metron-deployment/pom.xml
+++ b/metron-deployment/pom.xml
@@ -37,7 +37,7 @@
             </modules>
         </profile>
         <profile>
-            <id>default</id>
+            <id>mpack</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_common/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_common/defaults/main.yml b/metron-deployment/roles/ambari_common/defaults/main.yml
index eda4a06..2c9389c 100644
--- a/metron-deployment/roles/ambari_common/defaults/main.yml
+++ b/metron-deployment/roles/ambari_common/defaults/main.yml
@@ -17,5 +17,4 @@
 ---
 hadoop_logrotate_frequency: daily
 hadoop_logrotate_retention: 30
-
-rhel_ambari_install_url: "http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.4.0.1/ambari.repo"
\ No newline at end of file
+rhel_ambari_install_url: http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.4.2.0/ambari.repo

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/meta/main.yml b/metron-deployment/roles/ambari_config/meta/main.yml
index 61197e3..8f65a28 100644
--- a/metron-deployment/roles/ambari_config/meta/main.yml
+++ b/metron-deployment/roles/ambari_config/meta/main.yml
@@ -19,3 +19,4 @@ dependencies:
   - epel
   - python-pip
   - httplib2
+  - java_jdk

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/tasks/main.yml b/metron-deployment/roles/ambari_config/tasks/main.yml
index 7697202..aa1004c 100644
--- a/metron-deployment/roles/ambari_config/tasks/main.yml
+++ b/metron-deployment/roles/ambari_config/tasks/main.yml
@@ -46,5 +46,4 @@
     wait_for_complete: True
     blueprint_var: "{{ blueprint }}"
 
-- include: start_hdp.yml
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/tasks/start_hdp.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/tasks/start_hdp.yml b/metron-deployment/roles/ambari_config/tasks/start_hdp.yml
deleted file mode 100644
index 36f797f..0000000
--- a/metron-deployment/roles/ambari_config/tasks/start_hdp.yml
+++ /dev/null
@@ -1,43 +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.
-#
----
-#
-# Workaround for Kafka not starting
-# Fire off async start followed by
-# Sync start -execution will pause until
-# final start completes.
-#
-- name: Start the ambari cluster - no wait
-  ambari_cluster_state:
-    host: "{{ groups.ambari_master[0] }}"
-    port: "{{ ambari_port }}"
-    username: "{{ ambari_user }}"
-    password: "{{ ambari_password }}"
-    cluster_name: "{{ cluster_name }}"
-    cluster_state: started
-    wait_for_complete: False
-
-- name: Start the ambari cluster - wait
-  ambari_cluster_state:
-    host: "{{ groups.ambari_master[0] }}"
-    port: "{{ ambari_port }}"
-    username: "{{ ambari_user }}"
-    password: "{{ ambari_password }}"
-    cluster_name: "{{ cluster_name }}"
-    cluster_state: started
-    wait_for_complete: True
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/vars/multi_vagrant_cluster.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/vars/multi_vagrant_cluster.yml b/metron-deployment/roles/ambari_config/vars/multi_vagrant_cluster.yml
deleted file mode 100644
index 18d3b8d..0000000
--- a/metron-deployment/roles/ambari_config/vars/multi_vagrant_cluster.yml
+++ /dev/null
@@ -1,99 +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.
-#
----
-
-hadoop_master: [NAMENODE, SECONDARY_NAMENODE, RESOURCEMANAGER, HISTORYSERVER]
-hadoop_slave: [APP_TIMELINE_SERVER, DATANODE, NODEMANAGER]
-spark_master: [SPARK_JOBHISTORYSERVER]
-storm_master: [NIMBUS, STORM_UI_SERVER, DRPC_SERVER]
-storm_slave: [SUPERVISOR]
-kafka_broker: [KAFKA_BROKER]
-zookeeper_master: [ZOOKEEPER_SERVER]
-hbase_master: [HBASE_MASTER]
-hbase_slave: [HBASE_REGIONSERVER]
-hadoop_clients: [HDFS_CLIENT, YARN_CLIENT, MAPREDUCE2_CLIENT, SPARK_CLIENT, ZOOKEEPER_CLIENT, HBASE_CLIENT]
-
-master_1_components: "{{ hadoop_master | union(hadoop_clients) }}"
-
-master_1_host:
-  - "{{groups.ambari_slave[0]}}"
-master_2_components: "{{ zookeeper_master | union(storm_master) | union(spark_master) | union(hbase_master) | union(hadoop_clients) }}"
-master_2_host:
-  - "{{groups.ambari_slave[1]}}"
-slave_components: "{{ hadoop_slave | union(storm_slave) | union(kafka_broker) | union(hbase_slave) | union(hadoop_clients) }}"
-
-cluster_name: "metron"
-blueprint_name: "metron_blueprint"
-
-configurations:
-  - zoo.cfg:
-      dataDir: '{{ zookeeper_data_dir | default("/hadoop/zookeeper") }}'
-  - hdfs-site:
-      dfs.namenode.checkpoint.dir: '{{ namenode_checkpoint_dir | default("/hadoop/hdfs/namesecondary") }}'
-      dfs.namenode.name.dir: '{{ namenode_name_dir | default("/hadoop/hdfs/namenode") }}'
-      dfs.datanode.data.dir: '{{ datanode_data_dir | default("/hadoop/hdfs/data" ) }}'
-      dfs.journalnode.edits.dir: '{{ journalnode_edits_dir | default("/hadoop/hdfs/journalnode") }}'
-  - hadoop-env:
-      namenode_heapsize: 2048
-      dtnode_heapsize: 1024
-  - hbase-env:
-      hbase_regionserver_heapsize: 1024
-      hbase_master_heapsize: 1024
-  - yarn-env:
-      nodemanager_heapsize: 512
-      yarn_heapsize: 512
-      apptimelineserver_heapsize : 512
-  - mapred-env:
-      jobhistory_heapsize: 256
-  - yarn-site:
-      yarn.nodemanager.resource.memory-mb: 1024
-      yarn.scheduler.maximum-allocation-mb: 1024
-      yarn.nodemanager.local-dirs : '{{ nodemanager_local_dirs| default("/hadoop/yarn/local") }}'
-      yarn.timeline-service.leveldb-timeline-store.path: '{{ timeline_ldb_store_path | default("/hadoop/yarn/timeline") }}'
-      yarn.timeline-service.leveldb-state-store.path: '{{ timeline_ldb_state_path| default("/hadoop/yarn/timeline") }}'
-      yarn.nodemanager.log-dirs: '{{ nodemanager_log_dirs| default("/hadoop/yarn/log") }}'
-
-  - mapred-site:
-      mapreduce.jobhistory.recovery.store.leveldb.path : '{{ jhs_recovery_store_ldb_path | default("/hadoop/mapreduce/jhs") }}'
-  - storm-site:
-      supervisor.slots.ports: "[6700, 6701, 6702, 6703]"
-      storm.local.dir: '{{ storm_local_dir | default("/hadoop/storm") }}'
-      topology.classpath: '{{ topology_classpath }}'
-  - kafka-env:
-      content: "{% raw %}\n#!/bin/bash\n\n# Set KAFKA specific environment variables here.\n\n# The java implementation to use.\nexport KAFKA_HEAP_OPTS=\"-Xms256M -Xmx256M\"\nexport KAFKA_JVM_PERFORMANCE_OPTS=\"-server -XX:+UseG1GC -XX:+DisableExplicitGC -Djava.awt.headless=true\"\nexport JAVA_HOME={{java64_home}}\nexport PATH=$PATH:$JAVA_HOME/bin\nexport PID_DIR={{kafka_pid_dir}}\nexport LOG_DIR={{kafka_log_dir}}\nexport KAFKA_KERBEROS_PARAMS={{kafka_kerberos_params}}\n# Add kafka sink to classpath and related depenencies\nif [ -e \"/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar\" ]; then\n  export CLASSPATH=$CLASSPATH:/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar\n  export CLASSPATH=$CLASSPATH:/usr/lib/ambari-metrics-kafka-sink/lib/*\nfi\nif [ -f /etc/kafka/conf/kafka-ranger-env.sh ]; then\n   . /etc/kafka/conf/kafka-ranger-env.sh\nfi{% endraw %}"
-  - kafka-broker:
-      log.dirs: '{{ kafka_log_dirs | default("/kafka-log") }}'
-
-blueprint:
-  stack_name: HDP
-  stack_version: "{{ hdp_stack }}"
-  groups:
-    - name : master_1
-      cardinality: 1
-      configuration: []  # configuration not yet implemented
-      components: "{{ master_1_components }}"
-      hosts: "{{ master_1_host }}"
-    - name : master_2
-      cardinality: 1
-      configuration: []  # configuration not yet implemented
-      components: "{{ master_2_components }}"
-      hosts: "{{ master_2_host }}"
-    - name: slaves
-      cardinality: 1+
-      configuration: []  # configuration not yet implemented
-      components: "{{ slave_components }}"
-      hosts: "{{ groups.ambari_slave | difference(groups.ambari_slave[0]) | difference(groups.ambari_slave[1]) }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/vars/single_node_vm.yml b/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
index 429981e..46a486e 100644
--- a/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
+++ b/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
@@ -28,8 +28,16 @@ zookeeper_master: [ZOOKEEPER_SERVER]
 zookeeper_slave: [ZOOKEEPER_CLIENT]
 hbase_master: [HBASE_MASTER, HBASE_CLIENT]
 hbase_slave: [HBASE_REGIONSERVER]
+es_master: [ES_MASTER]
+kibana_master: [KIBANA_MASTER]
+metron_indexing: [METRON_INDEXING]
+metron_enrichment_master : [METRON_ENRICHMENT_MASTER]
+metron_parsers : [METRON_PARSERS]
 
-metron_components: "{{ hadoop_master | union(zookeeper_master) | union(storm_master) | union(hbase_master) | union(hadoop_slave) | union(zookeeper_slave) | union(storm_slave) | union(kafka_broker) | union(hbase_slave) }}"
+metron_components: >
+  {{ hadoop_master | union(zookeeper_master) | union(storm_master) | union(hbase_master) | union(hadoop_slave) | union(zookeeper_slave) |
+  union(storm_slave) | union(kafka_broker) | union(hbase_slave) | union(kibana_master) | union(metron_indexing) |
+  union(metron_enrichment_master) | union(metron_parsers) | union(es_master) }}
 
 cluster_name: "metron_cluster"
 blueprint_name: "metron_blueprint"
@@ -80,10 +88,32 @@ configurations:
   - kafka-broker:
       log.dirs: '{{ kafka_log_dirs }}'
       delete.topic.enable: "true"
+  - metron-env:
+      parsers: "bro,snort"
+  - elastic-site:
+      index_number_of_shards: 1
+      index_number_of_replicas: 0
+      zen_discovery_ping_unicast_hosts: "{{ groups.search | join(',') }}"
+      gateway_recover_after_data_nodes: 1
+      network_host: "_lo_,_eth0_,_eth1_"
+      masters_also_are_datanodes: "1"
+
+required_configurations:
+  - metron-env:
+      storm_rest_addr: "{{ groups.ambari_slave[0] }}:8744"
+      es_hosts: "{{ groups.search | join(',') }}"
+      zeppelin_server_url: "{{ groups.zeppelin[0] }}:9995"
+  - kibana-env:
+      kibana_pid_dir: /var/run/kibana
+      kibana_es_url: http://{{ groups.search[0] }}:9200
+      kibana_log_dir: /var/log/kibana
+      kibana_server_port: 5000
+      kibana_default_application: "dashboard/Metron-Dashboard"
 
 blueprint:
   stack_name: HDP
   stack_version: "{{ hdp_stack }}"
+  required_configurations: "{{ required_configurations }}"
   groups:
     - name : host_group_1
       cardinality: 1

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_config/vars/small_cluster.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/vars/small_cluster.yml b/metron-deployment/roles/ambari_config/vars/small_cluster.yml
index a976d00..2f15740 100644
--- a/metron-deployment/roles/ambari_config/vars/small_cluster.yml
+++ b/metron-deployment/roles/ambari_config/vars/small_cluster.yml
@@ -17,7 +17,8 @@
 ---
 
 hadoop_master: [NAMENODE, SECONDARY_NAMENODE, RESOURCEMANAGER, HISTORYSERVER]
-hadoop_slave: [APP_TIMELINE_SERVER, DATANODE, NODEMANAGER]
+app_timeline_server: [APP_TIMELINE_SERVER]
+hadoop_slave: [DATANODE, NODEMANAGER]
 spark_master: [SPARK_JOBHISTORYSERVER]
 storm_master: [NIMBUS, STORM_UI_SERVER, DRPC_SERVER]
 storm_slave: [SUPERVISOR]
@@ -26,13 +27,27 @@ zookeeper_master: [ZOOKEEPER_SERVER]
 hbase_master: [HBASE_MASTER]
 hbase_slave: [HBASE_REGIONSERVER]
 hadoop_clients: [HDFS_CLIENT, YARN_CLIENT, MAPREDUCE2_CLIENT, SPARK_CLIENT, ZOOKEEPER_CLIENT, HBASE_CLIENT]
+es_master: [ES_MASTER]
+es_slave: [ES_SLAVE]
+kibana_master: [KIBANA_MASTER]
+metron_indexing: [METRON_INDEXING]
+metron_enrichment_master : [METRON_ENRICHMENT_MASTER]
+metron_parsers : [METRON_PARSERS]
 
-master_1_components: "{{ hadoop_master | union(hadoop_clients) }}"
+master_1_components: "{{ hadoop_master | union(hadoop_clients) | union(es_slave) }}"
 master_1_host:
   - "{{groups.ambari_slave[0]}}"
-master_2_components: "{{ zookeeper_master | union(storm_master) | union(spark_master) | union(hbase_master) | union(hadoop_clients) }}"
+master_2_components: "{{ zookeeper_master | union(storm_master) | union(spark_master) | union(hbase_master) | union(hadoop_clients) | union(app_timeline_server) | union(es_slave) }}"
 master_2_host:
   - "{{groups.ambari_slave[1]}}"
+metron_components: >
+    {{ metron_indexing | union(metron_enrichment_master) | union(metron_parsers) | union(hadoop_slave) | union(storm_slave) |
+    union(kafka_broker) | union(hbase_slave) | union(hadoop_clients) }}
+metron_host:
+  - "{{ groups.metron[0] }}"
+web_components: "{{ kibana_master | union(es_master) }}"
+web_host:
+  - "{{ groups.web[0] }}"
 slave_components: "{{ hadoop_slave | union(storm_slave) | union(kafka_broker) | union(hbase_slave) | union(hadoop_clients) }}"
 
 cluster_name: "metron"
@@ -68,10 +83,31 @@ configurations:
       topology.classpath: '{{ topology_classpath }}'
   - kafka-broker:
       log.dirs: '{{ kafka_log_dirs | default("/kafka-log") }}'
+  - metron-env:
+      parsers: "bro,snort,yaf"
+  - elastic-site:
+      index_number_of_shards: 2
+      index_number_of_replicas: 1
+      zen_discovery_ping_unicast_hosts: "{{ groups.web[0] }},{{ groups.search | join(',') }}"
+      gateway_recover_after_data_nodes: 1
+      network_host: _lo_,_{{ elasticsearch_network_interface }}_
+
+required_configurations:
+  - metron-env:
+      storm_rest_addr: "{{ groups.ambari_slave[1] }}:8744"
+      es_hosts: "{{ groups.web[0] }},{{ groups.search | join(',') }}"
+      zeppelin_server_url: "{{ groups.zeppelin[0] }}"
+  - kibana-env:
+      kibana_pid_dir: /var/run/kibana
+      kibana_es_url: http://{{ groups.web[0] }}:9200
+      kibana_log_dir: /var/log/kibana
+      kibana_server_port: 5000
+      kibana_default_application: "dashboard/Metron-Dashboard"
 
 blueprint:
   stack_name: HDP
   stack_version: "{{ hdp_stack }}"
+  required_configurations: "{{ required_configurations }}"
   groups:
     - name : master_1
       cardinality: 1
@@ -83,8 +119,18 @@ blueprint:
       configuration: []  # configuration not yet implemented
       components: "{{ master_2_components }}"
       hosts: "{{ master_2_host }}"
+    - name : metron
+      cardinality: 1
+      configuration: []  # configuration not yet implemented
+      components: "{{ metron_components }}"
+      hosts: "{{ metron_host }}"
+    - name : web
+      cardinality: 1
+      configuration: []  # configuration not yet implemented
+      components: "{{ web_components }}"
+      hosts: "{{ web_host }}"
     - name: slaves
       cardinality: 1+
       configuration: []  # configuration not yet implemented
       components: "{{ slave_components }}"
-      hosts: "{{ groups.ambari_slave | difference(groups.ambari_slave[0]) | difference(groups.ambari_slave[1]) }}"
+      hosts: "{{ groups.ambari_slave | difference(groups.ambari_slave[0]) | difference(groups.ambari_slave[1]) | difference(groups.metron[0]) | difference(groups.web[0]) }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_gather_facts/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_gather_facts/tasks/main.yml b/metron-deployment/roles/ambari_gather_facts/tasks/main.yml
index 69e8eb5..c976e27 100644
--- a/metron-deployment/roles/ambari_gather_facts/tasks/main.yml
+++ b/metron-deployment/roles/ambari_gather_facts/tasks/main.yml
@@ -193,6 +193,35 @@
     zookeeper_url: "{% for host in zookeeper_hosts %}{% if loop.index != 1 %},{% endif %}{{ host }}:{{ zookeeper_port }}{% endfor %}"
   when: zookeeper_url is undefined
 
+- name: "Ask Ambari: metron_hosts"
+  uri:
+    url: "http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/{{ cluster_name }}/services/METRON/components/METRON_INDEXING"
+    user: "{{ ambari_user }}"
+    password: "{{ ambari_password }}"
+    force_basic_auth: yes
+    return_content: yes
+  register: metron_hosts_response
+  when: metron_hosts is undefined
+
+- set_fact:
+    metron_hosts: "{{ (metron_hosts_response.content | from_json).host_components | map(attribute='HostRoles.host_name') | list }}"
+  when: metron_hosts is undefined
+
+- name: "Ask Ambari: kibana_hosts"
+  uri:
+    url: "http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/{{ cluster_name }}/services/KIBANA/components/KIBANA_MASTER"
+    user: "{{ ambari_user }}"
+    password: "{{ ambari_password }}"
+    force_basic_auth: yes
+    return_content: yes
+  register: kibana_hosts_response
+  when: kibana_hosts is undefined
+
+- set_fact:
+    kibana_hosts: "{{ (kibana_hosts_response.content | from_json).host_components | map(attribute='HostRoles.host_name') | list }}"
+  when: kibana_hosts is undefined
+
+
 #
 # debug output
 #
@@ -203,4 +232,5 @@
           zookeeper_url = {{ zookeeper_url }},
           kafka_broker_port = {{ kafka_broker_port }},
           kafka_broker_hosts = {{ kafka_broker_hosts }},
-          kafka_broker_url = {{ kafka_broker_url }}"
+          kafka_broker_url = {{ kafka_broker_url }},
+          metron_hosts = {{ metron_hosts }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_master/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_master/defaults/main.yml b/metron-deployment/roles/ambari_master/defaults/main.yml
index 3b8cc73..b043f06 100644
--- a/metron-deployment/roles/ambari_master/defaults/main.yml
+++ b/metron-deployment/roles/ambari_master/defaults/main.yml
@@ -16,4 +16,4 @@
 #
 ---
 ambari_server_mem: 2048
-
+ambari_mpack_version: 0.3.1.0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_master/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_master/tasks/main.yml b/metron-deployment/roles/ambari_master/tasks/main.yml
index 05d3214..28b89e8 100644
--- a/metron-deployment/roles/ambari_master/tasks/main.yml
+++ b/metron-deployment/roles/ambari_master/tasks/main.yml
@@ -36,7 +36,17 @@
 - name: Setup ambari server
   shell: ambari-server setup -s && touch /etc/ambari-server/configured creates=/etc/ambari-server/configured
   register: ambari_server_setup
-  failed_when: ambari_server_setup.stderr
+  failed_when: "ambari_server_setup.stderr or 'FATAL' in ambari_server_setup.stdout"
+
+- name: Copy MPack to Ambari Host
+  copy:
+    src: "{{ playbook_dir }}/../packaging/ambari/metron-mpack/target/metron_mpack-{{ ambari_mpack_version }}.tar.gz"
+    dest: /tmp
+
+- name: Install MPack on Ambari Host
+  shell: ambari-server install-mpack --mpack=/tmp/metron_mpack-0.3.1.0.tar.gz
+  args:
+    creates: /var/lib/ambari-server/resources/mpacks/metron-ambari.mpack-{{ ambari_mpack_version }}/addon-services
 
 - name: start ambari server
   service:

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_slave/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_slave/meta/main.yml b/metron-deployment/roles/ambari_slave/meta/main.yml
new file mode 100644
index 0000000..ddf6aa9
--- /dev/null
+++ b/metron-deployment/roles/ambari_slave/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:
+  - java_jdk

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/ambari_slave/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_slave/tasks/main.yml b/metron-deployment/roles/ambari_slave/tasks/main.yml
index ab966db..3fcd24f 100644
--- a/metron-deployment/roles/ambari_slave/tasks/main.yml
+++ b/metron-deployment/roles/ambari_slave/tasks/main.yml
@@ -45,7 +45,10 @@
     - { regexp: "^hostname_script=.*$", line: "hostname_script=/var/lib/ambari-agent/hostname.sh", insertafter: '\[agent\]'}
 
 - name: Ensure ambari-agent is running
-  service: name=ambari-agent state=restarted
+  service:
+    name: ambari-agent
+    state: restarted
+    enabled: yes
 
 - name : Wait for agent to register
   command : sleep 10

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/bro/tasks/bro-plugin-kafka.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/bro/tasks/bro-plugin-kafka.yml b/metron-deployment/roles/bro/tasks/bro-plugin-kafka.yml
index d8e887d..fe57ef2 100644
--- a/metron-deployment/roles/bro/tasks/bro-plugin-kafka.yml
+++ b/metron-deployment/roles/bro/tasks/bro-plugin-kafka.yml
@@ -39,3 +39,6 @@
     - "redef Kafka::topic_name = \"{{ bro_topic }}\";"
     - "redef Kafka::tag_json = T;"
     - "redef Kafka::kafka_conf = table([\"metadata.broker.list\"] = \"{{ kafka_broker_url }}\");"
+
+- name: Deploy bro configuration changes
+  shell: "{{ bro_home }}/bin/broctl deploy"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/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
index 3f947f3..de76805 100644
--- a/metron-deployment/roles/deployment-report/tasks/main.yml
+++ b/metron-deployment/roles/deployment-report/tasks/main.yml
@@ -30,7 +30,6 @@
       - "   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/'

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/defaults/main.yml b/metron-deployment/roles/elasticsearch/defaults/main.yml
deleted file mode 100644
index 0026717..0000000
--- a/metron-deployment/roles/elasticsearch/defaults/main.yml
+++ /dev/null
@@ -1,22 +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.
-#
----
-elasticsearch_data_dir: /var/lib/elasticsearch
-elasticsearch_network_interface: eth0
-elasticsearch_logrotate_frequency: daily
-elasticsearch_logrotate_retention: 30
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/files/elasticsearch.repo
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/files/elasticsearch.repo b/metron-deployment/roles/elasticsearch/files/elasticsearch.repo
deleted file mode 100644
index 51dba70..0000000
--- a/metron-deployment/roles/elasticsearch/files/elasticsearch.repo
+++ /dev/null
@@ -1,24 +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.
-#
-
-[elasticsearch-2.x]
-name=Elasticsearch repository for 2.x packages
-baseurl=https://packages.elastic.co/elasticsearch/2.x/centos
-gpgcheck=1
-gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
-enabled=1
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/meta/main.yml b/metron-deployment/roles/elasticsearch/meta/main.yml
deleted file mode 100644
index f5f059a..0000000
--- a/metron-deployment/roles/elasticsearch/meta/main.yml
+++ /dev/null
@@ -1,24 +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.
-#
----
-dependencies:
-  - java_jdk
-  - epel
-  - python-pip
-  - httplib2
-  - libselinux-python
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/tasks/elasticsearch.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/tasks/elasticsearch.yml b/metron-deployment/roles/elasticsearch/tasks/elasticsearch.yml
deleted file mode 100644
index 92ef9c5..0000000
--- a/metron-deployment/roles/elasticsearch/tasks/elasticsearch.yml
+++ /dev/null
@@ -1,73 +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: Add Elasticsearch GPG key
-  rpm_key:
-    key: https://packages.elastic.co/GPG-KEY-elasticsearch
-    state: present
-
-- name: Add Elasticsearch repository
-  copy:
-    src: elasticsearch.repo
-    dest: /etc/yum.repos.d/elasticsearch.repo
-    mode: 0644
-
-- name: Install Elasticsearch
-  yum:
-    name: elasticsearch
-    state: installed
-  register: result
-  until: result.rc == 0
-  retries: 5
-  delay: 10
-
-- name: Create Data Directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0755
-    owner: elasticsearch
-    group: elasticsearch
-  when: elasticsearch_data_dir is defined
-  with_items:
-     - '{{ elasticsearch_data_dir.split(",") }}'
-
-- name: Configure Elasticsearch - remove stale entries
-  lineinfile: >
-    dest=/etc/elasticsearch/elasticsearch.yml
-    regexp="{{ item }}"
-    state=absent
-  with_items:
-    - '^cluster\.name:'
-    - '^network\.host:'
-    - '^discovery\.zen\.ping\.unicast\.hosts:'
-    - '^path\.data'
-
-- name: Configure Elasticsearch
-  lineinfile: >
-    dest=/etc/elasticsearch/elasticsearch.yml
-    regexp="{{ item.regexp }}"
-    insertafter="{{ item.regexp }}"
-    line="{{ item.line }}"
-    state=present
-  with_items:
-    - { regexp: '^# *cluster\.name:', line: 'cluster.name: metron' }
-    - { regexp: '^# *network\.host:', line: 'network.host: ["_{{
-    elasticsearch_network_interface  }}:ipv4_","_local:ipv4_"]' }
-    - { regexp: '^# *discovery\.zen\.ping\.unicast\.hosts:',
-    line: 'discovery.zen.ping.unicast.hosts: [ {{ es_hosts }} ]'}
-    - { regexp: '^# *path\.data', line: 'path.data: {{     elasticsearch_data_dir }}' }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/tasks/main.yml b/metron-deployment/roles/elasticsearch/tasks/main.yml
deleted file mode 100644
index 7478842..0000000
--- a/metron-deployment/roles/elasticsearch/tasks/main.yml
+++ /dev/null
@@ -1,24 +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.
-#
----
-- include: elasticsearch.yml
-
-- name: Create Logrotate Script for Elasticsearch
-  template:
-    src: "metron-elasticsearch-logrotate.yml"
-    dest: "/etc/logrotate.d/metron-elasticsearch"
-    mode: 0644

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/elasticsearch/templates/metron-elasticsearch-logrotate.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/elasticsearch/templates/metron-elasticsearch-logrotate.yml b/metron-deployment/roles/elasticsearch/templates/metron-elasticsearch-logrotate.yml
deleted file mode 100644
index c84f085..0000000
--- a/metron-deployment/roles/elasticsearch/templates/metron-elasticsearch-logrotate.yml
+++ /dev/null
@@ -1,27 +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.
-#
-
-#Elasticsearch
-/var/log/elasticsearch/*.log {
-  {{ elasticsearch_logrotate_frequency }}
-  rotate {{ elasticsearch_logrotate_retention }}
-  missingok
-  notifempty
-  copytruncate
-  compress
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/java_jdk/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/java_jdk/defaults/main.yml b/metron-deployment/roles/java_jdk/defaults/main.yml
index e593a71..315bc0c 100644
--- a/metron-deployment/roles/java_jdk/defaults/main.yml
+++ b/metron-deployment/roles/java_jdk/defaults/main.yml
@@ -15,4 +15,4 @@
 #  limitations under the License.
 #
 ---
-java_home: /usr/jdk64/jdk1.8.0_60
\ No newline at end of file
+java_home: /usr/jdk64/jdk1.8.0_77

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/README.md b/metron-deployment/roles/kibana/README.md
deleted file mode 100644
index dd3571b..0000000
--- a/metron-deployment/roles/kibana/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Kibana 4
---------
-
-This role installs Kibana along with the default Metron Dashboard.
-
-### FAQ
-
-#### How do I change Metron's default dashboard?
-
-Kibana stores all configuration elements within an Elasticsearch index called `.kibana`.  To deploy Kibana in a desired state, including the Metron Dashboard, we simply take an extract from a functioning Kibana instance and store that in `templates/kibana-index.json`.  The deployment process then restores the index from this extract.
-
-(1) Stand-up an instance of Apache Metron and create the Kibana index patterns, visualizations, and dashboard as you see fit.
-
-(2) Run the following command to extract the definitions for all the components that you have created.  Be sure to delete anything that you don't want to be part of this extract.  It will include all artifacts present in your `.kibana` index.
-
-  ```
-  elasticdump --input=http://ec2-52-41-121-175.us-west-2.compute.amazonaws.com:9200/.kibana \
-    --output=kibana-index.json \
-    --type=data \
-    --searchBody='{"filter": { "or": [ {"type": {"value": "search"}}, {"type": {"value":"dashboard"}}, {"type": {"value":"visualization"}},{"type": {"value": "config"}},{"type": {"value": "url"}},{"type": {"value": "index-pattern"}} ] }}'
-  ```
-
-(3) This will result in a file containing the JSON-based definitions.  Overwrite `templates/kibana-index.json`.
-
-(4) After redeploying the code, your changes should now be a part of the default Metron dashboard.
-
-#### Why do my dashboard components change their order when reloading the dashboard?
-
-This has been a problem in Kibana 4.5.1 and perhaps other versions too.  To address this problem find the definition for your dashboard in the Kibana index extract.  It will look like the following.
-
-```
-{"_index":".kibana","_type":"dashboard","_id":"Metron-Dashboard",...
-```
-
-Extract the `panelsJSON` field from the dashboard definition.  Reorder the definition of these panels so that they are ordered by row and column.  The component in row 1 should come before the component in row 2, etc.  After you have ordered the components in this way, Kibana will maintain the order of components in the dashboard.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/defaults/main.yml b/metron-deployment/roles/kibana/defaults/main.yml
deleted file mode 100644
index c7e291b..0000000
--- a/metron-deployment/roles/kibana/defaults/main.yml
+++ /dev/null
@@ -1,22 +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.
-#
-kibana_repo_url: http://packages.elastic.co/kibana/4.5/centos
-kibana_repo_key_url: http://packages.elastic.co/GPG-KEY-elasticsearch
-kibana_index_url: "http://{{ groups.search[0] }}:{{ elasticsearch_web_port }}/.kibana"
-kibana_index_def: "/tmp/kibana-index.json"
-kibana_version: 4.5.3
-nodesource_repo_setup: https://rpm.nodesource.com/setup_4.x

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/tasks/dashboard.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/tasks/dashboard.yml b/metron-deployment/roles/kibana/tasks/dashboard.yml
deleted file mode 100644
index 7bfadde..0000000
--- a/metron-deployment/roles/kibana/tasks/dashboard.yml
+++ /dev/null
@@ -1,22 +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: Distribute the Kibana index containing the Metron Dashboard
-  template: src=kibana-index.json dest={{ kibana_index_def }}
-
-- name: Install the Metron Dashboard
-  shell: "elasticdump --output={{ kibana_index_url }} --input={{ kibana_index_def }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/tasks/dependencies.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/tasks/dependencies.yml b/metron-deployment/roles/kibana/tasks/dependencies.yml
deleted file mode 100644
index 7450665..0000000
--- a/metron-deployment/roles/kibana/tasks/dependencies.yml
+++ /dev/null
@@ -1,27 +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: Load Elastic Public Signing Key
-  rpm_key:
-    state: present
-    key: "{{ kibana_repo_key_url }}"
-
-- name: Create kibana.repo
-  template:
-    src: kibana.repo.template
-    dest: /etc/yum.repos.d/kibana.repo
-    mode: 0644

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/tasks/elasticdump.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/tasks/elasticdump.yml b/metron-deployment/roles/kibana/tasks/elasticdump.yml
deleted file mode 100644
index 739936f..0000000
--- a/metron-deployment/roles/kibana/tasks/elasticdump.yml
+++ /dev/null
@@ -1,35 +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: Download Nodesource Yum Repository Setup
-  shell:
-    cmd: curl -s {{ nodesource_repo_setup }} -o /tmp/nodesource_setup_4.x
-    creates: /tmp/nodesource_setup_4.x
-    warn: false
-
-- name: Setup Nodesource Yum Repository
-  shell: bash /tmp/nodesource_setup_4.x
-
-- name: Install Node - Needed for Elasticdump
-  yum: name="{{ item }}"
-  with_items:
-    - gcc-c++
-    - make
-    - nodejs
-
-- name: Install Elasticdump
-  shell: npm install elasticdump -g

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/tasks/kibana.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/tasks/kibana.yml b/metron-deployment/roles/kibana/tasks/kibana.yml
deleted file mode 100644
index 524437c..0000000
--- a/metron-deployment/roles/kibana/tasks/kibana.yml
+++ /dev/null
@@ -1,47 +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: Install Kibana
-  yum:
-    name: "kibana-{{ kibana_version }}"
-    state: installed
-  register: result
-  until: result.rc == 0
-  retries: 5
-  delay: 10
-
-- name: Configure Kibana - remove stale entries
-  lineinfile: >
-    dest=/opt/kibana/config/kibana.yml
-    regexp="{{ item }}"
-    state=absent
-  with_items:
-    - '^server\.port:'
-    - '^elasticsearch\.url:'
-    - '^default_app_id:'
-
-- name: Configure Kibana
-  lineinfile: >
-    dest=/opt/kibana/config/kibana.yml
-    regexp="{{ item.regexp }}"
-    insertafter="{{ item.regexp }}"
-    line="{{ item.line }}"
-    state=present
-  with_items:
-    - { regexp: '^# *server\.port:', line: 'server.port: 5000' }
-    - { regexp: '^# *elasticsearch\.url:', line: 'elasticsearch.url: http://{{ groups.search[0] }}:{{ elasticsearch_web_port }}' }
-    - { regexp: '^# *default_app_id:', line: 'default_app_id: "dashboard/Metron-Dashboard"' }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68a334a8/metron-deployment/roles/kibana/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/kibana/tasks/main.yml b/metron-deployment/roles/kibana/tasks/main.yml
deleted file mode 100644
index f125e33..0000000
--- a/metron-deployment/roles/kibana/tasks/main.yml
+++ /dev/null
@@ -1,21 +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.
-#
----
-- include: dependencies.yml
-- include: kibana.yml
-- include: elasticdump.yml
-- include: dashboard.yml


Mime
View raw message