METRON-1444: Add Ubuntu Repositories for Elasticsearch to the Mpack

metron-deployment/ansible/roles/ambari_common/defaults/main.yml

@@ -17,7 +17,5 @@
 ---
 hadoop_logrotate_frequency: daily
 hadoop_logrotate_retention: 30
-centos_ambari_install_url: http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.5.2.0/ambari.repo
-ubuntu_ambari_repo: http://public-repo-1.hortonworks.com/ambari/ubuntu14/2.x/updates/2.5.2.0
-ubuntu_elasticsearch_packages_repo: https://artifacts.elastic.co/packages/5.x/apt
-ubuntu_elasticsearch_curator_repo: https://packages.elastic.co/curator/5/debian
+centos_ambari_install_url: http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.6.1.0/ambari.repo
+ubuntu_ambari_repo: http://public-repo-1.hortonworks.com/ambari/ubuntu14/2.x/updates/2.6.1.0

metron-deployment/ansible/roles/ambari_common/tasks/main.yml

@@ -34,6 +34,5 @@
   static: no
   when: ansible_distribution == "Ubuntu"
 
-- include: elasticsearch-repo.yml
 - include: nodejs.yml
 - include: logrotate.yml

metron-deployment/packaging/ambari/metron-mpack/README.md

@@ -28,20 +28,6 @@ This allows you to easily install Metron using a simple, guided process.  This a
 
 * A [Node.js](https://nodejs.org/en/download/package-manager/) repository installed on the host running the Management and Alarm UI.
 
-* When installing on Ubuntu the Elasticsearch repository must be defined manually. This is NOT defined by the Mpack like it is on CentOS.  This is an open bug that needs addressed in the Mpack.  See the [Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html) documentation for more specific instructions. 
-  ```
-  $ cat >/etc/apt/sources.list.d/elasticsearch.list << EOL
-  deb https://packages.elastic.co/curator/5/debian stable main
-  deb https://artifacts.elastic.co/packages/5.x/apt stable main
-  EOL
-
-  $ wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
-
-  $ apt-get update
-  ```
-
-
-
 ### Quick Start
 
 1. Build the Metron MPack. Execute the following command from the project's root directory.

metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml

@@ -28,5 +28,18 @@
             <reponame>ELASTICSEARCH</reponame>
         </repo>
     </os>
+    <os family="ubuntu14">
+        <!--
+            see details about Ambari fixes for Ubuntu introduced in Ambari 2.6+
+                https://github.com/apache/ambari/commit/f8b29df9685b443d4a5c06c6e1725e4428c95b49#diff-6f26c26ed59462200d018c5e1e71e773
+                https://issues.apache.org/jira/browse/AMBARI-21856
+        -->
+        <repo>
+            <baseurl>https://artifacts.elastic.co/packages/5.x/apt</baseurl>
+            <repoid>elasticsearch-5.x</repoid>
+            <reponame>ELASTICSEARCH</reponame>
+            <distribution>stable</distribution>
+        </repo>
+    </os>
 </reposinfo>
 

metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml

@@ -38,4 +38,23 @@
             <reponame>CURATOR</reponame>
         </repo>
     </os>
+    <os family="ubuntu14">
+        <!--
+            see details about Ambari fixes for Ubuntu introduced in Ambari 2.6+
+                https://github.com/apache/ambari/commit/f8b29df9685b443d4a5c06c6e1725e4428c95b49#diff-6f26c26ed59462200d018c5e1e71e773
+                https://issues.apache.org/jira/browse/AMBARI-21856
+        -->
+        <repo>
+            <baseurl>https://artifacts.elastic.co/packages/5.x/apt</baseurl>
+            <repoid>kibana-5.x</repoid>
+            <reponame>KIBANA</reponame>
+            <distribution>stable</distribution>
+        </repo>
+        <repo>
+            <baseurl>https://packages.elastic.co/curator/5/debian</baseurl>
+            <repoid>ES-Curator-5.x</repoid>
+            <reponame>CURATOR</reponame>
+            <distribution>stable</distribution>
+        </repo>
+    </os>
 </reposinfo>