Paths

Table of Contentst

Differential D6082

prometheus: Support http parameters in exporter configuration
ClosedPublic
Actions

Authored by vsellier on Aug 12 2021, 3:50 PM.

Tags

None

Subscribers

None

Details

Reviewers

Group Reviewers

System administrators

Maniphest Tasks

T3462: Add proxmox / ceph monitoring

Commits

rSPSITEb972034f8ceb: prometheus/pve_exporter: Split the metrics_path and the parameters
rSPSITE9fe99c19b47a: prometheus: Support http parameters in exporter configuration

Summary

2 commits:

It's needed for promox monitoring because it uses a metric url like
/pve?target=host

The parameters can't be put directly on the metric_path configuration

Related to T3462

prometheus/pve_exporter: Split the metrics_path and the parameters

Related to T3462

Test Plan

uffizi

diff origin/production/uffizi.internal.softwareheritage.org current/uffizi.internal.softwareheritage.org
*******************************************
  Profile::Prometheus::Export_scrape_config[pve-exporter_uffizi.internal.softwareheritage.org] =>
   parameters =>
     metrics_path =>
      - /pve?target=127.0.0.1
      + /pve
     params =>
      + {"target"=>["127.0.0.1"]}
*******************************************
*** End octocatalog-diff on uffizi.internal.softwareheritage.org

pergamon

diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  File[/usr/local/bin/update-prometheus-config] =>
   parameters =>
     content =>
      - {md5}761580a6e029c82c61bdc37f46270c46
      + {md5}34059150b195fb497afe67d494c51d12
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

there are no changes nodes that are not hypervisors

Diff Detail

Repository

rSPSITE puppet-swh-site

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vsellier requested review of this revision.Aug 12 2021, 3:50 PM

vsellier created this revision.

Harbormaster completed remote builds in B22981: Diff 22022.Aug 12 2021, 3:50 PM

vsellier edited the summary of this revision. (Show Details)Aug 12 2021, 3:50 PM

vsellier edited the summary of this revision. (Show Details)

ardumont accepted this revision.Aug 12 2021, 3:51 PM

This revision is now accepted and ready to land.Aug 12 2021, 3:51 PM

Remove unused import of Set

Harbormaster completed remote builds in B22982: Diff 22023.Aug 12 2021, 3:55 PM

Closed by commit rSPSITE9fe99c19b47a: prometheus: Support http parameters in exporter configuration (authored by vsellier). · Explain WhyAug 12 2021, 4:01 PM

This revision was automatically updated to reflect the committed changes.

vsellier added a commit: rSPSITE9fe99c19b47a: prometheus: Support http parameters in exporter configuration.

vsellier added a commit: rSPSITEb972034f8ceb: prometheus/pve_exporter: Split the metrics_path and the parameters.

ardumont mentioned this in T3462: Add proxmox / ceph monitoring.Aug 12 2021, 4:14 PM

Revision Contents
Changeset List

Path

Size

site-modules/

profile/

files/

prometheus/

update-prometheus-config

19 lines

manifests/

prometheus/

export_scrape_config.pp

2 lines

scrape_config.pp

4 lines

Diff 22024

site-modules/profile/files/prometheus/update-prometheus-config

Loading...

site-modules/profile/manifests/prometheus/export_scrape_config.pp

Loading...

site-modules/profile/manifests/prometheus/scrape_config.pp

Loading...