Merge pull request #430 from unki/add-service-name-parameter-to-all-e…

…xporters

have a $service_name parameter for all prometheus-exporters

data/defaults.yaml

@@ -7,6 +7,7 @@ prometheus::version: '2.14.0'
 prometheus::install_method: 'url'
 prometheus::manage_prometheus_server: false
 prometheus::extract_command: ~
+prometheus::service_name: 'prometheus'
 prometheus::pushprox_client::download_extension: 'tar.gz'
 prometheus::pushprox_client::download_url_base: 'https://github.com/camptocamp/PushProx/releases'
 prometheus::pushprox_client::extra_groups: []
@@ -76,6 +77,7 @@ prometheus::consul_exporter::group: 'consul-exporter'
 prometheus::consul_exporter::log_level: 'info'
 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::web_listen_address: ':9107'
@@ -90,6 +92,7 @@ prometheus::elasticsearch_exporter::extra_groups: []
 prometheus::elasticsearch_exporter::group: 'elasticsearch-exporter'
 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::use_kingpin: true
@@ -111,6 +114,7 @@ prometheus::mesos_exporter::group: 'mesos-exporter'
 prometheus::mesos_exporter::user: 'mesos-exporter'
 prometheus::mesos_exporter::package_ensure: 'latest'
 prometheus::mesos_exporter::package_name: 'mesos_exporter'
+prometheus::mesos_exporter::service_name: 'mesos_exporter'
 prometheus::mesos_exporter::version: '1.1.2'
 prometheus::haproxy_exporter::cnf_scrape_uri: 'http://localhost:1234/haproxy?stats;csv'
 prometheus::haproxy_exporter::download_extension: 'tar.gz'
@@ -129,6 +133,7 @@ prometheus::nginx_vts_exporter::extra_groups: []
 prometheus::nginx_vts_exporter::group: 'nginx-vts-exporter'
 prometheus::nginx_vts_exporter::package_ensure: 'latest'
 prometheus::nginx_vts_exporter::package_name: 'nginx-vts-exporter'
+prometheus::nginx_vts_exporter::service_name: 'nginx-vts-exporter'
 prometheus::nginx_vts_exporter::user: 'nginx-vts-exporter'
 prometheus::nginx_vts_exporter::version: '0.10.3'
 prometheus::process_exporter::download_extension: 'tar.gz'
@@ -137,6 +142,7 @@ prometheus::process_exporter::extra_groups: []
 prometheus::process_exporter::group: 'process-exporter'
 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::config_path: '/etc/process-exporter.yaml'
@@ -154,6 +160,7 @@ prometheus::rabbitmq_exporter::extra_groups: []
 prometheus::rabbitmq_exporter::group: 'rabbitmq-exporter'
 prometheus::rabbitmq_exporter::package_ensure: 'latest'
 prometheus::rabbitmq_exporter::package_name: 'rabbitmq_exporter'
+prometheus::rabbitmq_exporter::service_name: 'rabbitmq_exporter'
 prometheus::rabbitmq_exporter::user: 'rabbitmq-exporter'
 prometheus::rabbitmq_exporter::version: '0.25.2'
 prometheus::rabbitmq_exporter::rabbit_url: 'http://localhost:15672'
@@ -173,6 +180,7 @@ prometheus::mysqld_exporter::extra_groups: []
 prometheus::mysqld_exporter::group: 'mysqld-exporter'
 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::mongodb_exporter::cnf_uri: 'mongodb://localhost:27017'
@@ -182,6 +190,7 @@ prometheus::mongodb_exporter::extra_groups: []
 prometheus::mongodb_exporter::group: 'mongodb-exporter'
 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::use_kingpin: false
@@ -201,6 +210,7 @@ prometheus::beanstalkd_exporter::extra_groups: []
 prometheus::beanstalkd_exporter::group: 'beanstalkd-exporter'
 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::mapping_config: '/etc/beanstalkd-exporter-mapping.conf'
