METRON-1444: Add Ubuntu Repositories for Elasticsearch to the Mpack (mmiklavc via mmiklavc) closes apache/metron#928
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/48d9d256 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/48d9d256 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/48d9d256 Branch: refs/heads/feature/METRON-1416-upgrade-solr Commit: 48d9d25696a71ff07791b86348dc978db7a56a9d Parents: e5f24f7 Author: mmiklavc <michael.miklav...@gmail.com> Authored: Thu Feb 8 11:53:47 2018 -0700 Committer: Michael Miklavcic <michael.miklav...@gmail.com> Committed: Thu Feb 8 11:53:47 2018 -0700 ---------------------------------------------------------------------- .../roles/ambari_common/defaults/main.yml | 6 +-- .../ambari_common/tasks/elasticsearch-repo.yml | 40 -------------------- .../ansible/roles/ambari_common/tasks/main.yml | 1 - .../packaging/ambari/metron-mpack/README.md | 14 ------- .../ELASTICSEARCH/5.6.2/repos/repoinfo.xml | 13 +++++++ .../KIBANA/5.6.2/repos/repoinfo.xml | 19 ++++++++++ 6 files changed, 34 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/ansible/roles/ambari_common/defaults/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/ambari_common/defaults/main.yml b/metron-deployment/ansible/roles/ambari_common/defaults/main.yml index 0614e0f..e7968f5 100644 --- a/metron-deployment/ansible/roles/ambari_common/defaults/main.yml +++ b/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 http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/ansible/roles/ambari_common/tasks/elasticsearch-repo.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/elasticsearch-repo.yml b/metron-deployment/ansible/roles/ambari_common/tasks/elasticsearch-repo.yml deleted file mode 100644 index 730607d..0000000 --- a/metron-deployment/ansible/roles/ambari_common/tasks/elasticsearch-repo.yml +++ /dev/null @@ -1,40 +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. -# ---- - -# -# for CentOS... -# -# this is not needed for CentOS. the elasticsearch repository is automatically -# added by the mpack. there is currently an issue that needs resolved that -# prevents us from doing the same in Ubuntu -# - -# -# for Ubuntu... -# -- name: Setup Elasticsearch packages repo on Ubuntu - shell: echo "deb {{ ubuntu_elasticsearch_packages_repo }} stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch.list - when: ansible_distribution == "Ubuntu" - -- name: Setup Elasticsearch curator repo on Ubuntu - shell: echo "deb {{ ubuntu_elasticsearch_curator_repo }} stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch.list - when: ansible_distribution == "Ubuntu" - -- name: Update package cache - apt: update_cache=yes - when: ansible_distribution == "Ubuntu" http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/ansible/roles/ambari_common/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/main.yml b/metron-deployment/ansible/roles/ambari_common/tasks/main.yml index b3258a9..f3fd905 100644 --- a/metron-deployment/ansible/roles/ambari_common/tasks/main.yml +++ b/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 http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/packaging/ambari/metron-mpack/README.md ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/README.md b/metron-deployment/packaging/ambari/metron-mpack/README.md index 4b0b073..5179b5f 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/README.md +++ b/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. http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml index 2c64518..ba21fb1 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/metron/blob/48d9d256/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml index d0bd284..2755818 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml +++ b/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>
