diff --git a/data/location/sesi_rocquencourt.yaml b/data/location/sesi_rocquencourt.yaml index c7a2aa5b..a4862ab7 100644 --- a/data/location/sesi_rocquencourt.yaml +++ b/data/location/sesi_rocquencourt.yaml @@ -1,29 +1,30 @@ --- dns::local_nameservers: - 192.168.100.29 - 192.168.200.22 dns::forwarders: - 193.51.196.130 - 193.51.196.131 dns::forwarder_insecure: true ntp::servers: - sesi-ntp1.inria.fr - sesi-ntp2.inria.fr internal_network: 192.168.100.0/24 smtp::relay_hostname: 'smtp.inria.fr' swh::deploy::worker::instances: - checker_deposit - lister - loader_archive + - loader_cran - loader_debian - loader_deposit - loader_git - loader_mercurial - loader_npm - loader_pypi - loader_svn diff --git a/site-modules/profile/manifests/prometheus/scrape_config.pp b/site-modules/profile/manifests/prometheus/scrape_config.pp index f5540911..164327c2 100644 --- a/site-modules/profile/manifests/prometheus/scrape_config.pp +++ b/site-modules/profile/manifests/prometheus/scrape_config.pp @@ -1,29 +1,27 @@ # Scrape configuration for a prometheus exporter define profile::prometheus::scrape_config ( String $prometheus_server, String $target, String $job, Hash[String, String] $labels = {}, Enum['http', 'https'] $scheme = 'http', String $metrics_path = '/metrics', ){ $directory = $profile::prometheus::server::scrape_configs_dir file {"${directory}/${name}.yaml": ensure => 'present', owner => 'root', group => 'root', mode => '0644', content => inline_yaml( [ { - targets => [$target], - labels => { + targets => [$target], + labels => { job => $job, } + $labels, - scheme => $scheme, - metrics_path => $metrics_path, }, ] ), } }