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

Jump to bottom

remove inherit from exporters to not trigger a install of prometheus daemon #187

Closed
wants to merge 4 commits into from
Closed

remove inherit from exporters to not trigger a install of prometheus daemon #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
373a5ef
remove inherit from exporters to not trigger a install of prometheus …
blupman Apr 26, 2018
2bc2004
forgot to add yaml for arch selection
blupman Apr 30, 2018
ad42b7d
removed inherits from exporters
blupman May 3, 2018
ae85aa0
convert defaults to lookups
May 4, 2018
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
2 changes: 2 additions & 0 deletions data/arch/amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
prometheus::arch: 'amd64'
2 changes: 2 additions & 0 deletions data/arch/i386.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
prometheus::arch: '386'
2 changes: 2 additions & 0 deletions data/arch/x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
prometheus::arch: 'amd64'
2 changes: 2 additions & 0 deletions data/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
prometheus::bin_dir: '/usr/local/bin'
prometheus::version: '1.5.2'
prometheus::install_method: 'url'
prometheus::init_style: "%{facts.service_provider}"
prometheus::os: 'linux'
prometheus::alert_relabel_config: []
prometheus::alertmanagers_config: []
prometheus::alertmanager::config_dir: '/etc/alertmanager'
Expand Down
2 changes: 2 additions & 0 deletions hiera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ defaults:
data_hash: yaml_data

