From 1d91e9336f74b46c2deaed88a89dd8ae24252c4b Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Sun, 31 Dec 2023 11:09:49 +0100 Subject: [PATCH] Set logging_level to warning by default --- REFERENCE.md | 12 +++--------- data/common.yaml | 4 ++++ manifests/agent.pp | 2 +- manifests/server.pp | 2 +- manifests/worker.pp | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 8e34071..5f6e635 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -120,12 +120,10 @@ Default value: `'file'` ##### `logging_level` -Data type: `Optional[Icinga::LogLevel]` +Data type: `Icinga::LogLevel` Set the log level. -Default value: `undef` - ##### `zone` Data type: `String` @@ -714,12 +712,10 @@ Default value: `'file'` ##### `logging_level` -Data type: `Optional[Icinga::LogLevel]` +Data type: `Icinga::LogLevel` Set the log level. -Default value: `undef` - ##### `run_web` Data type: `Boolean` @@ -1839,12 +1835,10 @@ Default value: `'file'` ##### `logging_level` -Data type: `Optional[Icinga::LogLevel]` +Data type: `Icinga::LogLevel` Set the log level. -Default value: `undef` - ##### `run_web` Data type: `Boolean` diff --git a/data/common.yaml b/data/common.yaml index 1915aac..ea66191 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -9,3 +9,7 @@ icinga::repos::manage_crb: false icinga::repos::manage_server_monitoring: false icinga::repos::manage_plugins: false icinga::repos::manage_extras: false + +icinga::server::logging_level: warning +icinga::worker::logging_level: warning +icinga::agent::logging_level: warning diff --git a/manifests/agent.pp b/manifests/agent.pp index caa68a9..fe01910 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -29,10 +29,10 @@ class icinga::agent ( Stdlib::Host $ca_server, Hash[String, Hash] $parent_endpoints, + Icinga::LogLevel $logging_level, String $parent_zone = 'main', Array[String] $global_zones = [], Enum['file', 'syslog', 'eventlog'] $logging_type = 'file', - Optional[Icinga::LogLevel] $logging_level = undef, String $zone = 'NodeName', Boolean $run_web = false, ) { diff --git a/manifests/server.pp b/manifests/server.pp index 899ed3c..e4001fa 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -49,6 +49,7 @@ # and add the Icinga user to this group. # class icinga::server ( + Icinga::LogLevel $logging_level, Boolean $ca = false, Boolean $config_server = false, String $zone = 'main', @@ -62,7 +63,6 @@ String $director_api_user = 'director', Optional[Icinga::Secret] $director_api_pass = undef, Enum['file', 'syslog', 'eventlog'] $logging_type = 'file', - Optional[Icinga::LogLevel] $logging_level = undef, Boolean $run_web = false, ) { if empty($colocation_endpoints) { diff --git a/manifests/worker.pp b/manifests/worker.pp index 18f74a6..cc87e4c 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -37,12 +37,12 @@ Stdlib::Host $ca_server, String $zone, Hash[String, Hash] $parent_endpoints, + Icinga::LogLevel $logging_level, String $parent_zone = 'main', Hash[String, Hash] $colocation_endpoints = {}, Hash[String, Hash] $workers = {}, Array[String] $global_zones = [], Enum['file', 'syslog', 'eventlog'] $logging_type = 'file', - Optional[Icinga::LogLevel] $logging_level = undef, Boolean $run_web = false, ) { # inject parent zone if no parent exists