Merge pull request voxpupuli#193 from bastelfreak/arch_bug

use correct architecture variable from init.pp in exporters
Rovanion · May 19, 2018 · 683da85 · 683da85
2 parents 0accb93 + ad89b85
commit 683da85
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/manifests/beanstalkd_exporter.pp b/manifests/beanstalkd_exporter.pp
@@ -106,7 +106,7 @@
   String $os                          = $prometheus::os,
   String $extra_options               = '',
   Variant[Undef,String] $download_url = undef,
-  String $arch                        = $prometheus::arch,
+  String $arch                        = $prometheus::real_arch,
   String $bin_dir                     = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp
@@ -113,7 +113,7 @@
   String $extra_options          = '',
   Optional[String] $download_url = undef,
   String $config_mode            = $prometheus::config_mode,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
   Hash $modules                  = {},
 ) inherits prometheus {

diff --git a/manifests/consul_exporter.pp b/manifests/consul_exporter.pp
@@ -110,7 +110,7 @@
   String $install_method         = $prometheus::install_method,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/elasticsearch_exporter.pp b/manifests/elasticsearch_exporter.pp
@@ -101,7 +101,7 @@
   String $os                     = $prometheus::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/haproxy_exporter.pp b/manifests/haproxy_exporter.pp
@@ -94,7 +94,7 @@
   String $os                     = $prometheus::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir  = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/mesos_exporter.pp b/manifests/mesos_exporter.pp
@@ -98,7 +98,7 @@
   String $os                     = $prometheu::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/mongodb_exporter.pp b/manifests/mongodb_exporter.pp
@@ -94,7 +94,7 @@
   String $os                     = $prometheus::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/mysqld_exporter.pp b/manifests/mysqld_exporter.pp
@@ -118,7 +118,7 @@
   Optional[Variant[Stdlib::HTTPSUrl, Stdlib::HTTPUrl]] $download_url = undef,
   String $config_mode                                                = $prometheus::config_mode,
   Optional[Stdlib::Absolutepath] $cnf_socket                         = undef,
-  String $arch                                                       = $prometheus::arch,
+  String $arch                                                       = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir                                      = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/nginx_vts_exporter.pp b/manifests/nginx_vts_exporter.pp
@@ -94,7 +94,7 @@
   String           $os                = $prometheus::os,
   String           $extra_options     = '',
   Optional[String] $download_url      = undef,
-  String           $arch              = $prometheus::arch,
+  String           $arch              = $prometheus::real_arch,
   String           $bin_dir           = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/node_exporter.pp b/manifests/node_exporter.pp
@@ -107,7 +107,7 @@
   String $os                          = $prometheus::os,
   String $extra_options               = '',
   Optional[String] $download_url      = undef,
-  String $arch                        = $prometheus::arch,
+  String $arch                        = $prometheus::real_arch,
   String $bin_dir                     = $prometheus::bin_dir,
   Optional[Array[String]] $collectors = undef,
   Array[String] $collectors_enable    = [],

diff --git a/manifests/process_exporter.pp b/manifests/process_exporter.pp
@@ -93,7 +93,7 @@
   String $extra_options                                              = '',
   String $config_mode                                                = $prometheus::config_mode,
   Optional[Variant[Stdlib::HTTPSUrl, Stdlib::HTTPUrl]] $download_url = undef,
-  String $arch                                                       = $prometheus::arch,
+  String $arch                                                       = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir                                      = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/rabbitmq_exporter.pp b/manifests/rabbitmq_exporter.pp
@@ -113,7 +113,7 @@
   String $queues_exclude_regex,
   Array[String] $rabbit_capabilities,
   Array[String] $rabbit_exporters,
-  String $arch                        = $prometheus::arch,
+  String $arch                        = $prometheus::real_arch,
   String $bin_dir                     = $prometheus::bin_dir,
   Optional[String] $download_url      = undef,
   String $extra_options               = '',

diff --git a/manifests/redis_exporter.pp b/manifests/redis_exporter.pp
@@ -105,7 +105,7 @@
   String $os                     = $prometheus::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/snmp_exporter.pp b/manifests/snmp_exporter.pp
@@ -102,7 +102,7 @@
   String $extra_options          = '',
   Optional[String] $download_url = undef,
   String $config_mode            = $prometheus::config_mode,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   String $bin_dir                = $prometheus::bin_dir,
 ) inherits prometheus {
 

diff --git a/manifests/statsd_exporter.pp b/manifests/statsd_exporter.pp
@@ -91,7 +91,7 @@
   Array[Hash] $statsd_maps,
   String $user,
   String $version,
-  String $arch                                                       = $prometheus::arch,
+  String $arch                                                       = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir                                      = $prometheus::bin_dir,
   String $config_mode                                                = $prometheus::config_mode,
   Boolean $purge_config_dir                                          = true,

diff --git a/manifests/varnish_exporter.pp b/manifests/varnish_exporter.pp
@@ -92,7 +92,7 @@
   String $os                     = $prometheus::os,
   String $extra_options          = '',
   Optional[String] $download_url = undef,
-  String $arch                   = $prometheus::arch,
+  String $arch                   = $prometheus::real_arch,
   Stdlib::Absolutepath $bin_dir  = $prometheus::bin_dir,
 ) inherits prometheus {