Merge pull request voxpupuli#388 from alexjfisher/scrape_job_labels

Add `scrape_job_labels` parameter to exporters
Rovanion · Nov 18, 2019 · c8d2a30 · c8d2a30
2 parents 3cfec91 + 1efddb4
commit c8d2a30
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 11 deletions.
diff --git a/manifests/apache_exporter.pp b/manifests/apache_exporter.pp
@@ -103,6 +103,7 @@
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9117,
   String[1] $scrape_job_name              = 'apache',
+  Optional[Hash] $scrape_job_labels       = undef,
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -139,5 +140,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/beanstalkd_exporter.pp b/manifests/beanstalkd_exporter.pp
@@ -111,6 +111,7 @@
   Boolean $export_scrape_job          = false,
   Stdlib::Port $scrape_port           = 8080,
   String[1] $scrape_job_name          = 'beanstalkd',
+  Optional[Hash] $scrape_job_labels   = undef,
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -159,5 +160,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp
@@ -119,7 +119,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9115,
   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
@@ -171,5 +171,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/collectd_exporter.pp b/manifests/collectd_exporter.pp
@@ -91,6 +91,7 @@
   Boolean $export_scrape_job        = false,
   Stdlib::Port $scrape_port         = 9103,
   String[1] $scrape_job_name        = 'collectd',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -124,5 +125,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/consul_exporter.pp b/manifests/consul_exporter.pp
@@ -115,6 +115,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9107,
   String[1] $scrape_job_name     = 'consul',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   # Prometheus added a 'v' on the realease name at 0.3.0
@@ -170,5 +171,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
@@ -89,6 +89,7 @@
   Stdlib::Host $scrape_host            = $facts['fqdn'],
   Optional[Stdlib::Port] $scrape_port  = undef,
   String[1] $scrape_job_name           = $name,
+  Hash $scrape_job_labels              = { 'alias' => $scrape_host },
   Stdlib::Absolutepath $usershell      = $prometheus::usershell,
 ) {
 
@@ -121,14 +122,14 @@
         }
       }
       file { "/opt/${name}-${version}.${os}-${arch}/${name}":
-          owner => 'root',
-          group => 0, # 0 instead of root because OS X uses "wheel".
-          mode  => '0555',
+        owner => 'root',
+        group => 0, # 0 instead of root because OS X uses "wheel".
+        mode  => '0555',
       }
       -> file { "${bin_dir}/${name}":
-          ensure => link,
-          notify => $notify_service,
-          target => "/opt/${name}-${version}.${os}-${arch}/${name}",
+        ensure => link,
+        notify => $notify_service,
+        target => "/opt/${name}-${version}.${os}-${arch}/${name}",
       }
     }
     'package': {
@@ -269,7 +270,7 @@
     @@prometheus::scrape_job { "${scrape_host}:${scrape_port}":
       job_name => $scrape_job_name,
       targets  => ["${scrape_host}:${scrape_port}"],
-      labels   => { 'alias' => $scrape_host },
+      labels   => $scrape_job_labels,
     }
   }
 }
diff --git a/manifests/elasticsearch_exporter.pp b/manifests/elasticsearch_exporter.pp
@@ -112,6 +112,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9114,
   String[1] $scrape_job_name     = 'elasticsearch',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -154,5 +155,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/graphite_exporter.pp b/manifests/graphite_exporter.pp
@@ -91,6 +91,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9108,
   String[1] $scrape_job_name     = 'graphite',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -124,5 +125,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/haproxy_exporter.pp b/manifests/haproxy_exporter.pp
@@ -99,6 +99,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9101,
   String[1] $scrape_job_name     = 'haproxy',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -134,6 +135,7 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 
 }
diff --git a/manifests/mesos_exporter.pp b/manifests/mesos_exporter.pp
@@ -103,6 +103,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9105,
   String[1] $scrape_job_name     = 'mesos',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url    = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -138,5 +139,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/mongodb_exporter.pp b/manifests/mongodb_exporter.pp
@@ -105,6 +105,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9216,
   String[1] $scrape_job_name     = 'mongodb',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -147,5 +148,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/mysqld_exporter.pp b/manifests/mysqld_exporter.pp
