From c90465af8496bb42e3ca4ddba7993485ed13fa79 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Tue, 11 Mar 2025 17:06:39 +0100
Subject: [PATCH] Align vault end-to-end definition with the other end-to-end
checks
That one was already functional since it did not rely on the lookup. This just
aligns its definition with the other two.
Refs. swh/infra/sysadm-environment#5588
---
.../profile/manifests/icinga2/objects/static_checks.pp | 8 ++++----
.../profile/manifests/swh/deploy/vault/icinga_checks.pp | 9 ++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/site-modules/profile/manifests/icinga2/objects/static_checks.pp b/site-modules/profile/manifests/icinga2/objects/static_checks.pp
index c21a6de94..9874aca26 100644
--- a/site-modules/profile/manifests/icinga2/objects/static_checks.pp
+++ b/site-modules/profile/manifests/icinga2/objects/static_checks.pp
@@ -67,13 +67,13 @@ class profile::icinga2::objects::static_checks {
host_name => "archive-staging-rke2",
}
- ::profile::swh::deploy::vault::icinga_checks {'production':
- storage => "http://storage-postgresql-ro.internal.softwareheritage.org",
+ ::profile::swh::deploy::vault::icinga_checks {'storage-postgresql-ro.internal.softwareheritage.org':
+ environment => "production",
webapp => "https://archive.softwareheritage.org",
}
- ::profile::swh::deploy::vault::icinga_checks {'staging':
- storage => "http://storage-ro.internal.staging.swh.network",
+ ::profile::swh::deploy::vault::icinga_checks {'storage-ro.internal.staging.swh.network':
+ environment => "staging",
webapp => "https://webapp.staging.swh.network",
}
diff --git a/site-modules/profile/manifests/swh/deploy/vault/icinga_checks.pp b/site-modules/profile/manifests/swh/deploy/vault/icinga_checks.pp
index 6d870b5d4..974e97561 100644
--- a/site-modules/profile/manifests/swh/deploy/vault/icinga_checks.pp
+++ b/site-modules/profile/manifests/swh/deploy/vault/icinga_checks.pp
@@ -1,13 +1,12 @@
# Install icinga checks for one webapp instance
define profile::swh::deploy::vault::icinga_checks (
- $environment = $title,
- $storage = undef,
+ $storage = $title,
$webapp = undef,
-)
-{
+ $environment = undef,
+) {
# Install vault end-to-end checks
profile::icinga2::objects::e2e_checks_vault {"End-to-end Vault Test(s) in ${environment}":
- server_vault => $storage,
+ server_vault => "http://${storage}",
server_webapp => $webapp,
environment => $environment,
}
--
GitLab