openstack/puppet-tripleo
Code Issues Proposed changes

Remove support for Sensu/Uchiwa

Browse Source 
... because it was relady removed from tripleo-heat-templates.

Depends-on: https://review.opendev.org/#/c/684614/
Change-Id: I38b2f325477540e86fe98ed075ac75a0988eeec3
This commit is contained in:
Takashi Kajinami 2020-04-21 09:11:05 +09:00
parent b8ed26353e
commit e3a56f6af2
6 changed files with 1 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile_extras
View File

@ -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'

56
manifests/profile/base/monitoring/rabbitmq.pp
View File

@ -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 => '.*',
}
}

33
manifests/profile/base/monitoring/sensu.pp
View File

@ -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'
}
}

32
manifests/profile/base/monitoring/uchiwa.pp
View File

@ -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
}
}

4
metadata.json
View File

@ -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" }
]
}

38
spec/classes/tripleo_profile_base_monitoring_sensu_spec.rb
View File

@ -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