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

revert the env_vars removal for two exporters #528

Closed
wants to merge 1 commit into from
Closed

revert the env_vars removal for two exporters #528

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
4 changes: 4 additions & 0 deletions manifests/blackbox_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# Extra groups to add the binary user to
# @param extra_options
# Extra options added to the startup command
# @param env_vars
# The environment variable to pass to the daemon
# @param group
# Group under which the binary is running
# @param init_style
Expand Down Expand Up @@ -83,6 +85,7 @@
Boolean $manage_user = true,
String[1] $os = downcase($facts['kernel']),
String $extra_options = '',
Hash[String, Scalar] $env_vars = {},
Optional[String] $download_url = undef,
String[1] $config_mode = $prometheus::config_mode,
String[1] $arch = $prometheus::real_arch,
Expand Down Expand Up @@ -136,6 +139,7 @@
manage_group => $manage_group,
options => $options,
init_style => $init_style,
env_vars => $env_vars,
service_ensure => $service_ensure,
service_enable => $service_enable,
manage_service => $manage_service,
Expand Down
4 changes: 4 additions & 0 deletions manifests/postfix_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
# Whether to enable the service from puppet.
# @param extra_options
# Extra options added to the startup command. Override these if you want to monitor a logfile instead of systemd.
# @param env_vars
# The environment variable to pass to the daemon
# @param restart_on_change
# Should puppet restart the service on configuration change?
# @param export_scrape_job
Expand Down Expand Up @@ -79,6 +81,7 @@
# exporter configuration
String $extra_options = '--systemd.enable --systemd.unit=\'postfix.service\' --postfix.logfile_path=\'\'',
Boolean $restart_on_change = true,
Hash[String, Scalar] $env_vars = {},

# scrape job configuration
Boolean $export_scrape_job = false,
Expand Down Expand Up @@ -113,6 +116,7 @@
manage_group => $manage_group,
options => $extra_options,
init_style => $init_style,
env_vars => $env_vars,
service_ensure => $service_ensure,
service_enable => $service_enable,
manage_service => $manage_service,
Expand Down