@@ -120,6 +120,7 @@
   Boolean $export_scrape_job                 = false,
   Stdlib::Port $scrape_port                  = 9104,
   String[1] $scrape_job_name                 = 'mysql',
+  Optional[Hash] $scrape_job_labels          = undef,
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -179,5 +180,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/nginx_vts_exporter.pp b/manifests/nginx_vts_exporter.pp
@@ -99,6 +99,7 @@
   Boolean $export_scrape_job          = false,
   Stdlib::Port $scrape_port           = 9913,
   String[1] $scrape_job_name          = 'nginx_vts',
+  Optional[Hash] $scrape_job_labels   = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -134,6 +135,7 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 
 }
diff --git a/manifests/node_exporter.pp b/manifests/node_exporter.pp
@@ -6,7 +6,6 @@
 #  [*arch*]
 #  Architecture (amd64 or i386)
 #
-
 #  [*bin_dir*]
 #  Directory where binaries are located
 #
@@ -115,6 +114,7 @@
   Boolean $export_scrape_job          = false,
   Stdlib::Port $scrape_port           = 9100,
   String[1] $scrape_job_name          = 'node',
+  Optional[Hash] $scrape_job_labels   = undef,
   Optional[String[1]] $bin_name       = undef,
 ) inherits prometheus {
 
@@ -173,6 +173,7 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
     bin_name           => $bin_name,
   }
 }
diff --git a/manifests/postgres_exporter.pp b/manifests/postgres_exporter.pp
@@ -126,6 +126,7 @@
   Boolean $export_scrape_job                    = false,
   Stdlib::Port $scrape_port                     = 9187,
   String[1] $scrape_job_name                    = 'postgres',
+  Optional[Hash] $scrape_job_labels             = undef,
 ) inherits prometheus {
 
   $release = "v${version}"
@@ -219,5 +220,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/process_exporter.pp b/manifests/process_exporter.pp
@@ -98,6 +98,7 @@
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9256,
   String[1] $scrape_job_name              = 'process',
+  Optional[Hash] $scrape_job_labels       = undef,
 ) inherits prometheus {
 
   $filename = "${package_name}-${version}.${os}-${arch}.${download_extension}"
@@ -143,5 +144,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/rabbitmq_exporter.pp b/manifests/rabbitmq_exporter.pp
@@ -131,6 +131,7 @@
   Boolean $export_scrape_job          = false,
   Stdlib::Port $scrape_port           = 9090,
   String[1] $scrape_job_name          = 'rabbitmq',
+  Optional[Hash] $scrape_job_labels   = undef,
 ) inherits prometheus {
 
   $real_download_url    = pick($download_url, "${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -177,5 +178,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/redis_exporter.pp b/manifests/redis_exporter.pp
@@ -6,7 +6,6 @@
 #  [*arch*]
 #  Architecture (amd64 or i386)
 #
-
 #  [*bin_dir*]
 #  Directory where binaries are located
 #
@@ -110,6 +109,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9121,
   String[1] $scrape_job_name     = 'redis',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $release = "v${version}"
@@ -185,5 +185,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/snmp_exporter.pp b/manifests/snmp_exporter.pp
@@ -107,6 +107,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9116,
   String[1] $scrape_job_name     = 'snmp',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -169,5 +170,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/statsd_exporter.pp b/manifests/statsd_exporter.pp
@@ -109,6 +109,7 @@
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9102,
   String[1] $scrape_job_name              = 'statsd',
+  Optional[Hash] $scrape_job_labels       = undef,
 ) inherits prometheus {
 
   # Prometheus added a 'v' on the realease name at 0.4.0 and changed the configuration format to yaml in 0.5.0
@@ -165,5 +166,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }
diff --git a/manifests/varnish_exporter.pp b/manifests/varnish_exporter.pp
@@ -97,6 +97,7 @@
   Boolean $export_scrape_job     = false,
   Stdlib::Port $scrape_port      = 9131,
   String[1] $scrape_job_name     = 'varnish',
+  Optional[Hash] $scrape_job_labels = undef,
 ) inherits prometheus {
 
   $real_download_url = pick($download_url,"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
@@ -131,5 +132,6 @@
     export_scrape_job  => $export_scrape_job,
     scrape_port        => $scrape_port,
     scrape_job_name    => $scrape_job_name,
+    scrape_job_labels  => $scrape_job_labels,
   }
 }