From 32a38a4b83142cba1e2ea785d1c1958e005262ef Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sun, 1 Aug 2021 21:41:06 +0000 Subject: [PATCH] Add gerritbot-matrix health check and expose prometheus monitoring This change enables monitoring the gerritbot-matrix service metrics. Change-Id: I9459e47ecfd19b27b7adcaee9ce91f80d51c124d --- inventory/service/group_vars/eavesdrop.yaml | 1 + playbooks/roles/matrix-gerritbot/defaults/main.yaml | 3 ++- .../roles/matrix-gerritbot/templates/docker-compose.yaml.j2 | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/inventory/service/group_vars/eavesdrop.yaml b/inventory/service/group_vars/eavesdrop.yaml index 0ca86e9f8c..91a2d1047b 100644 --- a/inventory/service/group_vars/eavesdrop.yaml +++ b/inventory/service/group_vars/eavesdrop.yaml @@ -1,5 +1,6 @@ iptables_extra_public_tcp_ports: - 80 + - 9001 # When changing this number, also update the default in playbooks/roles/matrix-gerritbot/defaults/main.yaml 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 AAAAB3NzaC1yc2EAAAADAQABAAABAQDQbidZ1wW8moNtPGBhZ3oDm1kcDtiAemI51euL6KZslwpG8CKMT0KBSYw1vpCYc5dYCerq63dQtg2Bm1rhc2gC/U2bbMlvnNPwlkS7eykVfrPDfJHVbff+qHv7l1e1ZoCVAEvVxXG/FgFUiqIKwEhMqG/Etegw07H7vERNETGE5RyRA8cMnK9Cj4oL0OUpZAv7o1a+A+gXRv1EMdWL7g9M6OImikO48w+ZSLOA8uD+0MmN23nh335k2VG609u+ZxTkZAB4GtW0HSCTFu5MCmJFaY1+5cCNedsC9O4ekaXNQxYelFxasN5Qe7miRWcR+Ax8g3HjHpG3Hc1LSc/6XVcj zuul-project-config-20180924 diff --git a/playbooks/roles/matrix-gerritbot/defaults/main.yaml b/playbooks/roles/matrix-gerritbot/defaults/main.yaml index 0c44f85ba1..49e4abce89 100644 --- a/playbooks/roles/matrix-gerritbot/defaults/main.yaml +++ b/playbooks/roles/matrix-gerritbot/defaults/main.yaml @@ -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_prometheus_port: 9001 # gerrit ssh configuration gerritbot_ssh_key: "" diff --git a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 index 9e6723d3de..20fd774b61 100644 --- a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 @@ -16,8 +16,13 @@ services: volumes: - /var/lib/matrix-gerritbot/config:/config - /var/lib/matrix-gerritbot/ssh:/root/.ssh + healthcheck: + test: "gerritbot-matrix check {{ gerritbot_matrix_prometheus_port }}" + retries: 6 + timeout: "5s" command: >- --gerrit-host {{ gerritbot_gerrit_host }} --gerrit-user {{ gerritbot_gerrit_user }} --homeserver-url {{ gerritbot_matrix_homeserver }} --config-file /config/gerritbot.dhall + --monitoring-port {{ gerritbot_matrix_prometheus_port }}