Merge pull request #471 from kkunkel/master

updating String to String[1] when '' is invalid
voxpupuli · Jul 4, 2020 · 85fc887 · 85fc887
2 parents 8457c1b + 2bcba2f
commit 85fc887
Show file tree

Hide file tree

Showing 26 changed files with 211 additions and 211 deletions.
diff --git a/manifests/alertmanager.pp b/manifests/alertmanager.pp
@@ -93,20 +93,20 @@
 class prometheus::alertmanager (
   Stdlib::Absolutepath $config_dir,
   Stdlib::Absolutepath $config_file,
-  String $download_extension,
+  String[1] $download_extension,
   Prometheus::Uri $download_url_base,
   Array $extra_groups,
   Hash $global,
-  String $group,
+  String[1] $group,
   Array $inhibit_rules,
-  String $package_ensure,
-  String $package_name,
+  String[1] $package_ensure,
+  String[1] $package_name,
   Array $receivers,
   Hash $route,
   Stdlib::Absolutepath $storage_path,
   Array $templates,
-  String $user,
-  String $version,
+  String[1] $user,
+  String[1] $version,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   String[1] $service_name                 = 'alertmanager',
@@ -115,14 +115,14 @@
   Boolean $purge_config_dir               = true,
   Boolean $manage_config                  = true,
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,
   String[1] $os                           = $prometheus::os,
   String $extra_options                   = '',
   Optional[String] $download_url          = undef,
-  String $config_mode                     = $prometheus::config_mode,
+  String[1] $config_mode                  = $prometheus::config_mode,
   String[1] $arch                         = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir           = $prometheus::bin_dir,
 ) inherits prometheus {

diff --git a/manifests/alerts.pp b/manifests/alerts.pp
@@ -5,11 +5,11 @@
 #  Where to create the alert file for prometheus
 define prometheus::alerts (
   Variant[Array,Hash] $alerts,
-  String $location = "${prometheus::config_dir}/rules",
-  String $version  = $prometheus::version,
-  String $user     = $prometheus::user,
-  String $group    = $prometheus::group,
-  String $bin_dir  = $prometheus::bin_dir,
+  String[1] $location = "${prometheus::config_dir}/rules",
+  String[1] $version  = $prometheus::version,
+  String[1] $user     = $prometheus::user,
+  String[1] $group    = $prometheus::group,
+  String[1] $bin_dir  = $prometheus::bin_dir,
 ) {
   if ( versioncmp($version, '2.0.0') < 0 ){
     file { "${location}/${name}.rules":

diff --git a/manifests/beanstalkd_exporter.pp b/manifests/beanstalkd_exporter.pp
@@ -54,33 +54,33 @@
 # @param version
 #  The binary release version
 class prometheus::beanstalkd_exporter (
-  String $download_extension,
-  String $download_url_base,
+  String[1] $download_extension,
+  String[1] $download_url_base,
   Array $extra_groups,
-  String $group,
-  String $package_ensure,
+  String[1] $group,
+  String[1] $package_ensure,
   String[1] $package_name,
   String[1] $service_name,
-  String $user,
-  String $version,
-  String $config,
-  String $mapping_config,
-  String $beanstalkd_address,
-  String $exporter_listen,
+  String[1] $user,
+  String[1] $version,
+  String[1] $config,
+  String[1] $mapping_config,
+  String[1] $beanstalkd_address,
+  String[1] $exporter_listen,
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,
   String[1] $os                           = downcase($facts['kernel']),
   String $extra_options                   = '',
   Variant[Undef,String] $download_url     = undef,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = $prometheus::bin_dir,
+  String[1] $bin_dir                      = $prometheus::bin_dir,
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 8080,
   String[1] $scrape_job_name              = 'beanstalkd',

diff --git a/manifests/bird_exporter.pp b/manifests/bird_exporter.pp
@@ -54,28 +54,28 @@
 #
 class prometheus::bird_exporter (
   String $download_extension              = '',
-  String $download_url_base               = 'https://github.com/czerwonk/bird_exporter/releases',
+  String[1] $download_url_base            = 'https://github.com/czerwonk/bird_exporter/releases',
   Array[String] $extra_groups             = ['bird'],
-  String $group                           = 'bird-exporter',
-  String $package_ensure                  = 'installed',
+  String[1] $group                        = 'bird-exporter',
+  String[1] $package_ensure               = 'installed',
   String[1] $package_name                 = 'bird_exporter',
-  String $user                            = 'bird-exporter',
-  String $version                         = '1.2.4',
+  String[1] $user                         = 'bird-exporter',
+  String[1] $version                      = '1.2.4',
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   String[1] $service_name                 = 'bird_exporter',
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = 'url',
+  String[1] $install_method               = 'url',
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,
   String[1] $os                           = downcase($facts['kernel']),
-  String $extra_options                   = '-bird.v2 -web.listen-address=127.0.0.1:9324 -format.new=true',
+  String[1] $extra_options                = '-bird.v2 -web.listen-address=127.0.0.1:9324 -format.new=true',
   Optional[String] $download_url          = undef,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = '/usr/local/bin',
+  String[1] $bin_dir                      = '/usr/local/bin',
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9324,
   String[1] $scrape_job_name              = 'bird',

diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp
@@ -61,30 +61,30 @@
 #     tcp:
 #       preferred_ip_protocol: ip4
 class prometheus::blackbox_exporter (
-  String $config_file,
-  String $download_extension,
-  String $download_url_base,
+  String[1] $config_file,
+  String[1] $download_extension,
+  String[1] $download_url_base,
   Array[String] $extra_groups,
-  String $group,
-  String $package_ensure,
+  String[1] $group,
+  String[1] $package_ensure,
   String[1] $package_name,
-  String $user,
-  String $version,
+  String[1] $user,
+  String[1] $version,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   String[1] $service_name                 = 'blackbox_exporter',
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,
   String[1] $os                           = downcase($facts['kernel']),
   String $extra_options                   = '',
   Optional[String] $download_url          = undef,
-  String $config_mode                     = $prometheus::config_mode,
+  String[1] $config_mode                  = $prometheus::config_mode,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = $prometheus::bin_dir,
+  String[1] $bin_dir                      = $prometheus::bin_dir,
   Hash $modules                           = {},
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9115,

diff --git a/manifests/consul_exporter.pp b/manifests/consul_exporter.pp
@@ -57,19 +57,19 @@
 #  Path under which to expose metrics. (default "/metrics")
 class prometheus::consul_exporter (
   Boolean $consul_health_summary,
-  String $consul_server,
-  String $download_extension,
-  String $download_url_base,
+  String[1] $consul_server,
+  String[1] $download_extension,
+  String[1] $download_url_base,
   Array $extra_groups,
-  String $group,
-  String $log_level,
-  String $package_ensure,
+  String[1] $group,
+  String[1] $log_level,
+  String[1] $package_ensure,
   String[1] $package_name,
   String[1] $service_name,
-  String $user,
-  String $version,
-  String $web_listen_address,
-  String $web_telemetry_path,
+  String[1] $user,
+  String[1] $version,
+  String[1] $web_listen_address,
+  String[1] $web_telemetry_path,
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
@@ -79,11 +79,11 @@
   Boolean $manage_user                    = true,
   String[1] $os                           = downcase($facts['kernel']),
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   String $extra_options                   = '',
   Optional[String] $download_url          = undef,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = $prometheus::bin_dir,
+  String[1] $bin_dir                         = $prometheus::bin_dir,
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9107,
   String[1] $scrape_job_name              = 'consul',

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
@@ -46,19 +46,19 @@
 #  Can also be set to `none` when you don't want the class to create a startup script/unit_file for you.
 #  Typically this can be used when a package is already providing the file.
 define prometheus::daemon (
-  String $version,
+  String[1] $version,
   Prometheus::Uri $real_download_url,
   $notify_service,
   String[1] $user,
   String[1] $group,
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   String $download_extension              = $prometheus::download_extension,
   String[1] $os                           = $prometheus::os,
   String[1] $arch                         = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir           = $prometheus::bin_dir,
-  String $bin_name                        = $name,
+  String[1] $bin_name                     = $name,
   Optional[String] $package_name          = undef,
-  String $package_ensure                  = 'installed',
+  String[1] $package_ensure               = 'installed',
   Boolean $manage_user                    = true,
   Array $extra_groups                     = [],
   Boolean $manage_group                   = true,

diff --git a/manifests/elasticsearch_exporter.pp b/manifests/elasticsearch_exporter.pp
@@ -52,32 +52,32 @@
 #  this param to define how we call the es.uri and es.timeout in the $options
 #  https://github.com/justwatchcom/elasticsearch_exporter/blob/v1.1.0/CHANGELOG.md
 class prometheus::elasticsearch_exporter (
-  String $cnf_uri,
-  String $cnf_timeout,
-  String $download_extension,
-  String $download_url_base,
+  String[1] $cnf_uri,
+  String[1] $cnf_timeout,
+  String[1] $download_extension,
+  String[1] $download_url_base,
   Array $extra_groups,
-  String $group,
-  String $package_ensure,
+  String[1] $group,
+  String[1] $package_ensure,
   String[1] $package_name,
   String[1] $service_name,
-  String $user,
-  String $version,
+  String[1] $user,
+  String[1] $version,
   Boolean $use_kingpin,
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,
   String[1] $os                           = downcase($facts['kernel']),
   String $extra_options                   = '',
   Optional[String] $download_url          = undef,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = $prometheus::bin_dir,
+  String[1] $bin_dir                      = $prometheus::bin_dir,
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9114,
   String[1] $scrape_job_name              = 'elasticsearch',

diff --git a/manifests/graphite_exporter.pp b/manifests/graphite_exporter.pp
@@ -44,21 +44,21 @@
 # @param version
 #  The binary release version
 class prometheus::graphite_exporter (
-  String $download_extension,
-  String $download_url_base,
-  String $group,
-  String $package_ensure,
+  String[1] $download_extension,
+  String[1] $download_url_base,
+  String[1] $group,
+  String[1] $package_ensure,
   String[1] $package_name,
   String[1] $service_name,
-  String $user,
-  String $version,
+  String[1] $user,
+  String[1] $version,
   String $options,
   String[1] $os                           = downcase($facts['kernel']),
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Optional[String] $download_url          = undef,
   String[1] $arch                         = $prometheus::real_arch,
-  String $bin_dir                         = $prometheus::bin_dir,
+  String[1] $bin_dir                      = $prometheus::bin_dir,
   Boolean $export_scrape_job              = false,
   Stdlib::Port $scrape_port               = 9108,
   String[1] $scrape_job_name              = 'graphite',

diff --git a/manifests/grok_exporter.pp b/manifests/grok_exporter.pp
@@ -54,7 +54,7 @@
 #  The binary release version
 class prometheus::grok_exporter (
   Hash $config,
-  String $config_file,
+  String[1] $config_file,
   String[1] $download_extension,
   Prometheus::Uri $download_url_base,
   Array[String[1]] $extra_groups,

diff --git a/manifests/haproxy_exporter.pp b/manifests/haproxy_exporter.pp
@@ -49,21 +49,21 @@
 #  The binary release version
 class prometheus::haproxy_exporter (
   Variant[Stdlib::HTTPUrl, Pattern[/unix:(?:\/.+)+/]] $cnf_scrape_uri,
-  String $download_extension,
+  String[1] $download_extension,
   Array $extra_groups,
-  String $group,
-  String $package_ensure,
+  String[1] $group,
+  String[1] $package_ensure,
   String[1] $package_name,
-  String $user,
-  String $version,
+  String[1] $user,
+  String[1] $version,
   String[1] $service_name,
   Prometheus::Uri $download_url_base,
   Boolean $purge_config_dir               = true,
   Boolean $restart_on_change              = true,
   Boolean $service_enable                 = true,
   Stdlib::Ensure::Service $service_ensure = 'running',
   Prometheus::Initstyle $init_style       = $facts['service_provider'],
-  String $install_method                  = $prometheus::install_method,
+  String[1] $install_method               = $prometheus::install_method,
   Boolean $manage_group                   = true,
   Boolean $manage_service                 = true,
   Boolean $manage_user                    = true,