Browse Source

Remove graphite.openstack.org

The server has been removed, remove it from inventory.

While we're here, s/graphite.openstack.org/graphite.opendev.org/'
... it's a CNAME redirect but we might as well clean up.

Change-Id: I36c951c85316cd65dde748b1e50ffa2e058c9a88
changes/04/651104/2
Ian Wienand 9 months ago
parent
commit
2acfc176b0
11 changed files with 14 additions and 22 deletions
  1. +1
    -1
      doc/source/grafana.rst
  2. +0
    -1
      hiera/common.yaml
  3. +0
    -7
      inventory/openstack.yaml
  4. +6
    -6
      manifests/site.pp
  5. +1
    -1
      modules/openstack_project/files/git/haproxy-statsd.default
  6. +1
    -1
      modules/openstack_project/manifests/logstash.pp
  7. +1
    -1
      modules/openstack_project/manifests/status.pp
  8. +1
    -1
      modules/openstack_project/templates/mirror-update/afsmon.cfg.erb
  9. +1
    -1
      playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
  10. +1
    -1
      run_all.sh
  11. +1
    -1
      run_cloud_launcher.sh

+ 1
- 1
doc/source/grafana.rst View File

@@ -42,5 +42,5 @@ hand:
- name: OpenStack
- type: Graphite
- default: checked
- url: http://graphite.openstack.org
- url: http://graphite.opendev.org
- access: direct

+ 0
- 1
hiera/common.yaml View File

@@ -271,7 +271,6 @@ cacti_hosts:
- gitea07.opendev.org
- gitea08.opendev.org
- grafana.openstack.org
- graphite.openstack.org
- graphite01.opendev.org
- groups-dev.openstack.org
- groups.openstack.org

+ 0
- 7
inventory/openstack.yaml View File

@@ -250,13 +250,6 @@ all:
region_name: DFW
public_v4: 23.253.253.90
public_v6: 2001:4800:7817:104:be76:4eff:fe04:60d5
graphite.openstack.org:
ansible_host: 2001:4800:7818:101:be76:4eff:fe06:d38
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.142.190
public_v6: 2001:4800:7818:101:be76:4eff:fe06:d38
graphite01.opendev.org:
ansible_host: 2001:4800:7818:103:be76:4eff:fe04:763e
location:

+ 6
- 6
manifests/site.pp View File

@@ -410,7 +410,7 @@ node /^firehose\d+\.open.*\.org$/ {
imap_hostname => hiera('lpmqtt_imap_server'),
imap_username => hiera('lpmqtt_imap_username'),
imap_password => hiera('lpmqtt_imap_password'),
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
}
}

@@ -695,7 +695,7 @@ node /^nl\d+\.open.*\.org$/ {
class { '::openstackci::nodepool_launcher':
nodepool_ssh_private_key => hiera('zuul_worker_ssh_private_key_contents'),
project_config_repo => 'https://opendev.org/openstack/project-config',
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
revision => 'master',
python_version => 3,
enable_webapp => true,
@@ -715,7 +715,7 @@ node /^nb\d+\.open.*\.org$/ {
vhost_name => $::fqdn,
enable_build_log_via_http => true,
project_config_repo => 'https://opendev.org/openstack/project-config',
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
upload_workers => '16',
revision => 'master',
python_version => 3,
@@ -814,7 +814,7 @@ node /^ze\d+\.open.*\.org$/ {
disk_limit_per_job => 5000, # Megabytes
site_variables_yaml_file => $::project_config::zuul_site_variables_yaml,
require => $::project_config::config_dir,
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
}

class { '::zuul::executor': }
@@ -893,7 +893,7 @@ node /^zuul\d+\.open.*\.org$/ {
proxy_ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents'),
proxy_ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'),
proxy_ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'),
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
status_url => 'https://zuul.openstack.org',
relative_priority => true,
}
@@ -1041,7 +1041,7 @@ node /^zm\d+.open.*\.org$/ {
gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),
gearman_client_ssl_key => hiera('gearman_client_ssl_key'),
gearman_ssl_ca => hiera('gearman_ssl_ca'),
statsd_host => 'graphite.openstack.org',
statsd_host => 'graphite.opendev.org',
}

class { 'openstack_project::zuul_merger':

+ 1
- 1
modules/openstack_project/files/git/haproxy-statsd.default View File

@@ -1,2 +1,2 @@
STATSD_HOST=graphite.openstack.org
STATSD_HOST=graphite.opendev.org
STATSD_PORT=8125

+ 1
- 1
modules/openstack_project/manifests/logstash.pp View File

@@ -16,7 +16,7 @@
#
class openstack_project::logstash (
$discover_nodes = ['elasticsearch01.openstack.org:9200'],
$statsd_host = 'graphite.openstack.org',
$statsd_host = 'graphite.opendev.org',
$subunit2sql_db_host,
$subunit2sql_db_pass,
) {

+ 1
- 1
modules/openstack_project/manifests/status.pp View File

@@ -11,7 +11,7 @@ class openstack_project::status (
$recheck_bot_nick,
$status_base_url = 'http://status.openstack.org',
$status_title = 'OpenStack',
$graphite_render_url = 'http://graphite.openstack.org/render/',
$graphite_render_url = 'http://graphite.opendev.org/render/',
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
$openstack_health_api_endpoint = 'http://health.openstack.org',

+ 1
- 1
modules/openstack_project/templates/mirror-update/afsmon.cfg.erb View File

@@ -13,5 +13,5 @@ cell = openstack.org

# Options for remote statsd host if required
[statsd]
host = graphite.openstack.org
host = graphite.opendev.org
port = 8125

+ 1
- 1
playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml View File

@@ -18,7 +18,7 @@ results:
- puppet
- puppet4

graphite.openstack.org:
graphite.opendev.org:
- graphite
- puppet
- webservers

+ 1
- 1
run_all.sh View File

@@ -50,7 +50,7 @@ function send_timer {
local start=${2-$_START_TIME}
local elapsed_ms=$(( (current - start) * 1000 ))

echo "bridge.ansible.run_all.${name}:${elapsed_ms}|ms" | nc -w 1 -u graphite.openstack.org 8125
echo "bridge.ansible.run_all.${name}:${elapsed_ms}|ms" | nc -w 1 -u graphite.opendev.org 8125
echo "End $name"
}
# See send_timer

+ 1
- 1
run_cloud_launcher.sh View File

@@ -61,4 +61,4 @@ fi
_CURRENT_TIME=$(date '+%s')
_ELAPSED_MS=$(( (_CURRENT_TIME - _START_TIME) * 1000 ))
echo "bridge.ansible.run_cloud_launcher:${_ELAPSED_MS}|ms" | \
nc -w 1 -u graphite.openstack.org 8125
nc -w 1 -u graphite.opendev.org 8125

Loading…
Cancel
Save