Skip to content

Commit

Permalink
Merge pull request #358 from bastelfreak/updates22
Browse files Browse the repository at this point in the history
apache_exporter: update 0.5.0->0.7.0
  • Loading branch information
bastelfreak authored Jul 19, 2019
2 parents 0a23821 + 5d38d48 commit 836cd8e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion data/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,4 @@ prometheus::apache_exporter::group: 'apache-exporter'
prometheus::apache_exporter::package_ensure: 'latest'
prometheus::apache_exporter::package_name: 'apache_exporter'
prometheus::apache_exporter::user: 'apache-exporter'
prometheus::apache_exporter::version: '0.5.0'
prometheus::apache_exporter::version: '0.7.0'
10 changes: 3 additions & 7 deletions spec/acceptance/apache_exporter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
describe 'prometheus apache exporter' do
it 'apache_exporter works idempotently with no errors' do
pp = 'include prometheus::apache_exporter'
# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
Expand All @@ -13,7 +12,6 @@
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
# the class installs an the apache_exporter that listens on port 9104
describe port(9117) do
it { is_expected.to be_listening.with('tcp6') }
end
Expand All @@ -22,10 +20,9 @@
end
end

describe 'apache_exporter update from 0.4.0 to 0.5.0' do
describe 'apache_exporter update from 0.5.0 to 0.7.0' do
it 'is idempotent' do
pp = "class{'prometheus::apache_exporter': version => '0.4.0'}"
# Run it twice and test for idempotency
pp = "class{'prometheus::apache_exporter': version => '0.5.0'}"
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
Expand All @@ -43,8 +40,7 @@
it { is_expected.to be_listening.with('tcp6') }
end
it 'is idempotent' do
pp = "class{'prometheus::apache_exporter': version => '0.5.0'}"
# Run it twice and test for idempotency
pp = "class{'prometheus::apache_exporter': version => '0.7.0'}"
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
end
Expand Down

0 comments on commit 836cd8e

Please sign in to comment.