add puppet resource exporting for all exporters

voxpupuli · Apr 8, 2019 · 1c9220b · 1c9220b
1 parent b71f222
commit 1c9220b
Show file tree

Hide file tree

Showing 20 changed files with 35 additions and 6 deletions.
diff --git a/manifests/apache_exporter.pp b/manifests/apache_exporter.pp
@@ -100,7 +100,6 @@
   String[1] $config_mode                                             = $prometheus::config_mode,
   String[1] $arch                                                    = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir                                      = $prometheus::bin_dir,
-  String[1] $scrape_job_name                                         = 'apache',
 ) inherits prometheus {
 
   #Please provide the download_url for versions < 0.9.0
@@ -136,6 +135,5 @@
     manage_service     => $manage_service,
     export_scrape_job  => true,
     scrape_port        => 9117,
-    scrape_job_name    => $scrape_job_name,
   }
 }
diff --git a/manifests/beanstalkd_exporter.pp b/manifests/beanstalkd_exporter.pp
@@ -153,5 +153,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 8080,
   }
 }
diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp
@@ -164,5 +164,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9115,
   }
 }
diff --git a/manifests/collectd_exporter.pp b/manifests/collectd_exporter.pp
@@ -118,5 +118,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9103,
   }
 }
diff --git a/manifests/consul_exporter.pp b/manifests/consul_exporter.pp
@@ -164,5 +164,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9107,
   }
 }
diff --git a/manifests/elasticsearch_exporter.pp b/manifests/elasticsearch_exporter.pp
@@ -137,5 +137,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9114,
   }
 }
diff --git a/manifests/graphite_exporter.pp b/manifests/graphite_exporter.pp
@@ -118,5 +118,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9108,
   }
 }
diff --git a/manifests/haproxy_exporter.pp b/manifests/haproxy_exporter.pp
@@ -128,6 +128,8 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9101,
   }
 
 }
diff --git a/manifests/mesos_exporter.pp b/manifests/mesos_exporter.pp
@@ -132,5 +132,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9105,
   }
 }
diff --git a/manifests/mongodb_exporter.pp b/manifests/mongodb_exporter.pp
@@ -130,5 +130,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9216,
   }
 }
diff --git a/manifests/mysqld_exporter.pp b/manifests/mysqld_exporter.pp
@@ -165,5 +165,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9104,
   }
 }
diff --git a/manifests/nginx_vts_exporter.pp b/manifests/nginx_vts_exporter.pp
@@ -128,6 +128,8 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9913,
   }
 
 }
diff --git a/manifests/node_exporter.pp b/manifests/node_exporter.pp
@@ -112,7 +112,6 @@
   Optional[Array[String]] $collectors = undef,
   Array[String] $collectors_enable    = [],
   Array[String] $collectors_disable   = [],
-  String $scrape_job_name             = 'node',
 ) inherits prometheus {
 
   # Prometheus added a 'v' on the realease name at 0.13.0
@@ -169,6 +168,5 @@
     manage_service     => $manage_service,
     export_scrape_job  => true,
     scrape_port        => 9100,
-    scrape_job_name    => $scrape_job_name,
   }
 }
diff --git a/manifests/postgres_exporter.pp b/manifests/postgres_exporter.pp
@@ -213,5 +213,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9187,
   }
 }
diff --git a/manifests/process_exporter.pp b/manifests/process_exporter.pp
@@ -137,6 +137,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9256,
   }
-
 }
diff --git a/manifests/rabbitmq_exporter.pp b/manifests/rabbitmq_exporter.pp
@@ -171,5 +171,7 @@
     service_enable     => $service_enable,
     manage_service     => $manage_service,
     env_vars           => $real_env_vars,
+    export_scrape_job  => true,
+    scrape_port        => 9090,
   }
 }
diff --git a/manifests/redis_exporter.pp b/manifests/redis_exporter.pp
@@ -174,5 +174,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9121,
   }
 }
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -43,7 +43,7 @@
   Boolean $purge_config_dir                                                     = $prometheus::purge_config_dir,
   Boolean $manage_user                                                          = $prometheus::manage_user,
   Optional[Variant[Stdlib::HTTPurl, Stdlib::Unixpath, String[1]]] $external_url = $prometheus::external_url,
-  Array[Hash[String[1], Any]] $collect_scrape_jobs                              = [],
+  Array[Hash[String[1], Any]] $collect_scrape_jobs                              = $prometheus::collect_scrape_jobs,
 ) inherits prometheus {
 
   if( versioncmp($version, '1.0.0') == -1 ){

diff --git a/manifests/snmp_exporter.pp b/manifests/snmp_exporter.pp
@@ -163,5 +163,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9116,
   }
 }
diff --git a/manifests/varnish_exporter.pp b/manifests/varnish_exporter.pp
@@ -125,5 +125,7 @@
     service_ensure     => $service_ensure,
     service_enable     => $service_enable,
     manage_service     => $manage_service,
+    export_scrape_job  => true,
+    scrape_port        => 9131,
   }
 }