Skip to content

admin: Connect the admin cluster's thanos to the main stack

Vincent Sellier requested to merge thanos_admin into production

Related to infra/sysadm-environment#4385

octocatalog-diff:

  • thanos:
diff origin/production/thanos.internal.admin.swh.network current/thanos.internal.admin.swh.network
*******************************************
+ Concat::Fragment[k8s-admin-thanos.internal.admin.swh.network:443] =>
   parameters =>
     "content": "  - k8s-admin-thanos.internal.admin.swh.network:443\n",
     "order": 1,
     "tag": "thanos",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
+ Concat_fragment[k8s-admin-thanos.internal.admin.swh.network:443] =>
   parameters =>
     "content": "  - k8s-admin-thanos.internal.admin.swh.network:443\n",
     "order": 1,
     "tag": "_etc_thanos_query-sd.yaml",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/fullchain.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@admin]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
*******************************************
  File[/etc/ssl/certs/letsencrypt/thanos/privkey.pem] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@admin]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
*******************************************
+ File[/etc/systemd/system/thanos-compact@admin.service.d/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::compact) - modificat...
     "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-compact@admin.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/thanos-store@admin.service.d/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::store) - modificatio...
     "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-store@admin.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/thanos/objstore-admin.yml] =>
   parameters =>
     "content": "# File managed by puppet - modifications will be lost\ntype: AZU...
     "ensure": "present",
     "group": "prometheus",
     "mode": "0640",
     "notify": [
       "Service[thanos-compact@admin]",
       "Service[thanos-store@admin]"
     ],
     "owner": "root"
*******************************************
  File[/opt/thanos/current] =>
   parameters =>
     notify =>
      - ["Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-compact@admin]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@admin]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-compact-thanos.internal.admin.swh.network:19297] =>
   parameters =>
     "job": "thanos_compact",
     "labels": {
       "dataset_name": "admin"
     },
     "target": "thanos.internal.admin.swh.network:19297"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-store-thanos.internal.admin.swh.network:19197] =>
   parameters =>
     "job": "thanos_store",
     "labels": {
       "dataset_name": "admin"
     },
     "target": "thanos.internal.admin.swh.network:19197"
*******************************************
+ Profile::Thanos::Export_query_endpoint[thanos-store-thanos.internal.admin.swh.network:19097] =>
   parameters =>
     "grpc_address": "thanos.internal.admin.swh.network:19097"
*******************************************
+ Service[thanos-compact@admin] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-compact",
       "thanos-objstore-admin"
     ]
*******************************************
+ Service[thanos-store@admin] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-objstore-admin",
       "thanos-store"
     ]
*******************************************
+ Systemd::Dropin_file[thanos-compact@admin/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::compact) - modificat...
     "daemon_reload": "lazy",
     "ensure": "present",
     "filename": "parameters.conf",
     "group": "root",
     "mode": "0444",
     "notify": "Service[thanos-compact@admin]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-compact@admin.service"
*******************************************
+ Systemd::Dropin_file[thanos-store@admin/parameters.conf] =>
   parameters =>
     "content": "# Managed by puppet (class profile::thanos::store) - modificatio...
     "daemon_reload": "lazy",
     "ensure": "present",
     "filename": "parameters.conf",
     "group": "root",
     "mode": "0444",
     "notify": "Service[thanos-store@admin]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-store@admin.service"
*******************************************
  Systemd::Unit_file[thanos-compact@.service] =>
   parameters =>
     notify =>
      - ["Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@mmca]"]
      + ["Service[thanos-compact@admin]", "Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@mmca]"]
*******************************************
  Systemd::Unit_file[thanos-store@.service] =>
   parameters =>
     notify =>
      - ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@admin]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@mmca]"]
*******************************************
*** End octocatalog-diff on thanos.internal.admin.swh.network
  • pergamon:
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ Resource_record[k8s-admin-thanos/CNAME] =>
   parameters =>
     "data": "k8s-admin.internal.admin.swh.network.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-admin-thanos.internal.admin.swh.network",
     "type": "CNAME"
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

/cc @teams/sysadmin

Merge request reports