Page MenuHomeSoftware Heritage
Differential D7844

Allow icinga checks to write prometheus metrics files
ClosedPublic
Actions

Authored by vsellier on May 17 2022, 8:24 PM.

Details

Reviewers
ardumont
Group Reviewers
System administrators
Maniphest Tasks
T3129: Reliable monitoring of services: for users and for admins
Commits
rSPSITE8c8590ef6fad: Allow icinga checks to write prometheus metrics files
Summary

The prometheus data are readable by everyone so adding icinga in
the prometheus groups seems to not open any hole

Related to T3129

Test Plan
  • pergamon (collected resources not visible)
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ File[/var/lib/prometheus/node-exporter] =>
   parameters =>
     "ensure": "directory",
     "group": "prometheus",
     "mode": "0775",
     "owner": "prometheus"
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Branch
staging
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 29484
Build 46073: arc lint + arc unit

Event Timeline

vsellier created this revision.May 17 2022, 8:24 PM
Herald added a reviewer: System administrators. · View Herald TranscriptMay 17 2022, 8:24 PM
Harbormaster completed remote builds in B29441: Diff 28337.May 17 2022, 8:24 PM
vsellier requested review of this revision.May 17 2022, 8:24 PM
vsellier added a child revision: D7764: icinga checks: Activate the prometheus export on e2e tests.May 17 2022, 8:42 PM
ardumont added a subscriber: ardumont.May 18 2022, 2:31 PM
ardumont added inline comments.
site-modules/profile/manifests/icinga2/objects/e2e_checks_base.pp
8

I'm having a hard-time reading this, what does this mean?

Add groups prometheus to user nagios?

vsellier added inline comments.May 18 2022, 2:35 PM
site-modules/profile/manifests/icinga2/objects/e2e_checks_base.pp
8

yep exactly
I used this notation because when I try to configure the group via a user or a group class, puppet complains about duplicate declaration which makes sens.

ardumont accepted this revision.May 18 2022, 2:36 PM

Right, thanks!

This revision is now accepted and ready to land.May 18 2022, 2:36 PM
vsellier updated this revision to Diff 28388.May 19 2022, 2:08 PM

rebase

Harbormaster completed remote builds in B29484: Diff 28388.May 19 2022, 2:08 PM
Closed by commit rSPSITE8c8590ef6fad: Allow icinga checks to write prometheus metrics files (authored by vsellier). · Explain WhyMay 19 2022, 2:09 PM
This revision was automatically updated to reflect the committed changes.
vsellier added a commit: rSPSITE8c8590ef6fad: Allow icinga checks to write prometheus metrics files.

Revision Contents
Changeset List

PathSize
site-modules/
profile/
manifests/
icinga2/
objects/
2 lines
prometheus/
7 lines

Diff 28388

View Options

site-modules/profile/manifests/icinga2/objects/e2e_checks_base.pp

Show First 20 Lines • Show All 2,034 Lines • ▼ Show 20 Linesswh::deploy::deposit::locked_endpoints:
- /1/private/deposits/ - /1/private/deposits/
# e2e vault # e2e vault
swh::deploy::vault::e2e::webapp: "%{alias('swh::deploy::webapp::url')}" swh::deploy::vault::e2e::webapp: "%{alias('swh::deploy::webapp::url')}"
# e2e save code now # e2e save code now
swh::deploy::savecodenow::e2e::activate: true # to be deactivated on secondaries webapps swh::deploy::savecodenow::e2e::activate: true # to be deactivated on secondaries webapps
swh::deploy::savecodenow::e2e::origins: swh::deploy::savecodenow::e2e::origins:
- name: parmap - name: git
origin: https://github.com/rdicosmo/parmap origin:
ardumontUnsubmitted
Not Done
Inline Actions

maybe remove the old ones (parmap, panda and hgview)

ardumont: maybe remove the old ones (parmap, panda and hgview)
- https://github.com/rdicosmo/parmap
- https://github.com/SoftwareHeritage/swh-core
- https://github.com/SoftwareHeritage/swh-lister
- https://github.com/SoftwareHeritage/swh-loader-bzr
- https://github.com/SoftwareHeritage/swh-loader-core
- https://github.com/SoftwareHeritage/swh-loader-git
- https://github.com/SoftwareHeritage/swh-loader-mercurial
- https://github.com/SoftwareHeritage/swh-loader-svn
- https://github.com/SoftwareHeritage/swh-model
- https://github.com/SoftwareHeritage/swh-web
type: git type: git
- name: panda - name: subversion
origin: https://subversion.renater.fr/anonscm/svn/panda origin:
- https://subversion.renater.fr/anonscm/svn/panda
- https://svn.code.sf.net/p/freeorion/code
- https://svn.code.sf.net/p/swig/code
- https://svn.code.sf.net/p/zookeeper/code
- https://svn.code.sf.net/p/esitools/code
olasdUnsubmitted
Not Done
Inline Actions

this one is inconsistent with the others

olasd: this one is inconsistent with the others
vlorentzAuthorUnsubmitted
Done
Inline Actions

I used the URLs we already have in the archive

vlorentz: I used the URLs we already have in the archive
olasdUnsubmitted
Not Done
Inline Actions

ok. Please add a comment so that we don't "fix" it later?

