Skip to content

Commit

Permalink
fixate the service_names for all exporters in the test-specs (to work…
Browse files Browse the repository at this point in the history 
… with install_method=url)
  • Loading branch information
@unki
unki committed Feb 28, 2020
1 parent 8f02a52 commit 265f2a0
Show file tree
Hide file tree
Showing 23 changed files with 55 additions and 24 deletions.
3 changes: 2 additions & 1 deletion spec/classes/alertmanager_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'alertmanager'
}
end

Expand Down
6 changes: 4 additions & 2 deletions spec/classes/apache_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'apache_exporter'
}
end

Expand All @@ -41,7 +42,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'apache_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/beanstalkd_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'beanstalkd_exporter'
}
end

Expand Down
5 changes: 5 additions & 0 deletions spec/classes/bird_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
let(:facts) do
facts.merge(os_specific_facts(facts))
end
let(:params) do
{
service_name: 'bird_exporter'
}
end

context 'without parameters' do
it { is_expected.to compile.with_all_deps }
Expand Down
1 change: 1 addition & 0 deletions spec/classes/blackbox_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url',
service_name: 'blackbox_exporter',
modules: {
'http_2xx' => {
'prober' => 'http'
Expand Down
3 changes: 2 additions & 1 deletion spec/classes/collectd_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
context 'with params' do
let :params do
{
install_method: 'url'
install_method: 'url',
service_name: 'collectd_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/consul_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'consul_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/elasticsearch_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'elasticsearch_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/graphite_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
context 'with params' do
let :params do
{
install_method: 'url'
install_method: 'url',
service_name: 'graphite_exporter',
}
end

Expand Down
6 changes: 4 additions & 2 deletions spec/classes/haproxy_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'haproxy_exporter',
}
end

Expand All @@ -34,7 +35,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'haproxy_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/mesos_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
let :params do
{
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'mesos_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/mongodb_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'mongodb_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/mysqld_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
context 'with version >= 0.9.0' do
let(:params) do
{
version: '0.9.0'
version: '0.9.0',
service_name: 'mysqld_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/nginx_vts_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'nginx-vts-exporter'
}
end

Expand Down
6 changes: 4 additions & 2 deletions spec/classes/node_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
{
collectors_enable: %w[foo bar],
collectors_disable: %w[baz qux],
install_method: 'url'
install_method: 'url',
service_name: 'node_exporter'
}
end

Expand Down Expand Up @@ -79,7 +80,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'node_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/postgres_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
bin_dir: '/usr/local/bin',
install_method: 'url',
postgres_user: 'username',
postgres_pass: 'password'
postgres_pass: 'password',
service_name: 'postgres_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/process_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'process-exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/pushgateway_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'pushgateway'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/rabbitmq_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'rabbitmq_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/redis_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'redis_exporter'
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/snmp_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'snmp_exporter'
}
end

Expand Down
4 changes: 3 additions & 1 deletion spec/classes/statsd_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url',
service_name: 'statsd_exporter',
mappings: [
{
match: 'test.dispatcher.*.*.*',
Expand Down Expand Up @@ -93,7 +94,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'statsd_exporter',
}
end

Expand Down
3 changes: 2 additions & 1 deletion spec/classes/varnish_exporter_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
arch: 'amd64',
os: 'linux',
bin_dir: '/usr/local/bin',
install_method: 'url'
install_method: 'url',
service_name: 'varnish_exporter',
}
end

Expand Down

0 comments on commit 265f2a0

Please sign in to comment.