opendev/system-config
Code Issues Proposed changes

Merge "Deploy grafana02"

Browse Source
This commit is contained in:
Zuul 2025-02-03 23:02:52 +00:00 committed by Gerrit Code Review
commit 2a04501e45
9 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -24,6 +24,7 @@ cacti_hosts:
- gitea13.opendev.org
- gitea14.opendev.org
- grafana01.opendev.org
- grafana02.opendev.org
- graphite02.opendev.org
- jvb01.opendev.org
- kdc03.openstack.org

11
inventory/base/hosts.yaml
View File

@ -242,6 +242,17 @@ all:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINuErqGwtxFWgfg3a44N2z8/pOihQNr5k2LAHTP9cno'
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJcH3qQHqiAlr0S0Hmr6a6x/WRnc1w6EQn8JhN7tGuN2waWV2bzzJKa8yaOThwH/EkJWk29sa5l1Ig/OXEuy1WnLK9buEEc0LidDn2ekEDyNCuVdQ96Fu1UGhhtOll6sljBzYZAOfMufnSlV+dX0OdiDPvL4Saz0Pf8r//jc87wuPAztQFiPixT/FcIXSrsl265rc8KuaN4rMG9rrQHA5Zpm/mnx2Sap770+C07ygyaQ+HW9gat3LXV7ELvffOvUmIpGFhyQugTmGEhWtEmsg2mPIiFPGOhIKNZPKtHyRxquifb3PlQ8dsx0JOILd1F12gibw2tezsNzqSWswPTwZ9IIW4jWSt9Srk3+dnXIg+J7w23blXbPm4S91a4hBOHGfgEAH9ALsDhCjQ/spto4e4czabDvenHK3vN6/XVK7bcl0wp+j9qKrNNhzYxTwcEJXF/1uTkjfI0mySn8xYQX6wiwW6l7UIyAqcY9+GuYNz0DIXaBO/W3s5CFtmCRQeYy8='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxJpz56ZCrJXXI3Sv2y1UHOUL18OR3HSV01XcJjSEtKtmqwhmmJnrQp5ax8t34s9OgpMhA8l3KVwDFAtiFBJxE='
grafana02.opendev.org:
ansible_host: 104.239.145.144
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.239.145.144
public_v6: 2001:4800:7818:104:be76:4eff:fe04:46cb
host_keys:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCEZ+DFaXALYZpUUEvCK8eJyn4K6HKCp7tofAdbuB6vmKcSSE9klWdcWmHtWATova302ZLNOmb72Q9/2fy5E8PU8uXCWAACn9NGBqMOd7KNKLTP/T6TDrJb73JIru1OQYKqAmqEB2LFyBuBnQnEVOwnTn68ZceayFH/Bqd0GSI8gNEHjE70VTOrZCMaalPz8DTtvy/W5KREQq/nNJvNob10IKTi2aizvaoTrcYdq+JNe8gMSLJxyRmM34cdGMLVapR5V1f5tHyPgpsiQU0+Sdwss7cIots79WUfao4uSIpQX3Bt4VAORTP0JIAb2wwkx/k0UZq9jpkFcxPFykryLkaK4Bkpwpo00TeYzyhS9aejn958DzrZIdynQ76zIksm+Wvkfo1RjrB5vlkunMBo9S7pWF7L8a9p0X9+oyH+idkIO/bydiYzcVrY6yeYjusfxDGHXrdYTP3PlP5x0VJjd1CqaYpuOfEhrWFG7lVSO8PQQVNP/yyHnoK87cuvs30hJTk='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBAr2dMicgpcO8s5mZAbw/hgionUCGpVRsfBBR+sMMAbdlYQ+Z5Y/Qqoaj6VNsLzz49fa+SyRXi91U7Vhpspw/U='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMJdu4aoSyJs6HKhIGBRz0amHBPNK7f4L4s55h5tfplz'
graphite02.opendev.org:
ansible_host: 104.239.240.167
location:

5
inventory/service/host_vars/grafana02.opendev.org.yaml Normal file
View File

@ -0,0 +1,5 @@
letsencrypt_certs:
grafana02-opendev-org-main:
- grafana02.opendev.org
- grafana.opendev.org
- grafana.openstack.org

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -153,6 +153,9 @@
- name: letsencrypt updated grafana01-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated grafana02-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# Codesearch (hound)
- name: letsencrypt updated codesearch01-opendev-org-main

2
playbooks/zuul/run-base.yaml
View File

@ -122,6 +122,7 @@
- group_vars/registry.yaml
- group_vars/gitea.yaml
- group_vars/gitea-lb.yaml
- group_vars/grafana.yaml
- group_vars/kerberos-kdc.yaml
- group_vars/keycloak.yaml
- group_vars/letsencrypt.yaml
@ -146,7 +147,6 @@
- host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.opendev.org.yaml
- host_vars/gitea99.opendev.org.yaml
- host_vars/grafana01.opendev.org.yaml
- host_vars/mirror01.openafs.provider.opendev.org.yaml
- host_vars/mirror02.openafs.provider.opendev.org.yaml
- host_vars/mirror03.openafs.provider.opendev.org.yaml

0
playbooks/zuul/templates/host_vars/grafana01.opendev.org.yaml.j2 → playbooks/zuul/templates/group_vars/grafana.yaml.j2
View File

2
testinfra/test_grafana.py
View File

@ -16,7 +16,7 @@ from util import take_screenshots
import json
testinfra_hosts = ['grafana01.opendev.org']
testinfra_hosts = ['grafana02.opendev.org']
def test_grafana_container_listening(host):

1
zuul.d/infra-prod.yaml
View File

@ -557,6 +557,7 @@
- inventory/base
- playbooks/service-grafana.yaml
- inventory/service/host_vars/grafana01.org.yaml
- inventory/service/host_vars/grafana02.org.yaml
- inventory/service/group_vars/grafana
- playbooks/roles/install-docker/
- playbooks/roles/pip3/

3
zuul.d/system-config-run.yaml
View File

@ -734,7 +734,7 @@
nodeset:
nodes:
- <<: *bridge_node_x86
- name: grafana01.opendev.org
- name: grafana02.opendev.org
label: ubuntu-noble
groups:
- <<: *bastion_group
@ -751,6 +751,7 @@
- playbooks/roles/install-docker/
- playbooks/roles/pip3/
- playbooks/roles/run-selenium/
- playbooks/zuul/templates/group_vars/grafana
- tesinfra/util.py
- testinfra/test_grafana.py