@@ -228,6 +238,7 @@ prometheus::snmp_exporter::extra_groups: []
 prometheus::snmp_exporter::group: 'snmp-exporter'
 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::statsd_exporter::download_extension: 'tar.gz'
@@ -238,6 +249,7 @@ prometheus::statsd_exporter::mapping_config_path: '/etc/statsd-exporter-mapping.
 prometheus::statsd_exporter::mappings: []
 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::storage_retention: '360h' # 15d; "d" suffix is only supported with prom >= 2.*
@@ -278,13 +290,15 @@ prometheus::varnish_exporter::extra_groups: []
 prometheus::varnish_exporter::group: 'varnish'
 prometheus::varnish_exporter::package_ensure: 'latest'
 prometheus::varnish_exporter::package_name: 'prometheus_varnish_exporter'
+prometheus::varnish_exporter::service_name: 'prometheus_varnish_exporter'
 prometheus::varnish_exporter::user: 'varnish_exporter'
 prometheus::varnish_exporter::version: '1.5'
 prometheus::graphite_exporter::download_extension: 'tar.gz'
 prometheus::graphite_exporter::download_url_base: 'https://github.com/prometheus/graphite_exporter/releases'
 prometheus::graphite_exporter::group: 'graphite-exporter'
 prometheus::graphite_exporter::package_ensure: 'latest'
 prometheus::graphite_exporter::package_name: 'graphite_exporter'
+prometheus::graphite_exporter::service_name: 'graphite_exporter'
 prometheus::graphite_exporter::user: 'graphite-exporter'
 prometheus::graphite_exporter::version: '0.2.0'
 prometheus::graphite_exporter::options: ''
@@ -293,6 +307,7 @@ prometheus::collectd_exporter::download_url_base: 'https://github.com/prometheus
 prometheus::collectd_exporter::group: 'collectd-exporter'
 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::options: ''

manifests/beanstalkd_exporter.pp

