Showing with 140 additions and 140 deletions.
  1. +3 −0 .github/SECURITY.md
  2. +1 −1 .msync.yml
  3. +3 −0 .rubocop.yml
  4. +3 −2 .travis.yml
  5. +17 −0 CHANGELOG.md
  6. +3 −3 Gemfile
  7. +19 −19 data/defaults.yaml
  8. +10 −12 manifests/alertmanager.pp
  9. +2 −2 manifests/alerts.pp
  10. +0 −1 manifests/apache_exporter.pp
  11. +0 −1 manifests/beanstalkd_exporter.pp
  12. +0 −1 manifests/bird_exporter.pp
  13. +1 −3 manifests/blackbox_exporter.pp
  14. +0 −1 manifests/collectd_exporter.pp
  15. +10 −12 manifests/config.pp
  16. +0 −1 manifests/consul_exporter.pp
  17. +9 −11 manifests/daemon.pp
  18. +2 −3 manifests/dellhw_exporter.pp
  19. +0 −1 manifests/elasticsearch_exporter.pp
  20. +0 −1 manifests/graphite_exporter.pp
  21. +1 −2 manifests/grok_exporter.pp
  22. +0 −2 manifests/haproxy_exporter.pp
  23. +1 −2 manifests/init.pp
  24. +8 −9 manifests/install.pp
  25. +0 −1 manifests/memcached_exporter.pp
  26. +0 −1 manifests/mesos_exporter.pp
  27. +0 −1 manifests/mongodb_exporter.pp
  28. +0 −1 manifests/mysqld_exporter.pp
  29. +1 −3 manifests/nginx_vts_exporter.pp
  30. +2 −4 manifests/node_exporter.pp
  31. +0 −1 manifests/postgres_exporter.pp
  32. +1 −2 manifests/process_exporter.pp
  33. +0 −1 manifests/puppetdb_exporter.pp
  34. +0 −1 manifests/pushgateway.pp
  35. +0 −1 manifests/pushprox_client.pp
  36. +0 −1 manifests/pushprox_proxy.pp
  37. +0 −1 manifests/rabbitmq_exporter.pp
  38. +0 −1 manifests/redis_exporter.pp
  39. +0 −1 manifests/run_service.pp
  40. +4 −4 manifests/scrape_job.pp
  41. +3 −4 manifests/server.pp
  42. +2 −3 manifests/service_reload.pp
  43. +1 −2 manifests/snmp_exporter.pp
  44. +1 −2 manifests/statsd_exporter.pp
  45. +1 −2 manifests/varnish_exporter.pp
  46. +1 −1 metadata.json
  47. +1 −1 spec/acceptance/apache_exporter_spec.rb
  48. +19 −0 spec/acceptance/dellhw_exporter_spec.rb
  49. +2 −2 spec/acceptance/prometheus_server_spec.rb
  50. +2 −2 spec/acceptance/redis_exporter_spec.rb
  51. +1 −1 spec/classes/collectd_exporter_spec.rb
  52. +1 −1 spec/classes/graphite_exporter_spec.rb
  53. +3 −3 spec/classes/node_exporter_spec.rb
  54. +1 −1 spec/classes/snmp_exporter_spec.rb
3 changes: 3 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Vox Pupuli Security Policy

Our vulnerabilities reporting process is at https://voxpupuli.org/security/
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '2.12.0'
modulesync_config_version: '3.0.0'
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
RSpec/NestedGroups:
Enabled: False

RSpec/MultipleExpectations:
Enabled: false

