Staging instance, all changes can be removed at any time

Skip to content

thanos: configure thanos query and thanos storage for the last clusters

Vincent Sellier requested to merge thanos into production

1 commit for the configuration for gitlab-production and another one for rancher And another last one added later for archive-production

Related to infra/sysadm-environment#4385

octocatalogdiff thanos 
diff origin/production/thanos.internal.admin.swh.network current/thanos.internal.admin.swh.network
*******************************************
+ Concat::Fragment[k8s-gitlab-production-thanos.euwest.azure.internal.softwareheritage.org:443] =>
   parameters =>
     "content": "  - k8s-gitlab-production-thanos.euwest.azure.internal.softwareh...
     "order": 1,
     "tag": "thanos",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
+ Concat::Fragment[k8s-rancher-thanos.euwest.azure.internal.softwareheritage.org:443] =>
   parameters =>
     "content": "  - k8s-rancher-thanos.euwest.azure.internal.softwareheritage.or...
     "order": 1,
     "tag": "thanos",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
+ Concat_fragment[k8s-gitlab-production-thanos.euwest.azure.internal.softwareheritage.org:443] =>
   parameters =>
     "content": "  - k8s-gitlab-production-thanos.euwest.azure.internal.softwareh...
     "order": 1,
     "tag": "_etc_thanos_query-sd.yaml",
     "target": "/etc/thanos/query-sd.yaml"
*******************************************
+ Concat_fragment[k8s-rancher-thanos.euwest.azure.internal.softwareheritage.org:443] =>
   parameters =>
     "content": "  - k8s-rancher-thanos.euwest.azure.internal.softwareheritage.or...
     "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@k8s-admin]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "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@k8s-admin]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
+ File[/etc/systemd/system/thanos-compact@k8s-gitlab-production.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@k8s-gitlab-production.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/thanos-compact@k8s-rancher.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@k8s-rancher.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/thanos-store@k8s-gitlab-production.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@k8s-gitlab-production.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/thanos-store@k8s-rancher.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@k8s-rancher.service.d] =>
   parameters =>
     "ensure": "directory",
     "group": "root",
     "owner": "root",
     "purge": true,
     "recurse": true,
     "selinux_ignore_defaults": false
*******************************************
+ File[/etc/thanos/objstore-k8s-gitlab-production.yml] =>
   parameters =>
     "content": "# File managed by puppet - modifications will be lost\ntype: AZU...
     "ensure": "present",
     "group": "prometheus",
     "mode": "0640",
     "notify": [
       "Service[thanos-compact@k8s-gitlab-production]",
       "Service[thanos-store@k8s-gitlab-production]"
     ],
     "owner": "root"
*******************************************
+ File[/etc/thanos/objstore-k8s-rancher.yml] =>
   parameters =>
     "content": "# File managed by puppet - modifications will be lost\ntype: AZU...
     "ensure": "present",
     "group": "prometheus",
     "mode": "0640",
     "notify": [
       "Service[thanos-compact@k8s-rancher]",
       "Service[thanos-store@k8s-rancher]"
     ],
     "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@k8s-admin]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "Service[thanos-compact@mmca]", "Service[thanos-query]", "Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-compact-thanos.internal.admin.swh.network:19299] =>
   parameters =>
     "job": "thanos_compact",
     "labels": {
       "dataset_name": "k8s-gitlab-production"
     },
     "target": "thanos.internal.admin.swh.network:19299"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-compact-thanos.internal.admin.swh.network:19300] =>
   parameters =>
     "job": "thanos_compact",
     "labels": {
       "dataset_name": "k8s-rancher"
     },
     "target": "thanos.internal.admin.swh.network:19300"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-store-thanos.internal.admin.swh.network:19199] =>
   parameters =>
     "job": "thanos_store",
     "labels": {
       "dataset_name": "k8s-gitlab-production"
     },
     "target": "thanos.internal.admin.swh.network:19199"
*******************************************
+ Profile::Prometheus::Export_scrape_config[thanos-store-thanos.internal.admin.swh.network:19200] =>
   parameters =>
     "job": "thanos_store",
     "labels": {
       "dataset_name": "k8s-rancher"
     },
     "target": "thanos.internal.admin.swh.network:19200"
*******************************************
+ Profile::Thanos::Export_query_endpoint[thanos-store-thanos.internal.admin.swh.network:19099] =>
   parameters =>
     "grpc_address": "thanos.internal.admin.swh.network:19099"
*******************************************
+ Profile::Thanos::Export_query_endpoint[thanos-store-thanos.internal.admin.swh.network:19100] =>
   parameters =>
     "grpc_address": "thanos.internal.admin.swh.network:19100"
*******************************************
+ Service[thanos-compact@k8s-gitlab-production] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-compact",
       "thanos-objstore-k8s-gitlab-production"
     ]
*******************************************
+ Service[thanos-compact@k8s-rancher] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-compact",
       "thanos-objstore-k8s-rancher"
     ]
