From 2acfc176b0f7036f2aac5c7093cd667f94b668a3 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 9 Apr 2019 16:12:57 +1000 Subject: [PATCH] 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 --- doc/source/grafana.rst | 2 +- hiera/common.yaml | 1 - inventory/openstack.yaml | 7 ------- manifests/site.pp | 12 ++++++------ .../files/git/haproxy-statsd.default | 2 +- modules/openstack_project/manifests/logstash.pp | 2 +- modules/openstack_project/manifests/status.pp | 2 +- .../templates/mirror-update/afsmon.cfg.erb | 2 +- .../inventory_plugins/test-fixtures/results.yaml | 2 +- run_all.sh | 2 +- run_cloud_launcher.sh | 2 +- 11 files changed, 14 insertions(+), 22 deletions(-) diff --git a/doc/source/grafana.rst b/doc/source/grafana.rst index f6bc7fb557..f5c2c52c56 100644 --- a/doc/source/grafana.rst +++ b/doc/source/grafana.rst @@ -42,5 +42,5 @@ hand: - name: OpenStack - type: Graphite - default: checked - - url: http://graphite.openstack.org + - url: http://graphite.opendev.org - access: direct diff --git a/hiera/common.yaml b/hiera/common.yaml index a6493f459e..9dd2ea9570 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -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 diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index e584ec1783..5cd9e6740d 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -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: diff --git a/manifests/site.pp b/manifests/site.pp index d9eef6fe19..8b2c0f6328 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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': diff --git a/modules/openstack_project/files/git/haproxy-statsd.default b/modules/openstack_project/files/git/haproxy-statsd.default index d057e7ccf8..8ab3f71202 100644 --- a/modules/openstack_project/files/git/haproxy-statsd.default +++ b/modules/openstack_project/files/git/haproxy-statsd.default @@ -1,2 +1,2 @@ -STATSD_HOST=graphite.openstack.org +STATSD_HOST=graphite.opendev.org STATSD_PORT=8125 diff --git a/modules/openstack_project/manifests/logstash.pp b/modules/openstack_project/manifests/logstash.pp index ad616ee941..a94286f72f 100644 --- a/modules/openstack_project/manifests/logstash.pp +++ b/modules/openstack_project/manifests/logstash.pp @@ -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, ) { diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp index 1572bb79c1..cab90fb156 100644 --- a/modules/openstack_project/manifests/status.pp +++ b/modules/openstack_project/manifests/status.pp @@ -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', diff --git a/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb b/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb index 6d9021a78f..524986f6df 100644 --- a/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb +++ b/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb @@ -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 diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml index f1fdd578e4..84ffa800b9 100644 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml @@ -18,7 +18,7 @@ results: - puppet - puppet4 - graphite.openstack.org: + graphite.opendev.org: - graphite - puppet - webservers diff --git a/run_all.sh b/run_all.sh index 6d3f826e52..f4688a20c4 100755 --- a/run_all.sh +++ b/run_all.sh @@ -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 diff --git a/run_cloud_launcher.sh b/run_cloud_launcher.sh index caf21c31a4..ac0d8e84d0 100755 --- a/run_cloud_launcher.sh +++ b/run_cloud_launcher.sh @@ -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