olasd: ok. Please add a comment so that we don't "fix" it later?
- https://svn.code.sf.net/p/sauerbraten/code/ # existing origin has a trailing /
- https://svn.code.sf.net/p/civ4mods/code
- https://svn.code.sf.net/p/ldap-sdk/code
type: svn type: svn
- name: hgview - name: mercurial
origin: https://foss.heptapod.net/mercurial/hgview origin:
- https://foss.heptapod.net/mercurial/hgview
- https://foss.heptapod.net/mercurial/tortoisehg
- https://foss.heptapod.net/mercurial/evolve
- https://foss.heptapod.net/mercurial/hg-git
- https://foss.heptapod.net/mercurial/hg-docgraph
- https://foss.heptapod.net/mercurial/mercurial-devel
- https://foss.heptapod.net/mercurial/pytest
- https://foss.heptapod.net/mercurial/scmperf
type: hg type: hg
swh::deploy::savecodenow::e2e::webapp: "%{alias('swh::deploy::webapp::url')}" swh::deploy::savecodenow::e2e::webapp: "%{alias('swh::deploy::webapp::url')}"
# e2e checks on deposit # e2e checks on deposit
swh::deploy::deposit::e2e::server: "%{hiera('swh::deploy::deposit::url')}/1" swh::deploy::deposit::e2e::server: "%{hiera('swh::deploy::deposit::url')}/1"
swh::deploy::deposit::e2e::user: swh swh::deploy::deposit::e2e::user: swh
swh::deploy::deposit::e2e::collection: swh swh::deploy::deposit::e2e::collection: swh
▲ Show 20 Lines • Show All 1,928 Lines • Show Last 20 Lines
View Options

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

Show First 20 Lines • Show All 2,034 Lines • ▼ Show 20 Linesswh::deploy::deposit::locked_endpoints:
- /1/private/deposits/ - /1/private/deposits/
# e2e vault # e2e vault
swh::deploy::vault::e2e::webapp: "%{alias('swh::deploy::webapp::url')}" swh::deploy::vault::e2e::webapp: "%{alias('swh::deploy::webapp::url')}"
# e2e save code now # e2e save code now
swh::deploy::savecodenow::e2e::activate: true # to be deactivated on secondaries webapps swh::deploy::savecodenow::e2e::activate: true # to be deactivated on secondaries webapps
swh::deploy::savecodenow::e2e::origins: swh::deploy::savecodenow::e2e::origins:
- name: parmap - name: git
origin: https://github.com/rdicosmo/parmap origin:
ardumontUnsubmitted
Not Done
Inline Actions

maybe remove the old ones (parmap, panda and hgview)

ardumont: maybe remove the old ones (parmap, panda and hgview)
- https://github.com/rdicosmo/parmap
- https://github.com/SoftwareHeritage/swh-core
- https://github.com/SoftwareHeritage/swh-lister
- https://github.com/SoftwareHeritage/swh-loader-bzr
- https://github.com/SoftwareHeritage/swh-loader-core
- https://github.com/SoftwareHeritage/swh-loader-git
- https://github.com/SoftwareHeritage/swh-loader-mercurial
- https://github.com/SoftwareHeritage/swh-loader-svn
- https://github.com/SoftwareHeritage/swh-model
- https://github.com/SoftwareHeritage/swh-web
type: git type: git
- name: panda - name: subversion
origin: https://subversion.renater.fr/anonscm/svn/panda origin:
- https://subversion.renater.fr/anonscm/svn/panda
- https://svn.code.sf.net/p/freeorion/code
- https://svn.code.sf.net/p/swig/code
- https://svn.code.sf.net/p/zookeeper/code
- https://svn.code.sf.net/p/esitools/code
olasdUnsubmitted
Not Done
Inline Actions

this one is inconsistent with the others

olasd: this one is inconsistent with the others
vlorentzAuthorUnsubmitted
Done
Inline Actions

I used the URLs we already have in the archive

vlorentz: I used the URLs we already have in the archive
olasdUnsubmitted
Not Done
Inline Actions

ok. Please add a comment so that we don't "fix" it later?

olasd: ok. Please add a comment so that we don't "fix" it later?
- https://svn.code.sf.net/p/sauerbraten/code/ # existing origin has a trailing /
- https://svn.code.sf.net/p/civ4mods/code
- https://svn.code.sf.net/p/ldap-sdk/code
type: svn type: svn
- name: hgview - name: mercurial
origin: https://foss.heptapod.net/mercurial/hgview origin:
- https://foss.heptapod.net/mercurial/hgview
- https://foss.heptapod.net/mercurial/tortoisehg
- https://foss.heptapod.net/mercurial/evolve
- https://foss.heptapod.net/mercurial/hg-git
- https://foss.heptapod.net/mercurial/hg-docgraph
- https://foss.heptapod.net/mercurial/mercurial-devel
- https://foss.heptapod.net/mercurial/pytest
- https://foss.heptapod.net/mercurial/scmperf
type: hg type: hg
swh::deploy::savecodenow::e2e::webapp: "%{alias('swh::deploy::webapp::url')}" swh::deploy::savecodenow::e2e::webapp: "%{alias('swh::deploy::webapp::url')}"
# e2e checks on deposit # e2e checks on deposit
swh::deploy::deposit::e2e::server: "%{hiera('swh::deploy::deposit::url')}/1" swh::deploy::deposit::e2e::server: "%{hiera('swh::deploy::deposit::url')}/1"
swh::deploy::deposit::e2e::user: swh swh::deploy::deposit::e2e::user: swh
swh::deploy::deposit::e2e::collection: swh swh::deploy::deposit::e2e::collection: swh
▲ Show 20 Lines • Show All 1,928 Lines • Show Last 20 Lines
About · Developer information · Legal