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.

Sign up for GitHub

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

puppetdb_exporter: Update 1.0.0->1.1.0 #513

Merged
merged 1 commit into from
Dec 7, 2020
Merged

puppetdb_exporter: Update 1.0.0->1.1.0 #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ This can be used to make prometheus find instances of your running service or ap

### `prometheus`

This module manages prometheus.
This module manages prometheus

#### Parameters

Expand Down Expand Up @@ -1674,6 +1674,14 @@ The binary release version

Default value: `'1.2.4'`

##### `env_vars`

Data type: `Hash[String[1], Scalar]`

hash with custom environment variables thats passed to the exporter via init script / unit file

Default value: `{}`

##### `export_scrape_job`

Data type: `Boolean`
Expand Down Expand Up @@ -5942,7 +5950,7 @@ Data type: `String[1]`

The binary release version

Default value: `'1.0.0'`
Default value: `'1.1.0'`

##### `puppetdb_url`

Expand Down Expand Up @@ -8390,7 +8398,7 @@ Default value: `''`

##### `env_vars`

Data type: `Hash[String, Scalar]`
Data type: `Hash[String[1], Scalar]`



Expand Down Expand Up @@ -8504,7 +8512,7 @@ Alias of `Pattern[/^gs:\/\//]`

The Prometheus::Initstyle data type.

Alias of `Enum['sysv', 'redhat', 'systemd', 'sles', 'debian', 'launchd', 'upstart', 'none']`
Alias of `Enum['sysv', 'systemd', 'sles', 'launchd', 'upstart', 'none']`

### `Prometheus::Install`

Expand Down
2 changes: 1 addition & 1 deletion manifests/puppetdb_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
String[1] $package_ensure = 'present',
String[1] $package_name = 'puppetdb_exporter',
String[1] $user = 'puppetdb-exporter',
String[1] $version = '1.0.0',
String[1] $version = '1.1.0',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think changing the default version installed is a breaking change? Perhaps a several default exporter versions could be batched into a single release?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes breaking change. But I would like to update the other exporters on individual PRs (and we already have a few other backwards-incompatible changes on master)

Boolean $purge_config_dir = true,
Boolean $restart_on_change = true,
Boolean $service_enable = true,
Expand Down
9 changes: 5 additions & 4 deletions spec/classes/puppetdb_exporter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
if facts[:os]['name'] == 'Archlinux'
it { is_expected.to contain_package('puppetdb_exporter') }
it { is_expected.not_to contain_file('/usr/local/bin/puppetdb_exporter') }
it { is_expected.not_to contain_archive('/tmp/puppetdb_exporter-1.0.0.tar.gz') }
it { is_expected.not_to contain_archive('/tmp/puppetdb_exporter-1.1.0.tar.gz') }
else
it { is_expected.to contain_archive('/tmp/puppetdb_exporter-1.0.0.tar.gz') }
it { is_expected.to contain_file('/usr/local/bin/puppetdb_exporter').with('target' => '/opt/prometheus-puppetdb-exporter-1.0.0.linux-amd64/prometheus-puppetdb-exporter') }
it { is_expected.to contain_file('/opt/prometheus-puppetdb-exporter-1.0.0.linux-amd64/prometheus-puppetdb-exporter') }
it { is_expected.to contain_archive('/tmp/puppetdb_exporter-1.1.0.tar.gz') }
it { is_expected.to contain_file('/usr/local/bin/puppetdb_exporter').with('target' => '/opt/prometheus-puppetdb-exporter-1.1.0.linux-amd64/prometheus-puppetdb-exporter') }
it { is_expected.to contain_file('/opt/prometheus-puppetdb-exporter-1.1.0.linux-amd64/prometheus-puppetdb-exporter') }
it { is_expected.not_to contain_package('puppetdb_exporter') }
end
it { is_expected.to contain_prometheus__daemon('puppetdb_exporter') }
it { is_expected.to contain_user('puppetdb-exporter') }
it { is_expected.to contain_group('puppetdb-exporter') }
it { is_expected.to contain_service('puppetdb_exporter') }
it { is_expected.to contain_class('prometheus') }
it { is_expected.to contain_systemd__unit_file('puppetdb_exporter.service') }
end
end
end
Expand Down