fix: domains is now just fqdn and fqdn:port

* add the https directly in the label config in prom
* removed the static https setting in the respective class
* reverted the certname for host one, since it will create problem in multiple places
  like the alert needs to depends on the certname, which will have the client certname (exported one)

```
probe_ssl_earliest_cert_expiry - time() < on (certname, domain) 86400 * threshold::monitor::domains::cert_expiry_days and on (certname) obmondo_monitoring{alert_id="monitor::domains::cert_expiry"} > 0
```

Author: ashish1099

modules/enableit/common/data/common.yaml

@@ -367,6 +367,7 @@ common::monitor::prometheus::server::collect_scrape_jobs:
         target_label: domain
       - source_labels: [__address__]
         target_label: __param_target
+        replacement: https://$1/
       - source_labels: [__param_target]
         target_label: instance
       - target_label: __address__

modules/enableit/common/manifests/monitor/exporter/blackbox.pp

@@ -4,7 +4,8 @@
 #
 # @param listen_port The port on which the exporter listens.
 #
-# @param noop_value Eit_types::Noop_Value to indicate if operations should be in noop mode. Defaults to $common::monitor::exporter::noop_value.
+# @param noop_value Eit_types::Noop_Value to indicate if operations should be in noop mode.
+# Defaults to $common::monitor::exporter::noop_value.
 #
 # @param config_file The absolute path to the configuration file. Defaults to "${common::monitor::exporter::config_dir}/blackbox.yml".
 #

modules/enableit/eit_types/types/monitor/domains.pp

@@ -2,5 +2,4 @@
 type Eit_types::Monitor::Domains = Variant[
   Eit_types::FQDNPort,
   Stdlib::Fqdn,
-  Stdlib::HttpUrl
 ]

modules/enableit/monitor/manifests/domains.pp

@@ -9,18 +9,17 @@
 # @groups monitoring enable, expiry_days, domain
 #
 define monitor::domains (
-  Boolean $enable      = true,
-  Integer[1,25] $expiry_days = 25,
-  Eit_types::Monitor::Domains $domain = $title,
+  Boolean                     $enable      = true,
+  Integer[1,25]               $expiry_days = 25,
+  Eit_types::Monitor::Domains $domain      = $title,
 ) {
 
   include monitor::domains::health
 
   $job_name = 'probe_blackbox_domains'
   $collect_dir = '/etc/prometheus/file_sd_config.d'
-  $_domain = regsubst($domain, '^(https?://)?([^/]+)(/.*)?$', '\2', 'G').split('/')[0]
 
-  @@prometheus::scrape_job { $_domain :
+  @@prometheus::scrape_job { $domain :
     job_name    => $job_name,
     tag         => [
       $trusted['certname'],
@@ -35,17 +34,17 @@
   $blackbox_node = if $enable { lookup('common::monitor::exporter::blackbox::node') }
   # NOTE: skip deleting the files on the actual blackbox node
   if $blackbox_node != $trusted['certname'] {
-    File <| title == "${collect_dir}/${job_name}_${_domain}.yaml" |> {
+    File <| title == "${collect_dir}/${job_name}_${domain}.yaml" |> {
       ensure => absent
     }
   }
 
-  @@monitor::threshold { "monitor::domains::expiry::${_domain}" :
+  @@monitor::threshold { "monitor::domains::expiry::${domain}" :
     enable => $enable,
     record => 'monitor::domains::cert_expiry_days',
     tag    => $trusted['certname'],
     labels => {
-      'domain' => $_domain,
+      'domain' => $domain,
     },
     expr   => $expiry_days,
   }

modules/enableit/profile/manifests/certs/manual.pp

@@ -75,7 +75,7 @@
   } else {
     $ports.each |$port| {
       monitor::domains { "${_domain}_${port}":
-        domain => "https://${_domain}:${port}",
+        domain => "${_domain}:${port}",
       }
     }
   }

modules/enableit/profile/manifests/web/apache.pp

@@ -109,20 +109,16 @@
       if ! $params['domains'].empty {
         $params['domains'].map |$domain| {
           monitor::domains { "${domain}_${params['port']}":
-            domain => "https://${domain}:${params['port']}",
+            domain => "${domain}:${params['port']}",
           }
         }
       } elsif ! $domains.empty {
         $domains.map |$domain| {
-          monitor::domains { $domain:
-            domain => "https://${domain}",
-          }
+          monitor::domains { $domain: }
         }
       } else {
         $domain = extract_common_name($params['ssl_cert'])
-        monitor::domains { $domain:
-          domain => "https://${domain}",
-        }
+        monitor::domains { $domain: }
       }
     }