Page MenuHomeSoftware Heritage

sentry: Define setup for swh services (servers, workers, ...)
ClosedPublic

Authored by ardumont on Wed, Jan 22, 6:50 PM.

Details

Summary

+ Added the missing sentry setup on deposit as well.

Related to D2572
Close T2181

Test Plan

bin/octocatalog moma (webapp, deposit)
bin/octocatalog saatchi (scheduler)
bin/octocatalog worker01 (workers as in loaders/lister)
bin/octocatalog worker0.internal.staging.swh.network (staging workers)
bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging worker01.euwest.azure (indexers)
bin/octocatalog-diff worker12.euwest.azure (cookers)

This adds the necessary new environment variable SWH_MAIN_PACKAGE and SWH_SENTRY_ENVIRONMENT
without touching the previous SWH_SENTRY_DSN, so all should be fine.

See for example (smaller output):

$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging worker12.euwest.azure
Found host worker12.euwest.azure.internal.softwareheritage.org
Cloning into '/tmp/swh-ocd.UqlVy6V0/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.UqlVy6V0/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host worker12.euwest.azure.internal.softwareheritage.org
I, [2020-01-22T18:57:27.673574 #12904]  INFO -- : Catalogs compiled for worker12.euwest.azure.internal.softwareheritage.org
I, [2020-01-22T18:57:28.600172 #12904]  INFO -- : Diffs computed for worker12.euwest.azure.internal.softwareheritage.org
diff origin/production/worker12.euwest.azure.internal.softwareheritage.org current/worker12.euwest.azure.internal.softwareheritage.org
*******************************************
  File[/etc/systemd/system/swh-worker@vault_cooker.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -7,4 +7,6 @@
       Environment=LOGLEVEL=info
       Environment=SWH_SENTRY_DSN=swh::deploy::vault::sentry_dsn
      +Environment=SWH_SENTRY_ENVIRONMENT=production
      +Environment=SWH_MAIN_PACKAGE=swh.vault
      _
      _
*******************************************
  Systemd::Dropin_file[swh-worker@vault_cooker/parameters.conf] =>
   parameters =>
     content =>
      @@ -7,4 +7,6 @@
       Environment=LOGLEVEL=info
       Environment=SWH_SENTRY_DSN=swh::deploy::vault::sentry_dsn
      +Environment=SWH_SENTRY_ENVIRONMENT=production
      +Environment=SWH_MAIN_PACKAGE=swh.vault
      _
      _
*******************************************
*** End octocatalog-diff on worker12.euwest.azure.internal.softwareheritage.org

Diff Detail

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

Event Timeline

ardumont created this revision.Wed, Jan 22, 6:50 PM
ardumont updated this revision to Diff 9198.Wed, Jan 22, 6:56 PM

Fix indexer fossology license typo

ardumont edited the test plan for this revision. (Show Details)Wed, Jan 22, 6:57 PM
olasd accepted this revision.Wed, Jan 22, 6:59 PM

Just a few tiny nitpicks but that generally looks sensible.

data/defaults.yaml
2751

missing quotes?

data/location/sesi_rocquencourt_staging.yaml
129–130

should be removed now

site-modules/profile/manifests/swh/deploy/deposit.pp
94–96

no need for quotes / variable expansion here

site-modules/profile/manifests/swh/deploy/rpc_server.pp
106–108

same remark wrt quotes/variable expansion

site-modules/profile/manifests/swh/deploy/webapp.pp
139–141

and ditto

This revision is now accepted and ready to land.Wed, Jan 22, 6:59 PM
ardumont added inline comments.Wed, Jan 22, 7:01 PM
data/defaults.yaml
2751

heh, right.
but octo is not complaining...

site-modules/profile/manifests/swh/deploy/worker/instance.pp
21–23

I'd like this key to be aligned with other key configuration.
that is swh::deploy`::worker`::${sentry_name}::sentry_...
but if i do that, it removes the existing sentry_dsn values.
I don't understand why...

ardumont updated this revision to Diff 9199.Wed, Jan 22, 7:05 PM
  • Fix unneeded expansion
  • Remove obsolete staging entry about prometheus
  • Add missing quote

And thanks!

ardumont updated this revision to Diff 9201.Thu, Jan 23, 8:55 AM

Rebase on latest staging

ardumont added inline comments.Thu, Jan 23, 10:33 AM
data/location/sesi_rocquencourt_staging.yaml
133

mfw 2 hours later after setting my hair on fire...

swh::deploy::environment: staging

I did not see output only mentioning production everywhere...

https://forge.softwareheritage.org/D2576#inline-17094

Well the nice thing is that i saw duplication (loader package, indexer) i can trim so good!