Recommit for updates in build 122

This commit is contained in:
Jenkins Server
2026-03-02 00:45:37 +01:00
parent 7bcfcafdde
commit 65ed23a60a
5 changed files with 21 additions and 21 deletions

View File

@@ -239,7 +239,7 @@ define confdroid_nagios::nagios::objects::add_contact (
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_target_add_contact = $confdroid_nagios::params::ng_target_add_contact $ng_target_add_contact = $confdroid_nagios::params::ng_target_add_contact
$ng_contacts_rule_erb = $confdroid_nagios::params::ng_contacts_rule_erb $ng_contacts_rule_erb = $confdroid_nagios::params::ng_contacts_rule_erb
$fqdn = $facts['networking']['fqdn'] $fqdn = $confdroid_nagios::params::fqdn
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
concat::fragment { $name: concat::fragment { $name:

View File

@@ -206,7 +206,7 @@ define confdroid_nagios::nagios::objects::add_contactgroups (
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_tgt_contactgroup_add = $confdroid_nagios::params::ng_tgt_contactgroup_add $ng_tgt_contactgroup_add = $confdroid_nagios::params::ng_tgt_contactgroup_add
$ng_cntctgrps_rule_erb = $confdroid_nagios::params::ng_cntctgrps_rule_erb $ng_cntctgrps_rule_erb = $confdroid_nagios::params::ng_cntctgrps_rule_erb
$fqdn = $facts['networking']['fqdn'] $fqdn = $confdroid_nagios::params::fqdn
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
concat::fragment { $name: concat::fragment { $name:

View File

@@ -197,7 +197,7 @@ define confdroid_nagios::nagios::objects::add_hostgroups (
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_tgt_hostgroup_add = $confdroid_nagios::params::ng_tgt_hostgroup_add $ng_tgt_hostgroup_add = $confdroid_nagios::params::ng_tgt_hostgroup_add
$ng_tgt_hostgrp_rule_erb = $confdroid_nagios::params::ng_tgt_hostgrp_rule_erb $ng_tgt_hostgrp_rule_erb = $confdroid_nagios::params::ng_tgt_hostgrp_rule_erb
$fqdn = $facts['networking']['fqdn'] $fqdn = $confdroid_nagios::params::fqdn
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
concat::fragment { $name: concat::fragment { $name:

View File

@@ -199,7 +199,7 @@ define confdroid_nagios::nagios::objects::add_servicegroups (
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_tgt_servicegroup_add = $confdroid_nagios::params::ng_tgt_servicegroup_add $ng_tgt_servicegroup_add = $confdroid_nagios::params::ng_tgt_servicegroup_add
$ng_tgt_svcgrp_rule_erb = $confdroid_nagios::params::ng_tgt_svcgrp_rule_erb $ng_tgt_svcgrp_rule_erb = $confdroid_nagios::params::ng_tgt_svcgrp_rule_erb
$fqdn = $facts['networking']['fqdn'] $fqdn = $confdroid_nagios::params::fqdn
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
concat::fragment { $name: concat::fragment { $name:

View File

@@ -150,7 +150,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -168,7 +168,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -186,7 +186,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -204,7 +204,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -222,7 +222,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -240,7 +240,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -258,7 +258,7 @@ external Puppet rules.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;00:00-00:00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;00:00-24:00&#39;</tt>)</em>
&mdash; &mdash;
@@ -312,19 +312,19 @@ define confdroid_nagios::nagios::objects::add_timeperiods (
Optional[String] $ng_timep_name = undef, Optional[String] $ng_timep_name = undef,
Optional[String] $ng_timep_alias = undef, Optional[String] $ng_timep_alias = undef,
String $ng_timep_monday = &#39;00:00-00:00&#39;, String $ng_timep_monday = &#39;00:00-24:00&#39;,
String $ng_timep_tuesday = &#39;00:00-00:00&#39;, String $ng_timep_tuesday = &#39;00:00-24:00&#39;,
String $ng_timep_wednesday = &#39;00:00-00:00&#39;, String $ng_timep_wednesday = &#39;00:00-24:00&#39;,
String $ng_timep_thursday = &#39;00:00-00:00&#39;, String $ng_timep_thursday = &#39;00:00-24:00&#39;,
String $ng_timep_friday = &#39;00:00-00:00&#39;, String $ng_timep_friday = &#39;00:00-24:00&#39;,
String $ng_timep_saturday = &#39;00:00-00:00&#39;, String $ng_timep_saturday = &#39;00:00-24:00&#39;,
String $ng_timep_sunday = &#39;00:00-00:00&#39;, String $ng_timep_sunday = &#39;00:00-24:00&#39;,
) { ) {
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_tgt_timep_add = $confdroid_nagios::params::ng_tgt_timep_add $ng_tgt_timep_add = $confdroid_nagios::params::ng_tgt_timep_add
$ng_tgt_timep_rule_erb = $confdroid_nagios::params::ng_tgt_timep_rule_erb $ng_tgt_timep_rule_erb = $confdroid_nagios::params::ng_tgt_timep_rule_erb
$fqdn = $facts[&#39;network&#39;][&#39;fqdn&#39;] $fqdn = $confdroid_nagios::params::fqdn
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
concat::fragment { $name: concat::fragment { $name: