From d185aedd7d83eac03954d804fe1c8021a0ce3e05 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 29 Apr 2022 15:46:33 +0000 Subject: [PATCH] Decommission status.openstack.org and services The status.openstack.org server is offline now that it no longer hosts any working services. Remove all configuration for it in preparation for retiring related Git repositories. Also roll some related cleanup into this for the already retired puppet-kibana module. Change-Id: I3cfcc129983e3641dfbe55d5ecc208c554e97de4 --- doc/source/elastic-recheck.rst | 33 ---- doc/source/irc.rst | 3 +- doc/source/static.rst | 1 - doc/source/systems.rst | 1 - hiera/common.yaml | 1 - inventory/base/hosts.yaml | 7 - inventory/service/groups.yaml | 5 - manifests/site.pp | 19 -- modules.env | 2 - .../files/status/favicon.ico | Bin 15086 -> 0 bytes .../openstack_project/files/status/index.html | 97 ---------- modules/openstack_project/manifests/status.pp | 178 ------------------ .../templates/status.vhost.erb | 55 ------ .../templates/status/common.js.erb | 96 ---------- zuul.d/puppet.yaml | 4 - 15 files changed, 1 insertion(+), 501 deletions(-) delete mode 100644 doc/source/elastic-recheck.rst delete mode 100644 modules/openstack_project/files/status/favicon.ico delete mode 100644 modules/openstack_project/files/status/index.html delete mode 100644 modules/openstack_project/manifests/status.pp delete mode 100644 modules/openstack_project/templates/status.vhost.erb delete mode 100644 modules/openstack_project/templates/status/common.js.erb diff --git a/doc/source/elastic-recheck.rst b/doc/source/elastic-recheck.rst deleted file mode 100644 index e6b4081c4d..0000000000 --- a/doc/source/elastic-recheck.rst +++ /dev/null @@ -1,33 +0,0 @@ -:title: Elastic-Recheck - -.. _elastic-recheck: - -Elastic-Recheck -############### - - - -At a Glance -=========== - -:Hosts: - * http://status.openstack.org -:Puppet: - * https://opendev.org/opendev/puppet-elastic_recheck - * :git_file:`modules/openstack_project/manifests/status.pp` -:Projects: - * https://opendev.org/opendev/elastic-recheck -:Bugs: - * https://storyboard.openstack.org/#!/project/713 -:Resources: - * `elastic-recheck Documentation `_ - -Overview -======== - -The elastic-recheck project leverages Elasticsearch and Logstash to identify, -track and report upon rechecks in the OpenStack gate. - -Dashboard can be found here: - -http://status.openstack.org/elastic-recheck/ diff --git a/doc/source/irc.rst b/doc/source/irc.rst index 91b707cfd2..040e861dfa 100644 --- a/doc/source/irc.rst +++ b/doc/source/irc.rst @@ -172,8 +172,7 @@ listening to, including #opendev: Broadcast a message to all OpenDev and OpenStack channels and change their topics, log to the wiki page, and set an alert box on the wiki - page (eventually include this alert box on status.openstack.org - pages). + page (eventually include this alert box on opendev.org). #status ok [MESSAGE] Remove alert box and restore channel topics, optionally announcing diff --git a/doc/source/static.rst b/doc/source/static.rst index 08d217c308..c62256c2b9 100644 --- a/doc/source/static.rst +++ b/doc/source/static.rst @@ -13,7 +13,6 @@ At a Glance :Hosts: * http://logs.openstack.org - * http://status.openstack.org * http://mirror.openstack.org * http://specs.openstack.org :Puppet: diff --git a/doc/source/systems.rst b/doc/source/systems.rst index 666df70b80..c58a035dad 100644 --- a/doc/source/systems.rst +++ b/doc/source/systems.rst @@ -16,7 +16,6 @@ Major Systems grafyaml keycloak zuul - elastic-recheck devstack-gate nodepool jeepyb diff --git a/hiera/common.yaml b/hiera/common.yaml index bdfadefe87..f9c462a6b7 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -63,7 +63,6 @@ cacti_hosts: - refstack01.openstack.org - review02.opendev.org - static01.opendev.org -- status01.openstack.org - storyboard01.opendev.org - storyboard-dev01.opendev.org - translate.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index de8396f375..337b15b273 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -422,13 +422,6 @@ all: region_name: DFW public_v4: 23.253.245.150 public_v6: 2001:4800:7818:101:be76:4eff:fe04:7c28 - status01.openstack.org: - ansible_host: 104.130.141.217 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.130.141.217 - public_v6: 2001:4800:7818:103:be76:4eff:fe04:8ed3 storyboard-dev01.opendev.org: ansible_host: 23.253.234.105 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index d970047a22..54b29c71b2 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -125,7 +125,6 @@ groups: puppet: - cacti[0-9]*.open*.org - ethercalc[0-9]*.open*.org - - status*.open*.org - storyboard-dev[0-9]*.opendev.org - storyboard[0-9]*.opendev.org - translate-dev[0-9]*.open*.org @@ -133,7 +132,6 @@ groups: puppet4: - cacti[0-9]*.open*.org - ethercalc[0-9]*.open*.org - - status*.open*.org - storyboard[0-9]*.opendev.org - storyboard-dev[0-9]*.opendev.org - translate[0-9]*.open*.org @@ -149,8 +147,6 @@ groups: #review-staging: static: - static[0-9]*.opendev.org - status: - - status*.open*.org storyboard: - storyboard[0-9]*.opendev.org storyboard-dev: @@ -173,7 +169,6 @@ groups: - paste[0-9]*.opendev.org - refstack[0-9]*.openstack.org - static[0-9]*.opendev.org - - status*.open*.org - storyboard-dev[0-9]*.opendev.org - storyboard[0-9]*.opendev.org - translate-dev[0-9]*.open*.org diff --git a/manifests/site.pp b/manifests/site.pp index 865d887175..eb41080f7b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -62,25 +62,6 @@ node /^storyboard-dev\d+\.opendev\.org$/ { } -# A machine to serve various project status updates. -# Node-OS: xenial -node /^status\d*\.open.*\.org$/ { - $group = 'status' - - class { 'openstack_project::server': } - - class { 'openstack_project::status': - gerrit_host => 'review.opendev.org', - gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), - reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents'), - reviewday_ssh_private_key => hiera('reviewday_rsa_key_contents'), - recheck_ssh_public_key => hiera('elastic-recheck_gerrit_ssh_public_key'), - recheck_ssh_private_key => hiera('elastic-recheck_gerrit_ssh_private_key'), - recheck_bot_nick => 'openstackrecheck', - recheck_bot_passwd => hiera('elastic-recheck_ircbot_password'), - } -} - # Node-OS: xenial node /^translate\d+\.open.*\.org$/ { $group = "translate" diff --git a/modules.env b/modules.env index 62daf61633..16817e75b1 100644 --- a/modules.env +++ b/modules.env @@ -57,7 +57,6 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0" # Add modules that should be part of the openstack-infra integration test here # Please keep sorted INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master" # Storyboard and translate use the jeepyb module @@ -68,7 +67,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master" # Ethercalc uses the redis module INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master" -INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-reviewday"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-simpleproxy"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ssh"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-storyboard"]="origin/master" diff --git a/modules/openstack_project/files/status/favicon.ico b/modules/openstack_project/files/status/favicon.ico deleted file mode 100644 index 4cb53bb442cf9c5f38abc4df4b280b87772af3cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15086 zcmeI3J7^R^9LDF85Sw6vNToG{Vq3gS@(Ifo884-{4%>U|Hn7~otd4P8;xn1K{GXFl(x;C z-Nx)Q#cZXfgfrYP z){wic1Ke-bm_OVb{^j+ZCjRBco<97)#s8P;{7kqmToJD31Z-jRxquHlJ|?AE<9|c8 zxBBNEdER4Nz(*2qTb_mgciBCdC*Lqz_z>`AImV^%znxO{tK_D`eCC;l4*_3sylolW zXN8*r?=1?HUlS(spDZ=+g+f+Rc2q#luMlyws zJ+|KX5b%|T6Wr;;wm-zBRqVf6#?OYoZ6qH;vYE{HT^e5gKFAO z?b=VR=MO2GWaUNFXAITT-X{0+dUs~ z>kxlgmiZ@oMekp+H&*2SmA~#)xX&8@Dsc95X!xgF`}<>-=Y13Z^5b9k-%t4sxX!;{ z4~zejP|NcJ%!$R_p5NeX#EMYm^BbHoSwFvF=k&^B4ZzuyNuf69XT0uZ%rX_(WK4%t zD;1ma=yZ*G-Zu5M2vKbj|NJI-Mpz7hJdV0LUDyz!?9VtE&q29Y=SxbNZ~H;sepeUR5Tfias*E-o z^?v4a@IN18AK!7~&s+}v=VJUPwg1My;|oyilj2`?`=bv;^^d~)pJRBP)m8UW$6xu6 z>;D_^{fYBm_V>5!`A5`uA+P+T@i#9&QFf}}zwGq~YarG_Q86ki->$z(U4Jrws_vz& zzu7P7baxOUhH}p{Es3n{D|p@o{o^?dlvz2-wHXm%w7Y*H5zk|vf^CVmu)a^B|7#Y! z6rb`a}1FuqrSnKNPkL zn}yK;$fFDyWYIzQuy9m3CUBNcyGG#`Wjz^W(LtAQ(Ierpa9$V)*Y39Gfu0Pq=%D*i zu=TmC`@tCfL6sw8< - - - - OpenStack Project Status - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

