Recommit for updates in build 85

This commit is contained in:
Jenkins Server
2026-03-01 14:47:55 +01:00
parent 4aa0eaa9c2
commit b40a4dbc2d
8 changed files with 494 additions and 16 deletions

View File

@@ -98,6 +98,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::confdroid_nagios::nagios::objects::add_contact_rules (puppet_class)">confdroid_nagios::nagios::objects::add_contact_rules</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::confdroid_nagios::nagios::objects::commands (puppet_class)">confdroid_nagios::nagios::objects::commands</a></span>
@@ -154,6 +159,11 @@
<li class="letter">C</li>
<ul>
<li>
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html" title="puppet_defined_types::confdroid_nagios::nagios::objects::add_contact (puppet_defined_type)">confdroid_nagios::nagios::objects::add_contact</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html" title="puppet_defined_types::confdroid_nagios::nagios::resources::resource_df (puppet_defined_type)">confdroid_nagios::nagios::resources::resource_df</a></span>

View File

@@ -82,49 +82,56 @@
</li>
<li id="object_puppet_classes::confdroid_nagios::nagios::objects::commands" class="odd">
<li id="object_puppet_classes::confdroid_nagios::nagios::objects::add_contact_rules" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::confdroid_nagios::nagios::objects::add_contact_rules (puppet_class)">confdroid_nagios::nagios::objects::add_contact_rules</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::nagios::objects::commands" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::confdroid_nagios::nagios::objects::commands (puppet_class)">confdroid_nagios::nagios::objects::commands</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::nagios::resources::resource" class="even">
<li id="object_puppet_classes::confdroid_nagios::nagios::resources::resource" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html" title="puppet_classes::confdroid_nagios::nagios::resources::resource (puppet_class)">confdroid_nagios::nagios::resources::resource</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::params" class="odd">
<li id="object_puppet_classes::confdroid_nagios::params" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::access_rules" class="even">
<li id="object_puppet_classes::confdroid_nagios::server::access_rules" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::confdroid_nagios::server::access_rules (puppet_class)">confdroid_nagios::server::access_rules</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::files" class="odd">
<li id="object_puppet_classes::confdroid_nagios::server::files" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_nagios::server::files (puppet_class)">confdroid_nagios::server::files</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::nagios" class="even">
<li id="object_puppet_classes::confdroid_nagios::server::nagios" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::service" class="odd">
<li id="object_puppet_classes::confdroid_nagios::server::service" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span>
</div>

View File

