From 4a70b0016d0c30caaf22e15550a0aacbbfc8c180 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 14 Jul 2019 12:52:17 +0200 Subject: [PATCH 1/2] nginx_vts_exporter: Add acceptance tests --- spec/acceptance/nginx_vts_exporter_spec.rb | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 spec/acceptance/nginx_vts_exporter_spec.rb diff --git a/spec/acceptance/nginx_vts_exporter_spec.rb b/spec/acceptance/nginx_vts_exporter_spec.rb new file mode 100644 index 000000000..365ea942f --- /dev/null +++ b/spec/acceptance/nginx_vts_exporter_spec.rb @@ -0,0 +1,56 @@ +require 'spec_helper_acceptance' + +describe 'prometheus nginx_vts_exporter' do + it 'nginx_vts_exporter works idempotently with no errors' do + if default[:platform] =~ %r{ubuntu-18.04-amd64} + pp = "package{'iproute2': ensure => present}" + apply_manifest(pp, catch_failures: true) + end + pp = 'include prometheus::nginx_vts_exporter' + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + + describe service('nginx-vts-exporter') do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + + describe port(9913) do + it { is_expected.to be_listening.with('tcp6') } + end + + describe 'nginx_vts_exporter update from 0.6 to 0.10.3' do + it 'is idempotent' do + pp = "class{'prometheus::nginx_vts_exporter': version => '0.6'}" + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + + describe service('nginx-vts-exporter') do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + + describe port(9913) do + it { is_expected.to be_listening.with('tcp6') } + end + it 'is idempotent' do + pp = "class{'prometheus::nginx_vts_exporter': version => '0.10.3'}" + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + + describe service('nginx-vts-exporter') do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + + describe port(9913) do + it { is_expected.to be_listening.with('tcp6') } + end + end +end From 724bef8f18b4ceb72aed9b16eeda70c2ced47c05 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 14 Jul 2019 12:52:38 +0200 Subject: [PATCH 2/2] nginx_vts_exporter: update 0.6->0.10.3 --- data/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.yaml b/data/defaults.yaml index 456199ed4..b6e0d331c 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -138,7 +138,7 @@ prometheus::nginx_vts_exporter::group: 'nginx-vts-exporter' prometheus::nginx_vts_exporter::package_ensure: 'latest' prometheus::nginx_vts_exporter::package_name: 'nginx-vts-exporter' prometheus::nginx_vts_exporter::user: 'nginx-vts-exporter' -prometheus::nginx_vts_exporter::version: '0.6' +prometheus::nginx_vts_exporter::version: '0.10.3' prometheus::process_exporter::download_extension: 'tar.gz' prometheus::process_exporter::download_url_base: 'https://github.com/ncabatoff/process-exporter/releases' prometheus::process_exporter::extra_groups: []