Skip to content

Commit

Permalink
add proxy_server & proxy_type to server install
Browse files Browse the repository at this point in the history
  • Loading branch information
sabo authored and bastelfreak committed Aug 4, 2023
1 parent d6e83bb commit 2bb782f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
18 changes: 18 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11613,6 +11613,8 @@ The following parameters are available in the `prometheus::server` class:
* [`collect_tag`](#-prometheus--server--collect_tag)
* [`max_open_files`](#-prometheus--server--max_open_files)
* [`usershell`](#-prometheus--server--usershell)
* [`proxy_server`](#-prometheus--server--proxy_server)
* [`proxy_type`](#-prometheus--server--proxy_type)

##### <a name="-prometheus--server--configname"></a>`configname`

Expand Down Expand Up @@ -12006,6 +12008,22 @@ Data type: `Stdlib::Absolutepath`

Default value: `$prometheus::usershell`

##### <a name="-prometheus--server--proxy_server"></a>`proxy_server`

Data type: `Optional[String[1]]`



Default value: `$prometheus::proxy_server`

##### <a name="-prometheus--server--proxy_type"></a>`proxy_type`

Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]`



Default value: `$prometheus::proxy_type`

### <a name="prometheus--snmp_exporter"></a>`prometheus::snmp_exporter`

This module manages prometheus snmp_exporter
Expand Down
2 changes: 2 additions & 0 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
creates => "/opt/prometheus-${prometheus::server::version}.${prometheus::server::os}-${prometheus::server::real_arch}/prometheus",
cleanup => true,
extract_command => $prometheus::extract_command,
proxy_server => $prometheus::server::proxy_server,
proxy_type => $prometheus::server::proxy_type,
}
-> file {
"/opt/prometheus-${prometheus::server::version}.${prometheus::server::os}-${prometheus::server::real_arch}/prometheus":
Expand Down
2 changes: 2 additions & 0 deletions manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
Optional[String[1]] $collect_tag = $prometheus::collect_tag,
Optional[Integer] $max_open_files = $prometheus::max_open_files,
Stdlib::Absolutepath $usershell = $prometheus::usershell,
Optional[String[1]] $proxy_server = $prometheus::proxy_server,
Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = $prometheus::proxy_type,
) inherits prometheus {
if( versioncmp($version, '1.0.0') == -1 ) {
$real_download_url = pick($download_url,
Expand Down
6 changes: 4 additions & 2 deletions spec/classes/prometheus_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'/etc/prometheus/prometheus.yaml'
end

[{ manage_prometheus_server: true, version: '2.0.0-rc.1', bin_dir: '/usr/local/bin', install_method: 'url', rule_files: ['/etc/prometheus/rules.d/*.rules'] }].each do |parameters|
[{ manage_prometheus_server: true, version: '2.0.0-rc.1', bin_dir: '/usr/local/bin', install_method: 'url', rule_files: ['/etc/prometheus/rules.d/*.rules'], proxy_server: 'proxy.test', proxy_type: 'https' }].each do |parameters|
context "with parameters #{parameters}" do
let(:params) do
parameters
Expand Down Expand Up @@ -51,7 +51,9 @@
'source' => "https://github.com/prometheus/prometheus/releases/download/v#{prom_version}/prometheus-#{prom_version}.#{prom_os}-#{prom_arch}.tar.gz",
'checksum_verify' => false,
'creates' => "/opt/prometheus-#{prom_version}.#{prom_os}-#{prom_arch}/prometheus",
'cleanup' => true
'cleanup' => true,
'proxy_server' => 'proxy.test',
'proxy_type' => 'https'
).that_comes_before("File[/opt/prometheus-#{prom_version}.#{prom_os}-#{prom_arch}/prometheus]")
}

Expand Down

0 comments on commit 2bb782f

Please sign in to comment.