From 1c451158f222fdd003324808488648580477c5d8 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Thu, 14 Oct 2021 15:46:33 +0200
Subject: [PATCH] nagios check definition changes due to ubuntu 18 upgrade

---
 .../overlay/etc/puppet/manifests/cosmos-site.pp  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 8065467f..c5783d77 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1158,9 +1158,12 @@ class nagios_monitor {
       contact_groups => ['alerts']
   }
   nagioscfg::command {'check_ssl_cert_3':
-      command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTADDRESS\$' -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
+      command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTNAME\$' -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
   }
-  $public_hosts = ['prid.sveidas.se', 'demw.eidas.swedenconnect.se','swedenconnect.se','qa.test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se','test.connector.eidas.swedenconnect.se']
+  nagioscfg::command {'check_ssl_cert_3_without_ocsp':
+    command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTNAME\$' --ignore-ocsp -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
+  }
+  $public_hosts = ['demw.eidas.swedenconnect.se','swedenconnect.se','qa.test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se','test.connector.eidas.swedenconnect.se']
   nagioscfg::host {$public_hosts: }
   nagioscfg::service {'check_public_ssl_cert':
       host_name      => $public_hosts,
@@ -1169,19 +1172,20 @@ class nagios_monitor {
       contact_groups => ['alerts']
   }
   nagioscfg::command {'check_ssl_cert_altname':
-      command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -n '\$ARG4\$' --altnames -H '\$HOSTADDRESS\$' -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
+      command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -n '\$ARG4\$' --altnames -H '\$HOSTNAME\$' --ignore-ocsp -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
   }
+  nagioscfg::host {'prid.sveidas.se': }
   nagioscfg::service {'check_public_ssl_cert_altname':
       host_name      => ['prid.sveidas.se'],
       check_command  => 'check_ssl_cert_altname!30!14!443!prid.sveidas.se',
       description    => 'check https certificate validity on port 443 with SAN',
       contact_groups => ['alerts']
   }
-  $infra_hosts = ['prid-1.qa.sveidas.se','prid-1.sveidas.se,','prid-2.sveidas.se']
+  $infra_hosts = ['prid-1.qa.sveidas.se','prid-1.sveidas.se,','prid-2.sveidas.se','prid.sveidas.se']
   nagioscfg::service {'check_infra_ssl_cert':
       host_name      => $infra_hosts,
-      check_command  => 'check_ssl_cert_3!30!14!443',
-      description    => 'check https certificate validity on port 443',
+      check_command  => 'check_ssl_cert_3_without_ocsp!30!14!443',
+      description    => 'check https infra certificate validity on port 443',
       contact_groups => ['alerts']
   }
   nagioscfg::command {'check_website':