Skip to content

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

Antoine R. Dumont requested to merge generated-differential-D2576-source into generated-differential-D2576-target
  • 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

Migrated from D2576 (view on Phabricator)

Merge request reports