Skip to content

Commit 25b144a

Browse files
committed
feat: moved profile::puppet and all the monitoring setup to dry-mode
1 parent 039eafb commit 25b144a

29 files changed

+76
-67
lines changed

modules/enableit/common/data/role/role::basic.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
common::puppet::noop_value: true
3+
common::monitor::noop_value: true
24
common::full_host_management: false
35
common::system::updates::enable: false
46
common::monitoring::manage: true

modules/enableit/common/manifests/monitor.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# @param enable Whether to enable monitoring. Defaults to the value of $::obmondo_monitoring_status.
44
#
55
class common::monitor (
6-
Boolean $enable = $::obmondo_monitoring_status,
6+
Boolean $enable = $::obmondo_monitoring_status,
7+
Boolean $noop_value = true,
78
) {
89
if $enable {
910
contain ::monitor

modules/enableit/common/manifests/monitor/exporter.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
class common::monitor::exporter (
1010
Boolean $enable = $common::monitor::enable,
11-
Optional[Boolean] $noop_value = false,
11+
Optional[Boolean] $noop_value = $common::monitor::noop_value,
1212
Stdlib::Absolutepath $config_dir = '/opt/obmondo/etc/exporter',
1313
) {
1414
file { $config_dir :

modules/enableit/common/manifests/monitor/exporter/blackbox.pp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
#
55
# @param listen_port The port on which the exporter listens.
66
#
7-
# @param noop_value (Optional) Boolean to indicate if operations should be in noop mode. Defaults to false.
7+
# @param noop_value (Optional) Boolean to indicate if operations should be in noop mode. Defaults to $common::monitor::exporter::noop_value.
88
#
9-
# @param config_file The absolute path to the configuration file. Defaults to "${::common::monitor::exporter::config_dir}/blackbox.yml".
9+
# @param config_file The absolute path to the configuration file. Defaults to "${common::monitor::exporter::config_dir}/blackbox.yml".
1010
#
1111
# @param targets An array of domain targets to monitor. Defaults to an empty array.
1212
#
1313
class common::monitor::exporter::blackbox (
1414
Boolean $enable,
1515
Stdlib::Port $listen_port,
16-
Boolean $noop_value = false,
17-
Stdlib::Absolutepath $config_file = "${::common::monitor::exporter::config_dir}/blackbox.yml",
16+
Boolean $noop_value = $common::monitor::exporter::noop_value,
17+
Stdlib::Absolutepath $config_file = "${common::monitor::exporter::config_dir}/blackbox.yml",
18+
1819
Array[Eit_types::Monitor::Domains] $targets = [],
1920
) {
2021

modules/enableit/common/manifests/monitor/exporter/cadvisor.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class common::monitor::exporter::cadvisor (
1212
Boolean $enable = $common::monitor::exporter::enable,
13-
Boolean $noop_value = false,
13+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1414
Stdlib::Port $listen_port = 63392,
1515
Eit_types::Certname $host = $trusted['certname'],
1616
) {

modules/enableit/common/manifests/monitor/exporter/dellhw.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class common::monitor::exporter::dellhw (
1212
Boolean $enable = false,
13-
Boolean $noop_value = false,
13+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1414
Boolean $manage_repo = false,
1515
Eit_types::IPPort $listen_address = '127.254.254.254:63386',
1616
) {

modules/enableit/common/manifests/monitor/exporter/dns.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
class common::monitor::exporter::dns (
1414
Boolean $enable = $common::monitor::exporter::enable,
15-
Boolean $noop_value = false,
15+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1616
Eit_types::IPPort $listen_address = '127.254.254.254:63395',
1717
Eit_types::Duration::Seconds $interval_seconds = 120,
1818
Array[Eit_types::Hostname] $domains = [

modules/enableit/common/manifests/monitor/exporter/elasticsearch.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
class common::monitor::exporter::elasticsearch (
1010
Boolean $enable = $common::monitor::exporter::enable,
1111
Eit_types::IPPort $listen_address = '127.254.254.254:9105',
12-
Boolean $noop_value = false
12+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1313
) {
1414
class { 'prometheus::elasticsearch_exporter':
1515
package_name => 'obmondo-elasticsearch-exporter',

modules/enableit/common/manifests/monitor/exporter/filestat.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
class common::monitor::exporter::filestat (
1616
Boolean $enable = false,
17-
Boolean $noop_value = false,
17+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1818
Stdlib::Absolutepath $config_file = "${common::monitor::exporter::config_dir}/filestat_exporter.yaml",
1919
Stdlib::Absolutepath $working_directory = '/backup',
2020
Array[String] $file_pattern = [],

modules/enableit/common/manifests/monitor/exporter/gitlab_runner.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class common::monitor::exporter::gitlab_runner (
1212
Boolean $enable = $common::monitor::exporter::enable,
13-
Boolean $noop_value = false,
13+
Boolean $noop_value = $common::monitor::exporter::noop_value,
1414
Eit_types::IPPort $listen_address = '127.254.254.254:63384',
1515
Eit_types::Certname $host = $trusted['certname'],
1616
) {

0 commit comments

Comments
 (0)