Merge pull request #591 from reini-1/reini_fix_postgres_exporter_down…

…load_url fix download url for new asset url schema
voxpupuli · Nov 13, 2021 · dc8af30 · dc8af30
2 parents a5b0c53 + db06fe0
commit dc8af30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/data/defaults.yaml b/data/defaults.yaml
@@ -249,7 +249,7 @@ prometheus::blackbox_exporter::config_file: '/etc/blackbox-exporter.yaml'
 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'
+prometheus::postgres_exporter::download_url_base: 'https://github.com/prometheus-community/postgres_exporter/releases'
 prometheus::postgres_exporter::extra_groups: []
 prometheus::postgres_exporter::group: 'postgres-exporter'
 prometheus::postgres_exporter::package_ensure: 'latest'

diff --git a/manifests/postgres_exporter.pp b/manifests/postgres_exporter.pp
@@ -92,7 +92,11 @@
 ) inherits prometheus {
   $release = "v${version}"
 
-  $real_download_url = pick($download_url, "${download_url_base}/download/${release}/${package_name}_${release}_${os}-${arch}.${download_extension}")
+  if versioncmp($version, '0.9.0') < 0 {
+    $real_download_url = pick($download_url, "${download_url_base}/download/${release}/${package_name}_${release}_${os}-${arch}.${download_extension}")
+  } else {
+    $real_download_url = pick($download_url, "${download_url_base}/download/${release}/${package_name}-${version}.${os}-${arch}.${download_extension}")
+  }
 
   $notify_service = $restart_on_change ? {
     true    => Service[$service_name],