Merge pull request #105 from Icinga/enhancement/logging-level-warning…

…-by-default Set logging_level to warning by default
voxpupuli · Dec 31, 2023 · d260ee5 · d260ee5
2 parents d8f44ec + 1d91e93
commit d260ee5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -120,12 +120,10 @@ Default value: `'file'`
 
 ##### <a name="-icinga--agent--logging_level"></a>`logging_level`
 
-Data type: `Optional[Icinga::LogLevel]`
+Data type: `Icinga::LogLevel`
 
 Set the log level.
 
-Default value: `undef`
-
 ##### <a name="-icinga--agent--zone"></a>`zone`
 
 Data type: `String`
@@ -714,12 +712,10 @@ Default value: `'file'`
 
 ##### <a name="-icinga--server--logging_level"></a>`logging_level`
 
-Data type: `Optional[Icinga::LogLevel]`
+Data type: `Icinga::LogLevel`
 
 Set the log level.
 
-Default value: `undef`
-
 ##### <a name="-icinga--server--run_web"></a>`run_web`
 
 Data type: `Boolean`
@@ -1839,12 +1835,10 @@ Default value: `'file'`
 
 ##### <a name="-icinga--worker--logging_level"></a>`logging_level`
 
-Data type: `Optional[Icinga::LogLevel]`
+Data type: `Icinga::LogLevel`
 
 Set the log level.
 
-Default value: `undef`
-
 ##### <a name="-icinga--worker--run_web"></a>`run_web`
 
 Data type: `Boolean`

diff --git 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
@@ -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
@@ -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
@@ -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