*******************************************
+ Service[thanos-store@k8s-gitlab-production] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-objstore-k8s-gitlab-production",
       "thanos-store"
     ]
*******************************************
+ Service[thanos-store@k8s-rancher] =>
   parameters =>
     "enable": true,
     "ensure": "running",
     "tag": [
       "thanos",
       "thanos-objstore-k8s-rancher",
       "thanos-store"
     ]
*******************************************
+ Systemd::Dropin_file[thanos-compact@k8s-gitlab-production/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@k8s-gitlab-production]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-compact@k8s-gitlab-production.service"
*******************************************
+ Systemd::Dropin_file[thanos-compact@k8s-rancher/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@k8s-rancher]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-compact@k8s-rancher.service"
*******************************************
+ Systemd::Dropin_file[thanos-store@k8s-gitlab-production/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@k8s-gitlab-production]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-store@k8s-gitlab-production.service"
*******************************************
+ Systemd::Dropin_file[thanos-store@k8s-rancher/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@k8s-rancher]",
     "owner": "root",
     "path": "/etc/systemd/system",
     "selinux_ignore_defaults": false,
     "show_diff": true,
     "unit": "thanos-store@k8s-rancher.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@k8s-admin]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@mmca]"]
      + ["Service[thanos-compact@archive-production]", "Service[thanos-compact@archive-staging]", "Service[thanos-compact@historical]", "Service[thanos-compact@k8s-admin]", "Service[thanos-compact@k8s-gitlab-production]", "Service[thanos-compact@k8s-gitlab-staging]", "Service[thanos-compact@k8s-rancher]", "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@k8s-admin]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@mmca]"]
      + ["Service[thanos-store@archive-production]", "Service[thanos-store@archive-staging]", "Service[thanos-store@historical]", "Service[thanos-store@k8s-admin]", "Service[thanos-store@k8s-gitlab-production]", "Service[thanos-store@k8s-gitlab-staging]", "Service[thanos-store@k8s-rancher]", "Service[thanos-store@mmca]"]
*******************************************
*** End octocatalog-diff on thanos.internal.admin.swh.network
octocatalog-diff Pergamon 
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "h481dABjmGTKljfJpAXEIjMZMl194Rj0mepiJgdNUq8oB8fSDEz7weQdw08dUEjeL0yRClwsuY8E/AGFJRM8Iw==";
      + secret "Pj+kluZFfYeC/Su3CcXwjocycqxpX04ISKZxHdkpLSLWeyNifWN5gzNif/Zzo8To3DBka8BXmF7MJhD63YjYcA==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "vviVcYA8yOUfED4VhefYQaD6bTNQsldI/c82cWxRMBJTBovmUcWpJsFppipZz7L0SKn0ulSjU2xehZIROg6SXg==";
      + secret "aDqx7vL+J+Tb6xIx/hM+t5CuB7qi78l0V/eRGtnTPBtPblmzDiSVvUQpN9wegnllQH/4Jqcg8f58Io6JFrxt4g==";
       };
*******************************************
+ Resource_record[k8s-gitlab-production-thanos/CNAME] =>
   parameters =>
     "data": "k8s-gitlab-production.euwest.azure.internal.softwareheritage.org.",...
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-gitlab-production-thanos.euwest.azure.internal.softwareherita...
     "type": "CNAME"
*******************************************
  Resource_record[k8s-gitlab-production/A+PTR] =>
   parameters =>
     data =>
      - k8s-gitlab-production.internal.softwareheritage.org.
      + k8s-gitlab-production.euwest.azure.internal.softwareheritage.org.
*******************************************
  Resource_record[k8s-gitlab-production/A] =>
   parameters =>
     record =>
      - k8s-gitlab-production.internal.softwareheritage.org
      + k8s-gitlab-production.euwest.azure.internal.softwareheritage.org
*******************************************
+ Resource_record[k8s-rancher-app/CNAME] =>
   parameters =>
     "data": "k8s-rancher.euwest.azure.internal.softwareheritage.org.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "rancher.euwest.azure.internal.softwareheritage.org",
     "type": "CNAME"
*******************************************
+ Resource_record[k8s-rancher-thano/CNAME] =>
   parameters =>
     "data": "k8s-rancher.euwest.azure.internal.softwareheritage.org.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-rancher-thanos.euwest.azure.internal.softwareheritage.org",
     "type": "CNAME"
*******************************************
+ Resource_record[k8s-rancher/A+PTR] =>
   parameters =>
     "data": "k8s-rancher.euwest.azure.internal.softwareheritage.org.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "19.200.168.192.in-addr.arpa",
     "type": "PTR"
*******************************************
+ Resource_record[k8s-rancher/A] =>
   parameters =>
     "data": "192.168.200.19",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "k8s-rancher.euwest.azure.internal.softwareheritage.org",
     "type": "A"
*******************************************
- Resource_record[rancher.euwest.azure/A+PTR]
*******************************************
- Resource_record[rancher.euwest.azure/A]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

/cc @teams/sysadmin

Edited by Vincent Sellier

Merge request reports