hierarchy:
- name: 'Architecture Name'
path: "arch/%{facts.architecture}.yaml"
- name: 'Distribution Name'
path: "%{facts.os.name}.yaml"
- name: 'Operating System Family'
Expand Down
14 changes: 7 additions & 7 deletions manifests/alertmanager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,18 @@
String $service_name = 'alertmanager',
Boolean $restart_on_change = true,
Boolean $purge_config_dir = true,
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
String $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $config_mode = $prometheus::config_mode,
String $arch = $prometheus::real_arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $config_mode = lookup('prometheus::config_mode'),
String $arch = lookup('prometheus::arch'),
Stdlib::Absolutepath $bin_dir = lookup('prometheus::bin_dir'),
) {

if( versioncmp($version, '0.3.0') == -1 ){
$real_download_url = pick($download_url,
Expand Down
12 changes: 6 additions & 6 deletions manifests/beanstalkd_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@
Boolean $restart_on_change = true,
Boolean $service_enable = true,
String $service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Variant[Undef,String] $download_url = undef,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
) {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
Expand Down
14 changes: 7 additions & 7 deletions manifests/blackbox_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,19 @@
Boolean $service_enable = true,
String $service_ensure = 'running',
String $service_name = 'blackbox_exporter',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $config_mode = $prometheus::config_mode,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
String $config_mode = lookup('prometheus::config_mode'),
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
Hash $modules = {},
) inherits prometheus {
) {

# Prometheus added a 'v' on the release name at 0.1.0 of blackbox
if versioncmp ($version, '0.1.0') >= 0 {
Expand Down
12 changes: 6 additions & 6 deletions manifests/consul_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
String $os = lookup('prometheus::os'),
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
) {

# Prometheus added a 'v' on the realease name at 0.3.0
if versioncmp ($version, '0.3.0') == -1 {
Expand Down
14 changes: 7 additions & 7 deletions manifests/daemon.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,24 @@
$notify_service,
String $user,
String $group,
String $install_method = $prometheus::install_method,
String $download_extension = $prometheus::download_extension,
String $os = $prometheus::os,
String $arch = $prometheus::real_arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
String $install_method = lookup('prometheus::install_method'),
String $download_extension = lookup('prometheus::download_extension'),
String $os = lookup('prometheus::os'),
String $arch = lookup('prometheus::arch'),
Stdlib::Absolutepath $bin_dir = lookup('prometheus::bin_dir'),
Optional[String] $package_name = undef,
String $package_ensure = 'installed',
Boolean $manage_user = true,
Array $extra_groups = [],
Boolean $manage_group = true,
Boolean $purge = true,
String $options = '',
String $init_style = $prometheus::init_style,
String $init_style = lookup('prometheus::init_style'),
String $service_ensure = 'running',
Boolean $service_enable = true,
Boolean $manage_service = true,
Hash[String, Scalar] $env_vars = {},
Optional[String] $env_file_path = $prometheus::env_file_path,
Optional[String] $env_file_path = lookup('prometheus::env_file_path'),
) {

case $install_method {
Expand Down
12 changes: 6 additions & 6 deletions manifests/elasticsearch_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@
Boolean $restart_on_change = true,
Boolean $service_enable = true,
String $service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
) {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
Expand Down
14 changes: 7 additions & 7 deletions manifests/haproxy_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,18 @@
Boolean $purge_config_dir = true,
Boolean $restart_on_change = true,
Boolean $service_enable = true,
$service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
String $service_ensure = 'running',
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $arch = $prometheus::arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
Stdlib::Absolutepath $bin_dir = lookup('prometheus::bin_dir'),
) {

$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
$notify_service = $restart_on_change ? {
Expand Down
16 changes: 4 additions & 12 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
Array $extra_groups,
Stdlib::Absolutepath $bin_dir,
Stdlib::Absolutepath $shared_dir,
String $arch,
String $version,
String $install_method,
Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl] $download_url_base,
Expand All @@ -145,6 +146,7 @@
String $config_template,
String $config_mode,
Hash $global_config,
String $init_style,
Array $rule_files,
Array $scrape_configs,
Array $remote_read_configs,
Expand All @@ -159,32 +161,22 @@
String $service_ensure = 'running',
Boolean $manage_service = true,
Boolean $restart_on_change = true,
String $init_style = $facts['service_provider'],
String $extra_options = '',
Hash $config_hash = {},
Hash $config_defaults = {},
String $os = downcase($facts['kernel']),
Optional[String] $download_url = undef,
String $arch = $facts['architecture'],
Boolean $manage_group = true,
Boolean $purge_config_dir = true,
Boolean $manage_user = true,
) {

case $arch {
'x86_64', 'amd64': { $real_arch = 'amd64' }
'i386': { $real_arch = '386' }
default: {
fail("Unsupported kernel architecture: ${arch}")
}
}

if( versioncmp($::prometheus::version, '1.0.0') == -1 ){
$real_download_url = pick($download_url,
"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${real_arch}.${download_extension}")
"${download_url_base}/download/${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
} else {
$real_download_url = pick($download_url,
"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${real_arch}.${download_extension}")
"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
}
$notify_service = $restart_on_change ? {
true => Service['prometheus'],
Expand Down
12 changes: 6 additions & 6 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
extract_path => '/opt',
source => $prometheus::real_download_url,
checksum_verify => false,
creates => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/prometheus",
creates => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/prometheus",
cleanup => true,
}
-> file {
"/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/prometheus":
"/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/prometheus":
owner => 'root',
group => 0, # 0 instead of root because OS X uses "wheel".
mode => '0555';
"${prometheus::bin_dir}/prometheus":
ensure => link,
notify => $prometheus::notify_service,
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/prometheus";
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/prometheus";
"${prometheus::bin_dir}/promtool":
ensure => link,
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/promtool";
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/promtool";
$prometheus::shared_dir:
ensure => directory,
owner => $prometheus::user,
Expand All @@ -45,11 +45,11 @@
"${prometheus::shared_dir}/consoles":
ensure => link,
notify => $prometheus::notify_service,
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/consoles";
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/consoles";
"${prometheus::shared_dir}/console_libraries":
ensure => link,
notify => $prometheus::notify_service,
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::real_arch}/console_libraries";
target => "/opt/prometheus-${prometheus::version}.${prometheus::os}-${prometheus::arch}/console_libraries";
}
}
'package': {
Expand Down
12 changes: 6 additions & 6 deletions manifests/mesos_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,17 @@
Boolean $restart_on_change = true,
Boolean $service_enable = true,
String $service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheu::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
) {

$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
$notify_service = $restart_on_change ? {
Expand Down
14 changes: 7 additions & 7 deletions manifests/mongodb_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
String $cnf_uri,
String $download_extension,
String $download_url_base,
Array $extra_groups,
Array[String] $extra_groups,
String $group,
String $package_ensure,
String $package_name,
Expand All @@ -86,17 +86,17 @@
Boolean $restart_on_change = true,
Boolean $service_enable = true,
String $service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[String] $download_url = undef,
String $arch = $prometheus::arch,
String $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
String $bin_dir = lookup('prometheus::bin_dir'),
) {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
Expand Down
14 changes: 7 additions & 7 deletions manifests/mysqld_exporter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,19 @@
Boolean $restart_on_change = true,
Boolean $service_enable = true,
String $service_ensure = 'running',
String $init_style = $prometheus::init_style,
String $install_method = $prometheus::install_method,
Optional[String] $init_style = lookup('prometheus::init_style'),
String $install_method = lookup('prometheus::install_method'),
Boolean $manage_group = true,
Boolean $manage_service = true,
Boolean $manage_user = true,
String $os = $prometheus::os,
String $os = lookup('prometheus::os'),
String $extra_options = '',
Optional[Variant[Stdlib::HTTPSUrl, Stdlib::HTTPUrl]] $download_url = undef,
String $config_mode = $prometheus::config_mode,
String $config_mode = lookup('prometheus::config_mode'),
Optional[Stdlib::Absolutepath] $cnf_socket = undef,
String $arch = $prometheus::arch,
Stdlib::Absolutepath $bin_dir = $prometheus::bin_dir,
) inherits prometheus {
String $arch = lookup('prometheus::arch'),
Stdlib::Absolutepath $bin_dir = lookup('prometheus::bin_dir'),
) {

#Please provide the download_url for versions < 0.9.0
$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
Expand Down
Loading