opendev/system-config
Code Issues Proposed changes

Add gerritbot-matrix health check and expose prometheus monitoring

Browse Source 
This change enables monitoring the gerritbot-matrix service metrics.

Change-Id: I9459e47ecfd19b27b7adcaee9ce91f80d51c124d
This commit is contained in:
Tristan Cacqueray 2021-08-01 21:41:06 +00:00
parent 4051f824c8
commit 32a38a4b83
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/service/group_vars/eavesdrop.yaml
View File

@ -1,5 +1,6 @@
iptables_extra_public_tcp_ports: iptables_extra_public_tcp_ports:
- 80 - 80
- 9001 # When changing this number, also update the default in playbooks/roles/matrix-gerritbot/defaults/main.yaml
zuul_user_authorized_key: | zuul_user_authorized_key: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcXd/QJDEprSLh6N6bULnhchf9M+uzYBEJ2b51Au67FON+5M6VEj5Ut+DlkEPhabOP+tSv9Cn1HpmpBjdEOXdmBj6JS7G/gBb4w28oZDyNjrPT2ebpRw/XnVEkGfikR2J+j3o7CV+ybhLDalXm2TUDReVXnONUq3YzZbjRzoYs0xxrxyss47vZP0xFpsAt9jCMAJW2k6H589VUY38k9LFyhZUZ72FB6eJ68B9GN0TimBYm2DqvupBGQrRhkP8OZ0WoBV8PulKXaHVFdmfBNHB7E7FLlZKuiM6nkV4bOWMGOB/TF++wXBK86t9po3pWCM7+kr72xGRTE+6LuZ2z1K+h zuul-system-config-20180924 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcXd/QJDEprSLh6N6bULnhchf9M+uzYBEJ2b51Au67FON+5M6VEj5Ut+DlkEPhabOP+tSv9Cn1HpmpBjdEOXdmBj6JS7G/gBb4w28oZDyNjrPT2ebpRw/XnVEkGfikR2J+j3o7CV+ybhLDalXm2TUDReVXnONUq3YzZbjRzoYs0xxrxyss47vZP0xFpsAt9jCMAJW2k6H589VUY38k9LFyhZUZ72FB6eJ68B9GN0TimBYm2DqvupBGQrRhkP8OZ0WoBV8PulKXaHVFdmfBNHB7E7FLlZKuiM6nkV4bOWMGOB/TF++wXBK86t9po3pWCM7+kr72xGRTE+6LuZ2z1K+h zuul-system-config-20180924
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQbidZ1wW8moNtPGBhZ3oDm1kcDtiAemI51euL6KZslwpG8CKMT0KBSYw1vpCYc5dYCerq63dQtg2Bm1rhc2gC/U2bbMlvnNPwlkS7eykVfrPDfJHVbff+qHv7l1e1ZoCVAEvVxXG/FgFUiqIKwEhMqG/Etegw07H7vERNETGE5RyRA8cMnK9Cj4oL0OUpZAv7o1a+A+gXRv1EMdWL7g9M6OImikO48w+ZSLOA8uD+0MmN23nh335k2VG609u+ZxTkZAB4GtW0HSCTFu5MCmJFaY1+5cCNedsC9O4ekaXNQxYelFxasN5Qe7miRWcR+Ax8g3HjHpG3Hc1LSc/6XVcj zuul-project-config-20180924 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQbidZ1wW8moNtPGBhZ3oDm1kcDtiAemI51euL6KZslwpG8CKMT0KBSYw1vpCYc5dYCerq63dQtg2Bm1rhc2gC/U2bbMlvnNPwlkS7eykVfrPDfJHVbff+qHv7l1e1ZoCVAEvVxXG/FgFUiqIKwEhMqG/Etegw07H7vERNETGE5RyRA8cMnK9Cj4oL0OUpZAv7o1a+A+gXRv1EMdWL7g9M6OImikO48w+ZSLOA8uD+0MmN23nh335k2VG609u+ZxTkZAB4GtW0HSCTFu5MCmJFaY1+5cCNedsC9O4ekaXNQxYelFxasN5Qe7miRWcR+Ax8g3HjHpG3Hc1LSc/6XVcj zuul-project-config-20180924

3
playbooks/roles/matrix-gerritbot/defaults/main.yaml
View File

@ -1,5 +1,6 @@
gerritbot_matrix_version: bd43946 gerritbot_matrix_version: 9a8c8e2
gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }} gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }}
gerritbot_matrix_prometheus_port: 9001
# gerrit ssh configuration # gerrit ssh configuration
gerritbot_ssh_key: "" gerritbot_ssh_key: ""

5
playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
View File

@ -16,8 +16,13 @@ services:
volumes: volumes:
- /var/lib/matrix-gerritbot/config:/config - /var/lib/matrix-gerritbot/config:/config
- /var/lib/matrix-gerritbot/ssh:/root/.ssh - /var/lib/matrix-gerritbot/ssh:/root/.ssh
healthcheck:
test: "gerritbot-matrix check {{ gerritbot_matrix_prometheus_port }}"
retries: 6
timeout: "5s"
command: >- command: >-
--gerrit-host {{ gerritbot_gerrit_host }} --gerrit-host {{ gerritbot_gerrit_host }}
--gerrit-user {{ gerritbot_gerrit_user }} --gerrit-user {{ gerritbot_gerrit_user }}
--homeserver-url {{ gerritbot_matrix_homeserver }} --homeserver-url {{ gerritbot_matrix_homeserver }}
--config-file /config/gerritbot.dhall --config-file /config/gerritbot.dhall
--monitoring-port {{ gerritbot_matrix_prometheus_port }}