diff --git a/README.md b/README.md index 5ece2ad1f..f0a32fe39 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ or: ```puppet class { 'prometheus::node_exporter': - version => '0.12.0', + version => '0.27.0', collectors_disable => ['loadavg', 'mdadm'], } ``` diff --git a/REFERENCE.md b/REFERENCE.md index 575d0ef4e..cdc0bdbb5 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -10958,7 +10958,7 @@ Data type: `Stdlib::Port` -Default value: `9090` +Default value: `9419` ##### `scrape_job_name` diff --git a/manifests/alertmanager.pp b/manifests/alertmanager.pp index a85512adb..578eefc1c 100644 --- a/manifests/alertmanager.pp +++ b/manifests/alertmanager.pp @@ -252,17 +252,9 @@ mode => '0755', } - if( versioncmp($version, '0.12.0') == 1 ) { - $options = "--config.file=${prometheus::alertmanager::config_file} --storage.path=${prometheus::alertmanager::storage_path} ${prometheus::alertmanager::extra_options}" - } else { - $options = "-config.file=${prometheus::alertmanager::config_file} -storage.path=${prometheus::alertmanager::storage_path} ${prometheus::alertmanager::extra_options}" - } + $options = "--config.file=${prometheus::alertmanager::config_file} --storage.path=${prometheus::alertmanager::storage_path} ${prometheus::alertmanager::extra_options}" } else { - if( versioncmp($prometheus::alertmanager::version, '0.12.0') == 1 ) { - $options = "--config.file=${prometheus::alertmanager::config_file} ${prometheus::alertmanager::extra_options}" - } else { - $options = "-config.file=${prometheus::alertmanager::config_file} ${prometheus::alertmanager::extra_options}" - } + $options = "--config.file=${prometheus::alertmanager::config_file} ${prometheus::alertmanager::extra_options}" } prometheus::daemon { $service_name: