Merge pull request #760 from cruelsmith/main

Fix not working object export on not icinga agent or server

Author: Lennart Betz

manifests/object/apiuser.pp

@@ -26,7 +26,7 @@
 #         permission => 'objects/query/Host',
 #         filter     => '{{ regex("^Linux", host.vars.os) }}'
 #       },
-#       { 
+#       {
 #         permission => 'objects/query/Service',
 #         filter     => '{{ regex("^Linux", host.vars.os) }}'
 #       },
@@ -70,6 +70,8 @@
   Variant[String, Integer]                      $order        = 30,
   Variant[Array[String], String]                $export       = [],
 ) {
+  require icinga2::globals
+
   $_password = if $password =~ String {
     Sensitive($password)
   } elsif $password =~ Sensitive {

manifests/object/checkcommand.pp

@@ -56,6 +56,8 @@
   Variant[String, Integer]            $order             = 15,
   Variant[Array[String], String]      $export            = [],
 ) {
+  require icinga2::globals
+
   # compose the attributes
   $attrs = {
     'command'   => $command,

manifests/object/checkresultreader.pp

@@ -24,6 +24,8 @@
   Optional[Stdlib::Absolutepath]     $spool_dir              = undef,
   Variant[String, Integer]           $order                  = '05',
 ) {
+  require icinga2::globals
+
   # compose the attributes
   $attrs = {
     'spool_dir'   => $spool_dir,

manifests/object/dependency.pp

@@ -94,6 +94,8 @@
   Variant[String, Integer]       $order                 = 70,
   Variant[Array[String], String] $export                = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'parent_host_name'      => $parent_host_name,

manifests/object/endpoint.pp

@@ -39,6 +39,7 @@
   Variant[String, Integer]              $order         = 40,
   Variant[Array[String], String]        $export        = [],
 ) {
+  require icinga2::globals
   $conf_dir = $icinga2::globals::conf_dir
 
   if $target {

manifests/object/eventcommand.pp

@@ -52,6 +52,8 @@
   Variant[String, Integer]            $order             = 20,
   Variant[Array[String], String]      $export            = [],
 ) {
+  require icinga2::globals
+
   # compose the attributes
   $attrs = {
     'command'   => $command,

manifests/object/host.pp

@@ -147,6 +147,8 @@
   Variant[String, Integer]            $order                   = 50,
   Variant[Array[String], String]      $export                  = [],
 ) {
+  require icinga2::globals
+
   # compose the attributes
   $attrs = {
     'address'                 => $address,

manifests/object/hostgroup.pp

@@ -48,6 +48,8 @@
   Variant[String, Integer]       $order          = 55,
   Variant[Array[String], String] $export         = [],
 ) {
+  require icinga2::globals
+
   if $ignore != [] and $assign == [] {
     fail('When attribute ignore is used, assign must be set.')
   }

manifests/object/icingaapplication.pp

@@ -59,6 +59,7 @@
   Variant[String, Integer]              $order                 = 5,
   Variant[Array[String], String]        $export                = [],
 ) {
+  require icinga2::globals
   $conf_dir = $icinga2::globals::conf_dir
 
   # set defaults

manifests/object/notification.pp

@@ -107,6 +107,8 @@
   Variant[String, Integer]                                            $order             = 85,
   Variant[Array[String], String]                                      $export            = [],
 ) {
+  require icinga2::globals
+
   if $ignore != [] and $assign == [] {
     fail('When attribute ignore is used, assign must be set.')
   }

manifests/object/notificationcommand.pp

@@ -57,6 +57,8 @@
   Variant[String, Integer]             $order                    = 25,
   Variant[Array[String], String]       $export                   = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'command'   => $command,

manifests/object/scheduleddowntime.pp

@@ -73,6 +73,8 @@
   Variant[String, Integer]        $order                  = 90,
   Variant[Array[String], String]  $export                 = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'host_name'    => $host_name,

manifests/object/service.pp

@@ -188,6 +188,8 @@
   Variant[String, Integer]                   $order                   = 60,
   Variant[Array[String], String]             $export                  = [],
 ) {
+  require icinga2::globals
+
   # compose the attributes
   $attrs = {
     'display_name'            => $display_name,

manifests/object/servicegroup.pp

@@ -48,6 +48,8 @@
   Variant[String, Integer]       $order             = 65,
   Variant[Array[String], String] $export            = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'display_name'  => $display_name,

manifests/object/timeperiod.pp

@@ -52,6 +52,8 @@
   Variant[String, Integer]       $order           = 35,
   Variant[Array[String], String] $export          = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'display_name'    => $display_name,

manifests/object/user.pp

@@ -72,6 +72,8 @@
   Variant[String, Integer]            $order                = 75,
   Variant[Array[String], String]      $export               = [],
 ) {
+  require icinga2::globals
+
   # compose attributes
   $attrs = {
     'display_name'         => $display_name,

manifests/object/usergroup.pp

@@ -48,6 +48,8 @@
   Variant[String, Integer]       $order          = 80,
   Variant[Array[String], String] $export         = [],
 ) {
+  require icinga2::globals
+
   if $ignore != [] and $assign == [] {
     fail('When attribute ignore is used, assign must be set.')
   }

manifests/object/zone.pp

@@ -37,6 +37,7 @@
   Variant[String, Integer]           $order     = 45,
   Variant[Array[String], String]     $export    = [],
 ) {
+  require icinga2::globals
   $conf_dir = $icinga2::globals::conf_dir
 
   # set defaults