Details

Reviewers

ardumont

Group Reviewers

System administrators

Maniphest Tasks

T3615: Adapt rabbitmq monitoring for bullseye

Commits

rSPSITE6277c45abc11: Adapt the prometheus rabbitmq plugin for bullseye

Summary

On bullseye (11), it's installed along the rabbitmq-server >= 3.8.
We need to adapt the profile to install it correctly.

Related to T3615

Test Plan

octo-diff (didn't succeed to test on vagrant :()

diff origin/production/met.internal.softwareheritage.org current/met.internal.softwareheritage.org
*******************************************
- File[/etc/default/prometheus-rabbitmq-exporter]
*******************************************
- Package[prometheus-rabbitmq-exporter]
*******************************************
  Profile::Prometheus::Export_scrape_config[rabbitmq] =>
   parameters =>
     target =>
      - 192.168.100.110:9419
      + 192.168.100.110:15692
*******************************************
+ Rabbitmq_plugin[rabbitmq_prometheus] =>
   parameters =>
     "ensure": "present"
*******************************************
- Service[prometheus-rabbitmq-exporter]
*******************************************
*** End octocatalog-diff on met.internal.softwareheritage.org

saatchi

*** Running octocatalog-diff on host saatchi.internal.softwareheritage.org
I, [2021-10-06T17:46:28.503284 #3426083]  INFO -- : Catalogs compiled for saatchi.internal.softwareheritage.org
I, [2021-10-06T17:46:28.806850 #3426083]  INFO -- : Diffs computed for saatchi.internal.softwareheritage.org
I, [2021-10-06T17:46:28.806889 #3426083]  INFO -- : No differences
*** End octocatalog-diff on saatchi.internal.softwareheritage.org

Diff Detail

Repository

rSPSITE puppet-swh-site

Branch

staging

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 24256
Build 37861: arc lint + arc unit

Event Timeline

ardumont requested review of this revision.Sep 28 2021, 4:03 PM

ardumont created this revision.

Harbormaster completed remote builds in B24055: Diff 23142.Sep 28 2021, 4:03 PM

ardumont edited the test plan for this revision. (Show Details)Sep 28 2021, 4:03 PM

@vsellier Feel free to commandeer the diff and adapt it if you want/need.

vsellier commandeered this revision.Oct 6 2021, 4:13 PM

vsellier edited reviewers, added: ardumont; removed: vsellier.

rebase

Harbormaster completed remote builds in B24256: Diff 23342.Oct 6 2021, 4:14 PM

factorize the exported configuration
use the right exporter port on met

Harbormaster completed remote builds in B24264: Diff 23347.Oct 6 2021, 5:45 PM

vsellier retitled this revision from wip: Adapt the prometheus rabbitmq plugin for bullseye to Adapt the prometheus rabbitmq plugin for bullseye.Oct 6 2021, 5:48 PM

vsellier edited the test plan for this revision. (Show Details)

vsellier added a project: System administration.

lgtm

This revision is now accepted and ready to land.Oct 6 2021, 5:58 PM