@@ -47,6 +47,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the beanstalkd exporter service (default 'beanstalkd_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -57,7 +59,8 @@
   Array $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   String $config,
@@ -88,7 +91,7 @@
   $real_download_url = pick($download_url,"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
 
   $notify_service = $restart_on_change ? {
-    true    => Service['beanstalkd_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 

manifests/bird_exporter.pp

@@ -58,7 +58,7 @@
   Array[String] $extra_groups             = ['bird'],
   String $group                           = 'bird-exporter',
   String $package_ensure                  = 'installed',
-  String $package_name                    = 'bird_exporter',
+  String[1] $package_name                 = 'bird_exporter',
   String $user                            = 'bird-exporter',
   String $version                         = '1.2.4',
   Boolean $purge_config_dir               = true,
@@ -90,7 +90,7 @@
     default => undef,
   }
 
-  prometheus::daemon { $service_name :
+  prometheus::daemon { $service_name:
     install_method     => $install_method,
     version            => $version,
     download_extension => $download_extension,

manifests/blackbox_exporter.pp

@@ -67,7 +67,7 @@
   Array[String] $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
   String $user,
   String $version,
   Boolean $restart_on_change              = true,
@@ -117,7 +117,7 @@
   }
 
 
-  prometheus::daemon { $service_name :
+  prometheus::daemon { $service_name:
     install_method     => $install_method,
     version            => $version,
     download_extension => $download_extension,

manifests/collectd_exporter.pp

@@ -37,6 +37,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the collectd exporter service (default 'collectd_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -47,6 +49,7 @@
   String[1] $group,
   String[1] $package_ensure,
   String[1] $package_name,
+  String[1] $service_name,
   String[1] $user,
   String[1] $version,
   String $options,
@@ -72,11 +75,11 @@
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
 
   $notify_service = $restart_on_change ? {
-    true    => Service['collectd_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 
-  prometheus::daemon { 'collectd_exporter':
+  prometheus::daemon { $service_name:
     install_method     => $install_method,
     version            => $version,
     download_extension => $download_extension,

manifests/config.pp

@@ -200,7 +200,7 @@
         'redhat' => template('prometheus/prometheus.sysv.erb'), # redhat and sysv share the same template file
         default  => template("prometheus/prometheus.${prometheus::server::init_style}.erb"),
       }
-      file { '/etc/init.d/prometheus':
+      file { "/etc/init.d/${prometheus::server::service_name}":
         ensure  => file,
         mode    => '0555',
         owner   => 'root',
@@ -252,7 +252,7 @@
       file_sd_configs => [{
         files => [ "${prometheus::config_dir}/file_sd_config.d/${job_name}_*.yaml" ]
       }]
-      })
+    })
   }
 
   if versioncmp($prometheus::server::version, '2.0.0') >= 0 {

manifests/consul_exporter.pp

@@ -45,6 +45,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the consul exporter service (default 'consul_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -62,7 +64,8 @@
   String $group,
   String $log_level,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   String $web_listen_address,
@@ -105,7 +108,7 @@
   }
 
   $notify_service = $restart_on_change ? {
-    true    => Service['consul_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 

manifests/elasticsearch_exporter.pp

@@ -59,7 +59,8 @@
   Array $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   Boolean $use_kingpin,
@@ -87,7 +88,7 @@
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
 
   $notify_service = $restart_on_change ? {
-    true    => Service['elasticsearch_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 

manifests/graphite_exporter.pp

@@ -37,6 +37,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the graphite exporter service (default 'graphite_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -46,7 +48,8 @@
   String $download_url_base,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   String $options,
@@ -72,7 +75,7 @@
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
 
   $notify_service = $restart_on_change ? {
-    true    => Service['graphite_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 

manifests/haproxy_exporter.pp

@@ -53,10 +53,10 @@
   Array $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
-  String[1] $service_name,
+  String[1] $package_name,
   String $user,
   String $version,
+  String[1] $service_name,
   Prometheus::Uri $download_url_base,
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,

manifests/init.pp

@@ -51,6 +51,8 @@
 #  Whether to enable or not prometheus service from puppet (default true)
 # @param service_ensure
 #  State ensured from prometheus service (default 'running')
+# @param service_name
+#  Name of the prometheus service (default 'prometheus')
 # @param manage_service
 #  Should puppet manage the prometheus service? (default true)
 # @param restart_on_change
@@ -219,6 +221,7 @@
   String $download_extension,
   String $package_name,
   String $package_ensure,
+  String $service_name,
   String $config_dir,
   Stdlib::Absolutepath $localstorage,
   String $config_template,

manifests/mesos_exporter.pp

@@ -43,6 +43,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the mesos exporter service (default 'mesos_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -55,7 +57,8 @@
   Array $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   Boolean $purge_config_dir               = true,
@@ -80,7 +83,7 @@
 
   $real_download_url    = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
   $notify_service = $restart_on_change ? {
-    true    => Service['mesos_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }
 

manifests/mongodb_exporter.pp

@@ -41,6 +41,8 @@
 #  Whether to enable the service from puppet (default true)
 # @param service_ensure
 #  State ensured for the service (default 'running')
+# @param service_name
+#  Name of the mongodb exporter service (default 'mongodb_exporter')
 # @param user
 #  User which runs the service
 # @param version
@@ -56,7 +58,8 @@
   Array  $extra_groups,
   String $group,
   String $package_ensure,
-  String $package_name,
+  String[1] $package_name,
+  String[1] $service_name,
   String $user,
   String $version,
   Boolean $use_kingpin,
@@ -84,7 +87,7 @@
   $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
 
   $notify_service = $restart_on_change ? {
-    true    => Service['mongodb_exporter'],
+    true    => Service[$service_name],
     default => undef,
   }