Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to data-in-modules #178

Merged
merged 43 commits into from
Mar 22, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d1b6c45
convert params.pp to data-in-modules
bastelfreak Mar 18, 2018
8830a06
convert init to data-in-modules
bastelfreak Mar 18, 2018
3dda053
convert daemon class to data-in-modules
bastelfreak Mar 18, 2018
1405e3d
set OS specific default values
bastelfreak Mar 18, 2018
c2c9e30
convert alertmanager to data-in-modules
bastelfreak Mar 18, 2018
9749439
puppet-lint: fix parameter_order in alertmanager
bastelfreak Mar 18, 2018
e9f6bc7
convert beanstalkd_exporter to data-in-modules
bastelfreak Mar 18, 2018
3c737aa
puppet-lint: fix parameter_order in beanstalkd_exporter
bastelfreak Mar 18, 2018
7163f73
convert blackbox_exporter to data-in-modules
bastelfreak Mar 18, 2018
7934b90
puppet-lint: fix parameter_order in blackbox_exporter
bastelfreak Mar 18, 2018
585ba70
convert config class to data-in-modules
bastelfreak Mar 18, 2018
8de04d2
convert consul_exporter to data-in-modules
bastelfreak Mar 18, 2018
ad70925
puppet-lint: fix parameter_order in consul_exporter
bastelfreak Mar 18, 2018
bd9ff7e
convert elasticsearch_exporter to data-in-modules
bastelfreak Mar 18, 2018
a3f5035
puppet-lint: fix parameter_order in elasticsearch_exporter
bastelfreak Mar 18, 2018
2600cf8
convert haproxy_exporter to data-in-modules
bastelfreak Mar 18, 2018
05f2f75
puppet-lint: fix parameter_order in haproxy_exporter
bastelfreak Mar 18, 2018
3e5353e
convert mesos_exporter to data-in-modules
bastelfreak Mar 18, 2018
6ba4acb
puppet-lint: fix parameter_order in mesos_exporter
bastelfreak Mar 18, 2018
f9e3e46
convert mongodb_exporter to data-in-modules
bastelfreak Mar 18, 2018
6b1c484
puppet-lint: fix parameter_order in mongodb_exporter
bastelfreak Mar 18, 2018
d3795a4
convert mysql_exporter to data-in-modules
bastelfreak Mar 18, 2018
b1ec892
puppet-lint: fix parameter_order in mysqld_exporter
bastelfreak Mar 18, 2018
0a94247
convert nginx_vts__exporter to data-in-modules
bastelfreak Mar 18, 2018
2ad3c5a
puppet-lint: fix parameter_order in nginx_vts_exporter
bastelfreak Mar 18, 2018
c96f1fa
convert node_exporter to data-in-modules
bastelfreak Mar 18, 2018
50cf961
puppet-lint: fix parameter_order in node_exporter
bastelfreak Mar 18, 2018
c066bea
convert process_exporter to data-in-modules
bastelfreak Mar 18, 2018
7923b7c
puppet-lint: fix parameter_order in process_exporter
bastelfreak Mar 18, 2018
80bc866
convert pushgateway to data-in-modules
bastelfreak Mar 18, 2018
aa2dc62
puppet-lint: fix parameter_order in pushgateway
bastelfreak Mar 18, 2018
d1f8488
convert rabbitmq_exporter to data-in-modules
bastelfreak Mar 18, 2018
f9175cb
convert redis_exporter to data-in-modules
bastelfreak Mar 18, 2018
8982d90
puppet-lint: fix parameter_order in redis_exporter
bastelfreak Mar 18, 2018
1f0eba6
convert snmp_exporter to data-in-modules
bastelfreak Mar 18, 2018
c713370
puppet-lint: fix parameter_order in snmp_exporter
bastelfreak Mar 18, 2018
55008e1
convert statsd_exporter to data-in-modules
bastelfreak Mar 18, 2018
9613307
puppet-lint: fix parameter_order in statsd_exporter
bastelfreak Mar 18, 2018
e2892fd
delete obsolete params.pp
bastelfreak Mar 18, 2018
1a38955
fix parameter_order in rabbitmq_exporter
bastelfreak Mar 18, 2018
4dbf0f6
puppet-lint: fix parameter_order in init
bastelfreak Mar 18, 2018
d281533
process_exporter
bastelfreak Mar 18, 2018
f2ef2a3
convert daemon to data-in-modules
bastelfreak Mar 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
convert daemon to data-in-modules
  • Loading branch information
bastelfreak committed Mar 18, 2018
commit f2ef2a38a98d9a7f9b2fa702dba58ccb8eda5515
2 changes: 1 addition & 1 deletion manifests/daemon.pp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
String $install_method = $prometheus::install_method,
String $download_extension = $prometheus::download_extension,
String $os = $prometheus::os,
String $arch = $prometheus::arch,
String $arch = $prometheus::real_arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
Optional[String] $package_name = undef,
String $package_ensure = 'installed',
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/daemon_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

let :pre_condition do
'include ::prometheus::params'
'include prometheus'
end

[
Expand All @@ -31,7 +31,7 @@
parameters
end

it { is_expected.to contain_class('prometheus::params') }
it { is_expected.to contain_class('prometheus') }
prom_os = facts[:kernel].downcase
prom_arch = facts[:architecture] == 'i386' ? '386' : 'amd64'

Expand Down