Skip to content

Expose thanos gateway service to read archive staging metrics

Antoine R. Dumont requested to merge generated-differential-D8385-source into generated-differential-D8385-target

Related to T4144

Test Plan

octo-diff mentions the new gateway service for that new azure objstore:

$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff thanos
Found host thanos.internal.admin.swh.network
...
I, [2022-09-02T15:56:05.647121 #2851929]  INFO -- : Catalogs compiled for thanos.internal.admin.swh.network
I, [2022-09-02T15:56:05.929079 #2851929]  INFO -- : Diffs computed for thanos.internal.admin.swh.network
diff origin/production/thanos.internal.admin.swh.network current/thanos.internal.admin.swh.network
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/fullchain.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
      + ["Service[thanos-gateway@archive-staging]", "Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/privkey.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
      + ["Service[thanos-gateway@archive-staging]", "Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
*******************************************
+ File[/etc/systemd/system/thanos-gateway@archive-staging.service.d/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet - modifications will be overwritten\n# In de...
     "ensure": "file",
     "group": "root",
     "mode": "0444",
     "notify": [
       "Class[Systemd::Systemctl::Daemon_reload]"
     ],
     "owner": "root",
     "selinux_ignore_defaults": false,
     "show_diff": true
*******************************************
+ File[/etc/systemd/system/thanos-gateway@archive-staging.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/thanos/objstore-archive-staging.yml] =>
   parameters =>
     "content": "# File managed by puppet - modifications will be lost\ntype: AZU...
     "ensure": "present",
     "group": "prometheus",
     "mode": "0640",
     "owner": "root"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-gateway-thanos.internal.admin.swh.network:19095] =>
   parameters =>
     "job": "thanos_gateway",
     "labels": {
       "dataset_name": "archive-staging"
     },
     "target": "thanos.internal.admin.swh.network:19095"
*******************************************
+ Profile::Thanos::Export_query_endpoint[thanos-gateway-thanos.internal.admin.swh.network:] =>
   parameters =>
     "grpc_address": "thanos.internal.admin.swh.network:"
*******************************************
+ Service[thanos-gateway@archive-staging] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": "thanos-gateway"
*******************************************
+ Systemd::Dropin_file[thanos-gateway@archive-staging/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet - modifications will be overwritten\n# In de...
     "daemon_reload": "lazy",
     "ensure": "present",
     "filename": "parameters.conf",
     "group": "root",
     "mode": "0444",
     "notify": "Service[thanos-gateway@archive-staging]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-gateway@archive-staging.service"
*******************************************
  Systemd::Unit_file[thanos-gateway@.service] =>
   parameters =>
     notify =>
      - ["Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
      + ["Service[thanos-gateway@archive-staging]", "Service[thanos-gateway@historical]", "Service[thanos-gateway@mmca]"]
*******************************************
*** End octocatalog-diff on thanos.internal.admin.swh.network

Note: It does not mention the thanos-query service configuration update to add that new entry as it's collected resource though.

Migrated from D8385 (view on Phabricator)

Merge request reports