From 59df0fa919fc220cf81a829de30354886f91537f Mon Sep 17 00:00:00 2001 From: Michael Miklavcic Date: Wed, 7 Feb 2018 00:23:43 -0700 Subject: [PATCH 1/2] Upgrade Ambari and update Elasticsearch, Kibana, and Curator repoinfo.xml --- .../roles/ambari_common/defaults/main.yml | 6 +-- .../tasks/elasticsearch-repo.yml | 40 ------------------- .../roles/ambari_common/tasks/main.yml | 1 - .../ELASTICSEARCH/5.6.2/repos/repoinfo.xml | 13 ++++++ .../KIBANA/5.6.2/repos/repoinfo.xml | 19 +++++++++ 5 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 metron-deployment/ansible/roles/ambari_common/tasks/elasticsearch-repo.yml diff --git a/metron-deployment/ansible/roles/ambari_common/defaults/main.yml b/metron-deployment/ansible/roles/ambari_common/defaults/main.yml index 0614e0f32d..e7968f5ded 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 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 730607d644..0000000000 --- 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" diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/main.yml b/metron-deployment/ansible/roles/ambari_common/tasks/main.yml index b3258a922c..f3fd90521b 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 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 2c645185b0..ba21fb1e83 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 @@ ELASTICSEARCH + + + + https://artifacts.elastic.co/packages/5.x/apt + elasticsearch-5.x + ELASTICSEARCH + stable + + 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 d0bd284afe..27558185c8 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 @@ CURATOR + + + + https://artifacts.elastic.co/packages/5.x/apt + kibana-5.x + KIBANA + stable + + + https://packages.elastic.co/curator/5/debian + ES-Curator-5.x + CURATOR + stable + + From 76ad7dbbb1e897929ceb13f9cca0571b7d0b4ad7 Mon Sep 17 00:00:00 2001 From: Michael Miklavcic Date: Wed, 7 Feb 2018 00:28:59 -0700 Subject: [PATCH 2/2] Roll back METRON-1443 now that we have a proper fix --- .../packaging/ambari/metron-mpack/README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/metron-deployment/packaging/ambari/metron-mpack/README.md b/metron-deployment/packaging/ambari/metron-mpack/README.md index 4b0b073606..5179b5fc77 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.