@@ -131,7 +131,7 @@ class confdroid_nagios::nagios::config (
require confdroid_nagios::nagios::objects::commands
#require confdroid_nagios::nagios::objects::template_rules
#require confdroid_nagios::nagios::objects::contacts
#require confdroid_nagios::nagios::objects::add_contact_rules
require confdroid_nagios::nagios::objects::add_contact_rules
#require confdroid_nagios::nagios::objects::contactgroups
#require confdroid_nagios::nagios::objects::add_contactgroups_rules
#require confdroid_nagios::nagios::objects::hostgroups

View File

@@ -0,0 +1,193 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: confdroid_nagios::nagios::objects::add_contact_rules
&mdash; Documentation by YARD 0.9.36
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" />
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::confdroid_nagios::nagios::objects::add_contact_rules";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_class_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">confdroid_nagios::nagios::objects::add_contact_rules</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: confdroid_nagios::nagios::objects::add_contact_rules</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span></dd>
</dl>
<dl>
<dt>Defined in:</dt>
<dd>
manifests/nagios/objects/add_contact_rules.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Class manages /etc/nagios/conf.d/nagios_add_contact.cfg through
concat.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_nagios::nagios::objects::add_contact_rules.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
<div class="tags">
<div class="examples">
<p class="tag_title">Examples:</p>
<p class="example_title"><div class='inline'>
<p>confdroid_nagios::nagios::objects::add_contact { example_user:</p>
</div></p>
<pre class="example code"><code>ng_contact_name =&gt; &#39;example_user&#39;,
ng_contact_alias =&gt; &#39;Example User&#39;,
ng_contact_groups =&gt; &#39;admins&#39;,
ng_contact_email =&gt; &#39;example@example.net&#39;,
}</code></pre>
</div>
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact_rules.pp', line 13</span>
class confdroid_nagios::nagios::objects::add_contact_rules (
) inherits confdroid_nagios::params {
if $ng_nagios_server == $fqdn {
# manage /etc/nagios/conf.d/nagios_add_contacts.cfg
concat { $ng_target_add_contact:
ensure =&gt; present,
path =&gt; $ng_target_add_contact,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_etc_t,
seluser =&gt; system_u,
notify =&gt; Service[$ng_service],
}
# manage file header
concat::fragment { &#39;contact_header&#39;:
target =&gt; $ng_target_add_contact,
content =&gt; template($ng_contacts_head_erb),
order =&gt; &#39;000&#39;,
}
}
}</pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>

View File

@@ -327,7 +327,7 @@ class confdroid_nagios::nagios::objects::commands (
ensure =&gt; present,
command_name =&gt; &#39;notify-host-by-email&#39;,
command_line =&gt; &#39;/usr/bin/printf &quot;%b&quot; &quot;***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n&quot; | /bin/mail -s &quot;** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **&quot; $CONTACTEMAIL$&#39;,
owner =&gt; &#39;nagions&#39;,
owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;0640&#39;,
target =&gt; $ng_target_command,

View File

@@ -89,6 +89,8 @@
<span class='object_link'><a href="confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html" title="puppet_classes::confdroid_nagios::nagios::resources::resource (puppet_class)">confdroid_nagios::nagios::resources::resource</a></span><br/>
<span class='object_link'><a href="confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::confdroid_nagios::nagios::objects::add_contact_rules (puppet_class)">confdroid_nagios::nagios::objects::add_contact_rules</a></span><br/>
</dd>
</dl>
@@ -423,8 +425,7 @@ inherited by all classes except defines.
141
142
143
144
145</pre>
144</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
@@ -478,6 +479,8 @@ class confdroid_nagios::params (
# files
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;confdroid_nagios/nagios/nagios_cfg.erb&#39;
$ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot;
$ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
# nagios
$ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
@@ -518,9 +521,6 @@ class confdroid_nagios::params (
$ng_resource_erb = &#39;confdroid_nagios/nagios/resource_cfg.erb&#39;
## old
$ng_main_config = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot;
$ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
$ng_taccgi_erb = &#39;confdroid_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;confdroid_nagios/selinux/statuscgi.erb&#39;
$ng_statdat_erb = &#39;confdroid_nagios/selinux/statusdat.erb&#39;

View File

@@ -40,14 +40,21 @@
<ul id="full_list" class="puppet_defined_type">
<li id="object_puppet_defined_types::confdroid_nagios::nagios::resources::resource_df" class="odd">
<li id="object_puppet_defined_types::confdroid_nagios::nagios::objects::add_contact" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html" title="puppet_defined_types::confdroid_nagios::nagios::objects::add_contact (puppet_defined_type)">confdroid_nagios::nagios::objects::add_contact</a></span>
</div>
</li>
<li id="object_puppet_defined_types::confdroid_nagios::nagios::resources::resource_df" class="even">
<div class="item">
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html" title="puppet_defined_types::confdroid_nagios::nagios::resources::resource_df (puppet_defined_type)">confdroid_nagios::nagios::resources::resource_df</a></span>
</div>
</li>
<li id="object_puppet_defined_types::confdroid_nagios::server::access" class="even">
<li id="object_puppet_defined_types::confdroid_nagios::server::access" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::confdroid_nagios::server::access (puppet_defined_type)">confdroid_nagios::server::access</a></span>
</div>

View File

@@ -0,0 +1,261 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Defined Type: confdroid_nagios::nagios::objects::add_contact
&mdash; Documentation by YARD 0.9.36
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" />
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_defined_types::confdroid_nagios::nagios::objects::add_contact";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_defined_type_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Defined Types</span></span>
&raquo;
<span class="title">confdroid_nagios::nagios::objects::add_contact</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Defined Type: confdroid_nagios::nagios::objects::add_contact</h1>
<div class="box_info">
<dl>
<dt>Defined in:</dt>
<dd>
manifests/nagios/objects/add_contact.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Define manages additional contacts known to NAGIOS through external
Puppet rules, and populates /etc/nagios/conf.d/nagios_add_contact.cfg.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_nagios::nagios::objects::add_contact.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
<div class="tags">
<div class="examples">
<p class="tag_title">Examples:</p>
<pre class="example code"><code>confdroid_nagios::nagios::objects::add_contact { &#39;example_user&#39;:
ng_contact_name =&gt; &#39;example_user&#39;,
ng_contact_alias =&gt; &#39;Example User&#39;,
ng_contact_groups =&gt; &#39;admins&#39;,
ng_contact_email =&gt; &#39;example@example.net&#39;,
}</code></pre>
</div>
<p class="tag_title">Parameters:</p>
<ul class="param">
<li>
<span class='name'>ng_contact_name</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>Specify the contact short name.</p>
</div>
</li>
<li>
<span class='name'>ng_contact_use</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;generic-contact&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>which contact template to use</p>
</div>
</li>
<li>
<span class='name'>ng_contact_alias</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>Specify the contact alias (long name).</p>
</div>
</li>
<li>
<span class='name'>ng_contact_email</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>Specify the contact email address.</p>
</div>
</li>
<li>
<span class='name'>ng_contact_groups</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>specify the contact group for the contact.</p>
</div>
</li>
</ul>
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact.pp', line 19</span>
define confdroid_nagios::nagios::objects::add_contact (
Optional[String] $ng_contact_name = undef,
String $ng_contact_use = &#39;generic-contact&#39;,
Optional[String] $ng_contact_alias = undef,
Optional[String] $ng_contact_email = undef,
Optional[String] $ng_contact_groups = undef,
) {
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_target_add_contact = $confdroid_nagios::params::ng_target_add_contact
$ng_contacts_rule_erb = $confdroid_nagios::params::ng_contacts_rule_erb
if $ng_nagios_server == $fqdn {
concat::fragment { $name:
target =&gt; $ng_target_add_contact,
content =&gt; template($ng_contacts_rule_erb),
}
}
}</pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>