OpenStack Infrastructure and Project Status

- -
-
-
-

-

-
-
- -
-

Zuul

-

- Zuul is the project gating and automation system that tests - and merges changes as well as publishing releases and - documentation. -

-
- -
-

Rechecks

-

- When the cause of a test failure is nondeterministic, - developers can request that it be retested by leaving a - comment in Gerrit of the form "recheck bug #". This page - collects those comments and displays graphs indicating - the timing and frequency of these bugs. -

-
- -
-

Reviews

-

- Important reviews are ranked according to blueprint and bug - priority. -

-
- -
-

OpenStack-Health

-

- A test results dashboard. -

-
-
- - - - - diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp deleted file mode 100644 index 70fa9cac54..0000000000 --- a/modules/openstack_project/manifests/status.pp +++ /dev/null @@ -1,178 +0,0 @@ -# == Class: openstack_project::status -# -class openstack_project::status ( - $gerrit_host, - $gerrit_ssh_host_key, - $reviewday_ssh_public_key = '', - $reviewday_ssh_private_key = '', - $recheck_ssh_public_key, - $recheck_ssh_private_key, - $recheck_bot_passwd, - $recheck_bot_nick, - $status_base_url = 'http://status.openstack.org', - $status_title = 'OpenStack', - $graphite_render_url = 'http://graphite.opendev.org/render/', -) { - - include openstack_project - file { '/home/jenkins': - ensure => absent, - } - - include ::httpd - - if ! defined(Httpd::Mod['rewrite']) { - httpd::mod { 'rewrite': - ensure => present, - } - } - - if ! defined(Httpd::Mod['proxy']) { - httpd::mod { 'proxy': - ensure => present, - } - } - - if ! defined(Httpd::Mod['proxy_http']) { - httpd::mod { 'proxy_http': - ensure => present, - } - } - - file { '/srv/static': - ensure => directory, - } - - ########################################################### - # Status - Index - - ::httpd::vhost { 'status.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/status', - template => 'openstack_project/status.vhost.erb', - require => File['/srv/static/status'], - } - - file { '/srv/static/status': - ensure => directory, - } - - package { 'libjs-jquery': - ensure => present, - } - - package { 'yui-compressor': - ensure => present, - } - - file { '/srv/static/status/index.html': - ensure => present, - source => 'puppet:///modules/openstack_project/status/index.html', - require => File['/srv/static/status'], - } - - file { '/srv/static/status/favicon.ico': - ensure => present, - source => 'puppet:///modules/openstack_project/status/favicon.ico', - require => File['/srv/static/status'], - } - - file { '/srv/static/status/common.js': - ensure => present, - content => template('openstack_project/status/common.js.erb'), - require => File['/srv/static/status'], - replace => true, - } - - file { '/srv/static/status/jquery.min.js': - ensure => link, - target => '/usr/share/javascript/jquery/jquery.min.js', - require => [File['/srv/static/status'], - Package['libjs-jquery']], - } - - vcsrepo { '/opt/jquery-visibility': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://github.com/mathiasbynens/jquery-visibility.git', - } - - exec { 'install_jquery-visibility' : - command => 'yui-compressor -o /srv/static/status/jquery-visibility.min.js /opt/jquery-visibility/jquery-visibility.js', - path => '/bin:/usr/bin', - refreshonly => true, - subscribe => Vcsrepo['/opt/jquery-visibility'], - require => [ - File['/srv/static/status'], - Package['yui-compressor'], - Vcsrepo['/opt/jquery-visibility'], - ], - } - - vcsrepo { '/opt/jquery-graphite': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://github.com/prestontimmons/graphitejs.git', - } - - file { '/srv/static/status/jquery-graphite.js': - ensure => link, - target => '/opt/jquery-graphite/jquery.graphite.js', - require => [File['/srv/static/status'], - Vcsrepo['/opt/jquery-graphite']], - } - vcsrepo { '/opt/flot': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://github.com/flot/flot.git', - } - - exec { 'install_flot' : - command => 'cp /opt/flot/source/jquery.flot.js /opt/flot/source/jquery.canvaswrapper.js /opt/flot/source/jquery.colorhelpers.js /opt/flot/source/jquery.flot.*.js /srv/static/status', - path => '/bin:/usr/bin', - refreshonly => true, - subscribe => Vcsrepo['/opt/flot'], - require => [ - File['/srv/static/status'], - Vcsrepo['/opt/flot'], - ], - } - - ########################################################### - # Status - elastic-recheck - include elastic_recheck - - class { 'elastic_recheck::bot': - gerrit_host => $gerrit_host, - gerrit_ssh_host_key => $gerrit_ssh_host_key, - recheck_ssh_public_key => $recheck_ssh_public_key, - recheck_ssh_private_key => $recheck_ssh_private_key, - recheck_bot_passwd => $recheck_bot_passwd, - recheck_bot_nick => $recheck_bot_nick, - } - - # sets up the cron update scripts for static pages - include elastic_recheck::cron - - ########################################################### - # Status - reviewday - - include reviewday - - reviewday::site { 'reviewday': - git_url => 'https://opendev.org/openstack/reviewday', - serveradmin => 'webmaster@openstack.org', - httproot => '/srv/static/reviewday', - gerrit_url => 'review.opendev.org', - gerrit_port => '29418', - gerrit_user => 'reviewday', - reviewday_gerrit_ssh_key => $gerrit_ssh_host_key, - reviewday_rsa_pubkey_contents => $reviewday_ssh_public_key, - reviewday_rsa_key_contents => $reviewday_ssh_private_key, - } - -} diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb deleted file mode 100644 index 087f199cbd..0000000000 --- a/modules/openstack_project/templates/status.vhost.erb +++ /dev/null @@ -1,55 +0,0 @@ -# ************************************ -# Managed by Puppet -# ************************************ - -NameVirtualHost <%= @vhost_name %>:<%= @port %> -:<%= @port %>> - ServerName <%= @srvname %> -<% if @serveraliases.is_a? Array -%> -<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif ! ['', nil].include?(@serveraliases) -%> -<%= " ServerAlias #{@serveraliases}" %> -<% end -%> - DocumentRoot <%= @docroot %> - - Alias /reviews /srv/static/reviewday - - AllowOverride None - Require all granted - - - Alias /openstack-health /srv/static/openstack-health - - AllowOverride None - Require all granted - - - > - Options <%= @options %> - AllowOverride None - Require all granted - - - # Sample elastic-recheck config file, adjust prefixes - # per your local configuration. Because these are nested - # we need the more specific one first. - Alias /elastic-recheck/data /var/lib/elastic-recheck - - AllowOverride None - Require all granted - - - RedirectMatch permanent ^/rechecks(.*) /elastic-recheck - Alias /elastic-recheck /usr/local/share/elastic-recheck - - AllowOverride None - Require all granted - - - RedirectMatch temp ^/zuul(.*) https://zuul.opendev.org/t/openstack/status - - ErrorLog /var/log/apache2/<%= @name %>_error.log - LogLevel warn - CustomLog /var/log/apache2/<%= @name %>_access.log combined - ServerSignature Off - diff --git a/modules/openstack_project/templates/status/common.js.erb b/modules/openstack_project/templates/status/common.js.erb deleted file mode 100644 index 54b5abcd94..0000000000 --- a/modules/openstack_project/templates/status/common.js.erb +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) 2013-2015 OpenStack Foundation -// // -// // 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. - -'use strict'; - -function header(activeTabName) { - var tabsName = []; - var tabsLink = []; - tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>'; - tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/'; - tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/'; - tabsName[3] = 'Reviews'; tabsLink[3] = '<%= @status_base_url %>/reviews/'; - tabsName[4] = 'OpenStack-Health'; tabsLink[4] = '<%= @status_base_url %>/openstack-health/'; - - document.write( - ''); -} - -function footer() { - document.write( - '
' + - '
' + - '' + - '
'); -} - diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml index 14fa6fa345..265a2f2874 100644 --- a/zuul.d/puppet.yaml +++ b/zuul.d/puppet.yaml @@ -10,7 +10,6 @@ - opendev/system-config - opendev/ansible-role-puppet - opendev/puppet-bup - - opendev/puppet-elastic_recheck - opendev/puppet-ethercalc - opendev/puppet-httpd - opendev/puppet-jeepyb @@ -20,7 +19,6 @@ - opendev/puppet-pip - opendev/puppet-project_config - opendev/puppet-redis - - opendev/puppet-reviewday - opendev/puppet-simpleproxy - opendev/puppet-ssh - opendev/puppet-storyboard @@ -82,11 +80,9 @@ - opendev/puppet-project_config - opendev/puppet-ethercalc - opendev/puppet-httpd - - opendev/puppet-reviewday - opendev/puppet-redis - opendev/puppet-zanata - opendev/puppet-tmpreaper - - opendev/puppet-elastic_recheck - opendev/puppet-ulimit - opendev/puppet-logrotate - opendev/puppet-storyboard