From e3a56f6af20aa27c5df001958cae018c046ad2ab Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 21 Apr 2020 09:11:05 +0900 Subject: [PATCH] Remove support for Sensu/Uchiwa ... because it was relady removed from tripleo-heat-templates. Depends-on: https://review.opendev.org/#/c/684614/ Change-Id: I38b2f325477540e86fe98ed075ac75a0988eeec3 --- Puppetfile_extras | 4 -- manifests/profile/base/monitoring/rabbitmq.pp | 56 ------------------- manifests/profile/base/monitoring/sensu.pp | 33 ----------- manifests/profile/base/monitoring/uchiwa.pp | 32 ----------- metadata.json | 4 +- ...pleo_profile_base_monitoring_sensu_spec.rb | 38 ------------- 6 files changed, 1 insertion(+), 166 deletions(-) delete mode 100644 manifests/profile/base/monitoring/rabbitmq.pp delete mode 100644 manifests/profile/base/monitoring/sensu.pp delete mode 100644 manifests/profile/base/monitoring/uchiwa.pp delete mode 100644 spec/classes/tripleo_profile_base_monitoring_sensu_spec.rb diff --git a/Puppetfile_extras b/Puppetfile_extras index 6bb9d3848..4a25d70d4 100644 --- a/Puppetfile_extras +++ b/Puppetfile_extras @@ -67,10 +67,6 @@ mod 'snmp', :git => 'https://github.com/voxpupuli/puppet-snmp', :ref => '4345049a23cd11e68ac51be13a3a1493a3454370' -mod 'sensu', - :git => 'https://github.com/sensu/sensu-puppet', - :ref => '20361a4043d2881359551510ada0817caee3bc05' - mod 'pacemaker', :git => 'https://github.com/openstack/puppet-pacemaker', :ref => 'master' diff --git a/manifests/profile/base/monitoring/rabbitmq.pp b/manifests/profile/base/monitoring/rabbitmq.pp deleted file mode 100644 index 169aa7fbd..000000000 --- a/manifests/profile/base/monitoring/rabbitmq.pp +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed 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. -# -# == Class: tripleo::profile::base::sensu::rabbitmq -# -# RabbitMQ configuration for Sensu stack for TripleO -# -# === Parameters -# -# [*password*] -# (Optional) String. Password to connect to RabbitMQ server -# Defaults to hiera('rabbit_password', undef) -# -# [*user*] -# (Optional) String. Username to connect to RabbitMQ server -# Defaults to hiera('rabbit_username', 'sensu') -# -# [*vhost*] -# (Optional) String. RabbitMQ vhost to be used by Sensu -# Defaults to '/sensu' -# -class tripleo::profile::base::monitoring::rabbitmq ( - $password = hiera('monitoring_rabbitmq_password', undef), - $user = hiera('monitoring_rabbitmq_username', 'sensu'), - $vhost = hiera('monitoring_rabbitmq_vhost', '/sensu'), -) { - warning('Service sensu-client is deprecated. Please take in mind, that it is going to be removed in T release.') - - rabbitmq_vhost { 'sensu-rabbit-vhost': - ensure => present, - name => $vhost - } - - rabbitmq_user { 'sensu-rabbit-user': - name => $user, - password => $password, - tags => ['monitoring'] - } - - rabbitmq_user_permissions { "${user}@${vhost}": - configure_permission => '.*', - read_permission => '.*', - write_permission => '.*', - } -} diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp deleted file mode 100644 index 0cbaf01d3..000000000 --- a/manifests/profile/base/monitoring/sensu.pp +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed 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. -# -# == Class: tripleo::profile::base::monitoring::sensu -# -# Sensu configuration for TripleO -# -# === Parameters -# -# [*step*] -# (Optional) String. The current step of the deployment -# Defaults to hiera('step') -# -class tripleo::profile::base::monitoring::sensu ( - $step = Integer(hiera('step')), -) { - warning('Service sensu-client is deprecated. Please take in mind, that it is going to be removed in T release.') - include sensu - package { 'osops-tools-monitoring-oschecks': - ensure => 'present' - } -} diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp deleted file mode 100644 index 13c6a3506..000000000 --- a/manifests/profile/base/monitoring/uchiwa.pp +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed 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. -# -# == Class: tripleo::profile::base::monitoring::uchiwa -# -# Monitoring dashboards for TripleO -# -# === Parameters -# -# [*step*] -# (Optional) String. The current step of the deployment -# Defaults to hiera('step') -# -class tripleo::profile::base::monitoring::uchiwa ( - $step = Integer(hiera('step')), -) { - warning('Service uchiwa is deprecated. Please take in mind, that it is going to be removed in T release.') - if $step >= 3 { - include uchiwa - } -} diff --git a/metadata.json b/metadata.json index cf6d28b1d..1b25d3488 100644 --- a/metadata.json +++ b/metadata.json @@ -23,8 +23,6 @@ ], "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 5.0.0 < 6.0.0" }, - { "name": "openstack/openstacklib", "version_requirement": ">=15.0.0 <16.0.0" }, - { "name": "sensu/sensu", "version_requirement": ">=3.0.0 <4.0.0" }, - { "name": "yelp/uchiwa", "version_requirement": ">=2.0.0 <3.0.0" } + { "name": "openstack/openstacklib", "version_requirement": ">=15.0.0 <16.0.0" } ] } diff --git a/spec/classes/tripleo_profile_base_monitoring_sensu_spec.rb b/spec/classes/tripleo_profile_base_monitoring_sensu_spec.rb deleted file mode 100644 index d6a3341d7..000000000 --- a/spec/classes/tripleo_profile_base_monitoring_sensu_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2017 Red Hat, Inc. -# -# Licensed 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. -# -require 'spec_helper' - -describe 'tripleo::profile::base::monitoring::sensu' do - shared_examples_for 'tripleo::profile::base::monitoring::sensu' do - - context 'Sensu' do - let (:params) { { :step => 3 } } - it { is_expected.to contain_class('sensu') } - it { is_expected.to contain_package('osops-tools-monitoring-oschecks') } - end - end - - - on_supported_os.each do |os, facts| - context "on #{os}" do - let (:facts) { - facts.merge({ :ipaddress => '127.0.0.1' }) - } - it_behaves_like 'tripleo::profile::base::monitoring::sensu' - end - end - -end