# this is broken on ruby1.9
Layout/IndentHeredoc:
Enabled: False
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
os: linux
dist: bionic
language: ruby
cache: bundler
Expand All @@ -7,7 +8,7 @@ before_install:
- bundle --version
script:
- 'bundle exec rake $CHECK'
matrix:
jobs:
fast_finish: true
include:
- rvm: 2.4.4
Expand Down Expand Up @@ -92,7 +93,7 @@ notifications:
- "chat.freenode.org#voxpupuli-notifications"
deploy:
provider: puppetforge
user: puppet
username: puppet
password:
secure: "M9rOa2lFaOagSRKNWb6BtS90yj8+8jk0tjeNGxxk73RoSfldKbxczZYY/U+nxGbLAvsDDHqQhMXXhRXxHKngl+Lg+dD6O0qT51ArGBtjSiMnVY00dC/+0nF932oS2skPbgzMGszK+u4o2Efjd6h18q9dT0WTGka2aOv9eJ18pwyESB7vyWbEDgxQ6Bk4J02EeFGhp/is1MlcK5rXpEYUGSPwJJCgEkbWuJek4ZDyT+qG5TTEUJMovNu4Oxy6HVGCDrM65hjK79oT9BVKM5xkgJoxN1trdqpmIEu8KOZck/+Iokcz+mHJfx62dJ2fg6bcOhQFSbW2UdPAYW4f1YaViHuwWWXgT58hPtB1PdEKPI/6HnAKBSLA2Fr3fA26BKbT/0CcRbSLMTjmbd9csEb5VE0eoCoTtVItVEsRkqm0BNvQ8oLRmQgFht2hGwwoczwBAj9aF80MjuDUzG2WjM/WjNIWfIFmeNoWTy/u+/58Q9wj6vIX2EyTJDEOorlP+4RXK+xub3QXntfmqkIlyB5qE6QxMDTAZN8aqBjo/771Ky7pIKAthWLVdDHPKhPHD2bMzilSqoFzNFtCkIbYp8w/eJUCfXhPpFEpt/9QzPLtP4/3KrJ/KUMt3hWfEGWOhUXlbalF5cFCP5aWkDDnoKxWILGS94xkXV2qyEGEMY2tn5o="
on:
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v10.0.0](https://github.com/voxpupuli/puppet-prometheus/tree/v10.0.0) (2020-08-15)

[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v9.1.0...v10.0.0)

**Breaking changes:**

- update version numbers to latest releases [\#479](https://github.com/voxpupuli/puppet-prometheus/pull/479) ([antondollmaier](https://github.com/antondollmaier))

**Implemented enhancements:**

- Fixes for prometheus::dellhw\_exporter not working as is [\#480](https://github.com/voxpupuli/puppet-prometheus/pull/480) ([lconsuegra](https://github.com/lconsuegra))

**Merged pull requests:**

- Prometheus: Update 2.20.0-\>2.20.1 [\#481](https://github.com/voxpupuli/puppet-prometheus/pull/481) ([bastelfreak](https://github.com/bastelfreak))
- modulesync 3.0.0 & puppet-lint updates [\#478](https://github.com/voxpupuli/puppet-prometheus/pull/478) ([bastelfreak](https://github.com/bastelfreak))

## [v9.1.0](https://github.com/voxpupuli/puppet-prometheus/tree/v9.1.0) (2020-07-21)

[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v9.0.0...v9.1.0)
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ def location_for(place, fake_version = nil)
end

group :test do
gem 'voxpupuli-test', '>= 1.0.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'voxpupuli-test', '~> 2.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
end

group :development do
Expand Down
38 changes: 19 additions & 19 deletions data/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ prometheus::usershell: '/usr/bin/nologin'
prometheus::extra_options: ~
prometheus::download_url: ~
prometheus::bin_dir: '/usr/local/bin'
prometheus::version: '2.14.0'
prometheus::version: '2.20.1'
prometheus::install_method: 'url'
prometheus::manage_prometheus_server: false
prometheus::extract_command: ~
Expand Down Expand Up @@ -63,7 +63,7 @@ prometheus::alertmanager::route:
prometheus::alertmanager::storage_path: '/var/lib/alertmanager'
prometheus::alertmanager::templates: [ "%{lookup('prometheus::alertmanager::config_dir')}/*.tmpl" ]
prometheus::alertmanager::user: 'alertmanager'
prometheus::alertmanager::version: '0.18.0'
prometheus::alertmanager::version: '0.21.0'
prometheus::alerts: {}
prometheus::config_dir: '/etc/prometheus'
prometheus::config_mode: '0640'
Expand All @@ -80,7 +80,7 @@ prometheus::consul_exporter::package_ensure: 'latest'
prometheus::consul_exporter::package_name: 'consul_exporter'
prometheus::consul_exporter::service_name: 'consul_exporter'
prometheus::consul_exporter::user: 'consul-exporter'
prometheus::consul_exporter::version: '0.5.0'
prometheus::consul_exporter::version: '0.7.1'
prometheus::consul_exporter::web_listen_address: ':9107'
prometheus::consul_exporter::web_telemetry_path: '/metrics'
prometheus::download_extension: 'tar.gz'
Expand All @@ -95,7 +95,7 @@ prometheus::elasticsearch_exporter::package_ensure: 'latest'
prometheus::elasticsearch_exporter::package_name: 'elasticsearch_exporter'
prometheus::elasticsearch_exporter::service_name: 'elasticsearch_exporter'
prometheus::elasticsearch_exporter::user: 'elasticsearch-exporter'
prometheus::elasticsearch_exporter::version: '1.1.0rc1'
prometheus::elasticsearch_exporter::version: '1.1.0'
prometheus::elasticsearch_exporter::use_kingpin: true
prometheus::extra_groups: []
prometheus::global_config:
Expand Down Expand Up @@ -126,7 +126,7 @@ prometheus::haproxy_exporter::package_ensure: 'latest'
prometheus::haproxy_exporter::package_name: 'haproxy_exporter'
prometheus::haproxy_exporter::service_name: 'haproxy_exporter'
prometheus::haproxy_exporter::user: 'haproxy-user'
prometheus::haproxy_exporter::version: '0.10.0'
prometheus::haproxy_exporter::version: '0.11.0'
prometheus::nginx_vts_exporter::nginx_scrape_uri: 'http://localhost/status/format/json'
prometheus::nginx_vts_exporter::download_extension: 'tar.gz'
prometheus::nginx_vts_exporter::download_url_base: 'https://github.com/hnlq715/nginx-vts-exporter/releases'
Expand All @@ -145,7 +145,7 @@ prometheus::process_exporter::package_ensure: 'latest'
prometheus::process_exporter::package_name: 'process-exporter'
prometheus::process_exporter::service_name: 'process-exporter'
prometheus::process_exporter::user: 'process-exporter'
prometheus::process_exporter::version: '0.5.0'
prometheus::process_exporter::version: '0.6.0'
prometheus::process_exporter::config_path: '/etc/process-exporter.yaml'
prometheus::pushgateway::download_extension: 'tar.gz'
prometheus::pushgateway::download_url_base: 'https://github.com/prometheus/pushgateway/releases'
Expand All @@ -154,7 +154,7 @@ prometheus::pushgateway::group: 'pushgateway'
prometheus::pushgateway::package_ensure: 'latest'
prometheus::pushgateway::package_name: 'pushgateway'
prometheus::pushgateway::user: 'pushgateway'
prometheus::pushgateway::version: '0.8.0'
prometheus::pushgateway::version: '1.2.0'
prometheus::rabbitmq_exporter::download_extension: 'tar.gz'
prometheus::rabbitmq_exporter::download_url_base: 'https://github.com/kbudde/rabbitmq_exporter/releases'
prometheus::rabbitmq_exporter::extra_groups: []
Expand Down Expand Up @@ -183,7 +183,7 @@ prometheus::mysqld_exporter::package_ensure: 'latest'
prometheus::mysqld_exporter::package_name: 'mysqld_exporter'
prometheus::mysqld_exporter::service_name: 'mysqld_exporter'
prometheus::mysqld_exporter::user: 'mysqld-exporter'
prometheus::mysqld_exporter::version: '0.12.0'
prometheus::mysqld_exporter::version: '0.12.1'
prometheus::mongodb_exporter::cnf_uri: 'mongodb://localhost:27017'
prometheus::mongodb_exporter::download_extension: 'tar.gz'
prometheus::mongodb_exporter::download_url_base: 'https://github.com/percona/mongodb_exporter/releases'
Expand All @@ -193,7 +193,7 @@ prometheus::mongodb_exporter::package_ensure: 'latest'
prometheus::mongodb_exporter::package_name: 'mongodb_exporter'
prometheus::mongodb_exporter::service_name: 'mongodb_exporter'
prometheus::mongodb_exporter::user: 'mongodb-exporter'
prometheus::mongodb_exporter::version: '0.3.1'
prometheus::mongodb_exporter::version: '0.11.0'
prometheus::mongodb_exporter::use_kingpin: false
prometheus::node_exporter::download_extension: 'tar.gz'
prometheus::node_exporter::download_url_base: 'https://github.com/prometheus/node_exporter/releases'
Expand All @@ -202,7 +202,7 @@ prometheus::node_exporter::group: 'node-exporter'
prometheus::node_exporter::package_ensure: 'latest'
prometheus::node_exporter::package_name: 'node_exporter'
prometheus::node_exporter::user: 'node-exporter'
prometheus::node_exporter::version: '0.18.1'
prometheus::node_exporter::version: '1.0.1'
prometheus::beanstalkd_exporter::exporter_listen: ':9371'
prometheus::beanstalkd_exporter::beanstalkd_address: '127.0.0.1:11300'
prometheus::beanstalkd_exporter::download_extension: 'tar.gz'
Expand All @@ -213,7 +213,7 @@ prometheus::beanstalkd_exporter::package_ensure: 'latest'
prometheus::beanstalkd_exporter::package_name: 'beanstalkd_exporter'
prometheus::beanstalkd_exporter::service_name: 'beanstalkd_exporter'
prometheus::beanstalkd_exporter::user: 'beanstalkd-exporter'
prometheus::beanstalkd_exporter::version: '1.0.0'
prometheus::beanstalkd_exporter::version: '1.0.5'
prometheus::beanstalkd_exporter::mapping_config: '/etc/beanstalkd-exporter-mapping.conf'
prometheus::beanstalkd_exporter::config: '/etc/beanstalkd-exporter.conf'
prometheus::package_ensure: 'latest'
Expand Down Expand Up @@ -241,7 +241,7 @@ prometheus::snmp_exporter::package_ensure: 'latest'
prometheus::snmp_exporter::package_name: 'snmp_exporter'
prometheus::snmp_exporter::service_name: 'snmp_exporter'
prometheus::snmp_exporter::user: 'snmp-exporter'
prometheus::snmp_exporter::version: '0.15.0'
prometheus::snmp_exporter::version: '0.18.0'
prometheus::statsd_exporter::download_extension: 'tar.gz'
prometheus::statsd_exporter::download_url_base: 'https://github.com/prometheus/statsd_exporter/releases'
prometheus::statsd_exporter::extra_groups: []
Expand All @@ -252,7 +252,7 @@ prometheus::statsd_exporter::package_ensure: 'latest'
prometheus::statsd_exporter::package_name: 'statsd_exporter'
prometheus::statsd_exporter::service_name: 'statsd_exporter'
prometheus::statsd_exporter::user: 'statsd-exporter'
prometheus::statsd_exporter::version: '0.12.1'
prometheus::statsd_exporter::version: '0.17.0'
prometheus::storage_retention: '360h' # 15d; "d" suffix is only supported with prom >= 2.*
prometheus::blackbox_exporter::user: 'blackbox-exporter'
prometheus::blackbox_exporter::group: 'blackbox-exporter'
Expand All @@ -263,7 +263,7 @@ prometheus::blackbox_exporter::package_ensure: 'latest'
prometheus::blackbox_exporter::package_name: 'blackbox_exporter'
prometheus::blackbox_exporter::modules: {}
prometheus::blackbox_exporter::config_file: '/etc/blackbox-exporter.yaml'
prometheus::blackbox_exporter::version: '0.14.0'
prometheus::blackbox_exporter::version: '0.17.0'
prometheus::postgres_exporter::data_source_uri: 'host=/var/run/postgresql/ sslmode=disable'
prometheus::postgres_exporter::download_extension: 'tar.gz'
prometheus::postgres_exporter::download_url_base: 'https://github.com/wrouesnel/postgres_exporter/releases'
Expand All @@ -283,7 +283,7 @@ prometheus::redis_exporter::group: 'redis-exporter'
prometheus::redis_exporter::package_ensure: 'latest'
prometheus::redis_exporter::package_name: 'redis_exporter'
prometheus::redis_exporter::user: 'redis-exporter'
prometheus::redis_exporter::version: '1.6.1'
prometheus::redis_exporter::version: '1.9.0'
prometheus::user: 'prometheus'
prometheus::varnish_exporter::download_extension: 'tar.gz'
prometheus::varnish_exporter::download_url_base: 'https://github.com/jonnenauha/prometheus_varnish_exporter/releases'
Expand All @@ -308,7 +308,7 @@ prometheus::graphite_exporter::service_ensure: 'running'
prometheus::graphite_exporter::manage_group: true
prometheus::graphite_exporter::manage_service: true
prometheus::graphite_exporter::manage_user: true
prometheus::graphite_exporter::version: '0.7.1'
prometheus::graphite_exporter::version: '0.9.0'
prometheus::graphite_exporter::options: ''
prometheus::collectd_exporter::download_extension: 'tar.gz'
prometheus::collectd_exporter::download_url_base: 'https://github.com/prometheus/collectd_exporter/releases'
Expand All @@ -317,7 +317,7 @@ prometheus::collectd_exporter::package_ensure: 'latest'
prometheus::collectd_exporter::package_name: 'collectd_exporter'
prometheus::collectd_exporter::service_name: 'collectd_exporter'
prometheus::collectd_exporter::user: 'collectd-exporter'
prometheus::collectd_exporter::version: '0.4.0'
prometheus::collectd_exporter::version: '0.5.0'
prometheus::collectd_exporter::options: ''
prometheus::apache_exporter::scrape_uri: 'http://localhost/server-status?auto'
prometheus::apache_exporter::download_extension: 'tar.gz'
Expand All @@ -327,7 +327,7 @@ prometheus::apache_exporter::group: 'apache-exporter'
prometheus::apache_exporter::package_ensure: 'latest'
prometheus::apache_exporter::package_name: 'apache_exporter'
prometheus::apache_exporter::user: 'apache-exporter'
prometheus::apache_exporter::version: '0.7.0'
prometheus::apache_exporter::version: '0.8.0'
prometheus::grok_exporter::config_file: '/etc/grok-exporter.yaml'
prometheus::grok_exporter::download_extension: 'zip'
prometheus::grok_exporter::download_url_base: 'https://github.com/fstab/grok_exporter/releases'
Expand All @@ -336,4 +336,4 @@ prometheus::grok_exporter::group: 'grok-exporter'
prometheus::grok_exporter::package_ensure: 'latest'
prometheus::grok_exporter::package_name: 'grok_exporter'
prometheus::grok_exporter::user: 'grok-exporter'
prometheus::grok_exporter::version: '1.0.0.RC3'
prometheus::grok_exporter::version: '1.0.0.RC4'
22 changes: 10 additions & 12 deletions manifests/alertmanager.pp
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,12 @@
String[1] $arch = $prometheus::real_arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
) inherits prometheus {

if( versioncmp($version, '0.3.0') == -1 ){
if( versioncmp($version, '0.3.0') == -1 ) {
$real_download_url = pick($download_url,
"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
} else {
$real_download_url = pick($download_url,
"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
}
$notify_service = $restart_on_change ? {
true => Service[$service_name],
Expand All @@ -148,7 +147,7 @@

exec { 'alertmanager-reload':
command => $alertmanager_reload,
path => [ '/usr/bin', '/bin', '/usr/sbin', '/sbin' ],
path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'],
refreshonly => true,
}

Expand All @@ -168,14 +167,14 @@

if (( versioncmp($version, '0.10.0') >= 0 ) and ( $install_method == 'url' )) {
# If version >= 0.10.0 then install amtool - Alertmanager validation tool
file {"${bin_dir}/amtool":
file { "${bin_dir}/amtool":
ensure => link,
target => "/opt/${package_name}-${version}.${os}-${arch}/amtool",
}

if $manage_config {
file { $config_file:
ensure => present,
ensure => file,
owner => 'root',
group => $group,
mode => $config_mode,
Expand All @@ -186,10 +185,9 @@
}
}
} else {

if $manage_config {
file { $config_file:
ensure => present,
ensure => file,
owner => 'root',
group => $group,
mode => $config_mode,
Expand All @@ -211,17 +209,17 @@
file { $storage_path:
ensure => 'directory',
owner => $user,
group => $group,
group => $group,
mode => '0755',
}

if( versioncmp($version, '0.12.0') == 1 ){
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}"
}
} else {
if( versioncmp($prometheus::alertmanager::version, '0.12.0') == 1 ){
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}"
Expand Down
4 changes: 2 additions & 2 deletions manifests/alerts.pp
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
String[1] $group = $prometheus::group,
String[1] $bin_dir = $prometheus::bin_dir,
) {
if ( versioncmp($version, '2.0.0') < 0 ){
if ( versioncmp($version, '2.0.0') < 0 ) {
file { "${location}/${name}.rules":
ensure => 'file',
owner => 'root',
group => $group,
notify => Class['prometheus::service_reload'],
content => epp("${module_name}/alerts.epp", {'alerts' => $alerts}),
content => epp("${module_name}/alerts.epp", { 'alerts' => $alerts }),
validate_cmd => "${bin_dir}/promtool check-rules %",
require => Class['prometheus::install'],
before => Class['prometheus::config'],
Expand Down
1 change: 0 additions & 1 deletion manifests/apache_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
String[1] $scrape_job_name = 'apache',
Optional[Hash] $scrape_job_labels = undef,
) inherits prometheus {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
$notify_service = $restart_on_change ? {
Expand Down
1 change: 0 additions & 1 deletion manifests/beanstalkd_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
String[1] $scrape_job_name = 'beanstalkd',
Optional[Hash] $scrape_job_labels = undef,
) inherits prometheus {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")

Expand Down
1 change: 0 additions & 1 deletion manifests/bird_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
Optional[Hash] $scrape_job_labels = undef,
Optional[String[1]] $bin_name = undef,
) inherits prometheus {

$real_download_url = pick($download_url,"${download_url_base}/download/${version}/${package_name}-${version}_${os}_${arch}")

$notify_service = $restart_on_change ? {
Expand Down
4 changes: 1 addition & 3 deletions manifests/blackbox_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
String[1] $scrape_job_name = 'blackbox',
Optional[Hash] $scrape_job_labels = undef,
) inherits prometheus {

# Prometheus added a 'v' on the release name at 0.1.0 of blackbox
if versioncmp ($version, '0.1.0') >= 0 {
$release = "v${version}"
Expand All @@ -108,15 +107,14 @@
$options = "--config.file=${config_file} ${extra_options}"

file { $config_file:
ensure => present,
ensure => file,
owner => 'root',
group => $group,
mode => $config_mode,
content => template('prometheus/blackbox_exporter.yaml.erb'),
notify => $notify_service,
}


prometheus::daemon { $service_name:
install_method => $install_method,
version => $version,
Expand Down
1 change: 0 additions & 1 deletion manifests/collectd_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
Boolean $manage_user = true,
Boolean $manage_group = true,
) inherits prometheus {

$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")

$notify_service = $restart_on_change ? {
Expand Down
Loading