Page MenuHomeSoftware Heritage

Expose publicly stats export (from munin) through stats.export.s.o
ClosedPublic

Authored by ardumont on Jun 21 2019, 10:57 AM.

Details

Summary

Prior to this commit, this exposed a virtualenv stats.export.s.o which is no
longer accessible (from munin0 node). Simplifying this to export the rrd file
in the munin(0)'s apache venv and expose it through the existing
stats.export.s.o host's front (pergamon).

This diff allows to:

  • remove the obsolete stats.export.s.o virtualenv from munin0 (unused)
  • expose the export history_counters.json directly from munin0 http://munin.internal.s.o/export/history_counters.json
  • update pergamon's role to actually answer correctly requests from https://stats.export.s.o/ (proxying requests to http://munin.internal.s.o/export/)

There remains work to renew the certificate use for the fqdn
stats.export.s.o but that's not in the scope of the diff.

Related T1544

Test Plan

bin/octocatalog pergamon ~> wants to:

  • install a virtualenv stats.export.s.o
  • with proxy requests to munin.internal.s.o

bin/octocatalog munin ~> wants to:

  • remove apache configuration about stats.export.s.o virtualenv
  • add the rewrite rule to export folder in munin virtualenv
  • update the crontab entry to actually write to the right location the history_counters.json

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

ardumont edited the summary of this revision. (Show Details)
  • Install stats_web profile to swh_sysadmin role
  • stats_web: Proxying requests to munin to retrieve stats export

In effect, this should allow the updated history_counters.json transparently
from the end client (www.s.o).

https://stats.export.softwareheritage.org/export/history_counters.json
-proxy-> http://munin.internal.softwareheritage.org/export/history_counters.json

ardumont edited the test plan for this revision. (Show Details)
  • stats_web: Only open requests to the /export subfolder

Keep stats_export_softwareheritage_org certificate for stats_web profile

ardumont retitled this revision from Export stats export to munin's (apache) virtualenv to Expose publicly stats export (from munin) through stats.export.s.o.Jun 21 2019, 1:59 PM
ardumont edited the summary of this revision. (Show Details)
ardumont edited the test plan for this revision. (Show Details)
This revision is now accepted and ready to land.Jun 21 2019, 2:03 PM

Plug diff to production branch

Fix escaping a $1 which is evaluated by puppet wrongly (renders nothing) otherwise.

This revision was automatically updated to reflect the committed changes.