confdroid/confdroid_automatic
1
0
Fork 0
Code Issues Projects Wiki Activity

Compare commits

base: confdroid:master
Branches Tags
confdroid:master
confdroid:1.1.0-04.2026 confdroid:1.0.0
..
compare: confdroid:e56fe3966cf98df06fd00acbd6fb9e0bfeb128b5
Branches Tags
confdroid:master
confdroid:1.1.0-04.2026 confdroid:1.0.0

1 Commits
master ... e56fe3966c

Author SHA1 Message Date
Jenkins
e56fe3966c Merge branch 'jenkins-build-10' into 'master' 
Auto-merge for build 10

See merge request puppet/confdroid_automatic!8
 2026-04-30 11:52:32 +02:00
9 changed files with 13 additions and 353 deletions
Expand all files Collapse all files

5
doc/_index.html
View File

@@ -98,11 +98,6 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_automatic::monitoring::target (puppet_class)">confdroid_automatic::monitoring::target</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_automatic_3A_3Aparams.html" title="puppet_classes::confdroid_automatic::params (puppet_class)">confdroid_automatic::params</a></span>

9
doc/puppet_class_list.html
View File

@@ -78,14 +78,7 @@
</li>
<li id="object_puppet_classes::confdroid_automatic::monitoring::target" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_automatic::monitoring::target (puppet_class)">confdroid_automatic::monitoring::target</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_automatic::params" class="even">
<li id="object_puppet_classes::confdroid_automatic::params" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_automatic_3A_3Aparams.html" title="puppet_classes::confdroid_automatic::params (puppet_class)">confdroid_automatic::params</a></span>
</div>

10
doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html
View File

@@ -105,11 +105,7 @@
7
8
9
10
11
12
13
14</pre>
10</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -118,10 +114,6 @@ class confdroid_automatic::main::config (
) inherits confdroid_automatic::params {
include confdroid_automatic::main::service
if $ac_manage_nagios == true {
include confdroid_automatic::monitoring::target
}
}</pre>
</td>
</tr>

156
doc/puppet_classes/confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html
View File

@@ -1,156 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: confdroid_automatic::monitoring::target
&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_automatic::monitoring::target";
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_automatic::monitoring::target</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_automatic::monitoring::target</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="confdroid_automatic_3A_3Aparams.html" title="puppet_classes::confdroid_automatic::params (puppet_class)">confdroid_automatic::params</a></span></dd>
</dl>
<dl>
<dt>Defined in:</dt>
<dd>
manifests/monitoring/target.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Class manages services for the confdroid_automatic module
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_automatic::monitoring::target.pp Module name: confdroid_automatic Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
<div class="tags">
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
class confdroid_automatic::monitoring::target (
) inherits confdroid_automatic::params {
if $ac_manage_nagios == true {
@@nagios_service { &quot;check_automatic_${fqdn}&quot;:
check_command =&gt; &quot;check_nrpe!check_automatic!${ac_procs_allowed}!automatic-service&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $fqdn,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${fqdn}_check_automatic&quot;,
target =&gt; $ac_target_service,
owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;0640&#39;,
contacts =&gt; $ac_target_contacts,
}
}
}</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>

134
doc/puppet_classes/confdroid_automatic_3A_3Aparams.html
View File

@@ -77,8 +77,6 @@
<span class='object_link'><a href="confdroid_automatic_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_automatic::main::service (puppet_class)">confdroid_automatic::main::service</a></span><br/>
<span class='object_link'><a href="confdroid_automatic_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_automatic::monitoring::target (puppet_class)">confdroid_automatic::monitoring::target</a></span><br/>
</dd>
</dl>
@@ -302,96 +300,6 @@
&mdash;
<div class='inline'>
<p>which host to use to send the email</p>
</div>
</li>
<li>
<span class='name'>ac_excludepkgs</span>
<span class='type'>(<tt>Variant[String, Array[String]]</tt>)</span>
<em class="default">(defaults to: <tt>[]</tt>)</em>
&mdash;
<div class='inline'>
<p>packages to exclude from updates</p>
</div>
</li>
<li>
<span class='name'>ac_manage_nagios</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage nagios monitoring</p>
</div>
</li>
<li>
<span class='name'>ac_target_service</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/automatic_service.cfg&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>where to write the nagios service config</p>
</div>
</li>
<li>
<span class='name'>ac_target_contacts</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;nagiosadmin&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>which nagios contacts to use</p>
</div>
</li>
<li>
<span class='name'>ac_procs_allowed</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>how many processes are allowed to run</p>
</div>
</li>
@@ -407,6 +315,11 @@
<pre class="lines">
18
19
20
21
22
23
24
25
@@ -434,33 +347,15 @@
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67</pre>
50</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 23</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 18</span>
class confdroid_automatic::params (
String $ac_reqpackages = &#39;dnf-automatic&#39;,
String $ac_pkg_ensure = &#39;latest&#39;,
Variant[String, Array[String]] $ac_excludepkgs = [],
String $ac_reqpackages = &#39;dnf-automatic&#39;,
String $ac_pkg_ensure = &#39;latest&#39;,
# updates
String $ac_upgrade_type = &#39;default&#39;,
@@ -473,12 +368,6 @@ class confdroid_automatic::params (
String $ac_email_to = &#39;root@example.net&#39;,
String $ac_email_host = &#39;localhost&#39;,
# monitoring
Boolean $ac_manage_nagios = false,
String $ac_target_service = &#39;/etc/nagios/conf.d/automatic_service.cfg&#39;,
String $ac_target_contacts = &#39;nagiosadmin&#39;,
String $ac_procs_allowed = &#39;1:&#39;,
) {
# Facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
@@ -493,11 +382,6 @@ class confdroid_automatic::params (
$ac_main_config = &#39;/etc/dnf/automatic.conf&#39;
$ac_main_config_erb = &#39;confdroid_automatic/automatic.conf.erb&#39;
$ac_excludepkgs_normalized = $ac_excludepkgs ? {
Array =&gt; join($ac_excludepkgs, &#39;,&#39;),
default =&gt; $ac_excludepkgs,
}
# includes must be last
include confdroid_automatic::main::config
}</pre>

4
manifests/main/config.pp
View File

@@ -7,8 +7,4 @@ class confdroid_automatic::main::config (
) inherits confdroid_automatic::params {
include confdroid_automatic::main::service
if $ac_manage_nagios == true {
include confdroid_automatic::monitoring::target
}
}

23
manifests/monitoring/target.pp
View File

@@ -1,23 +0,0 @@
## confdroid_automatic::monitoring::target.pp
# Module name: confdroid_automatic
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages services for the confdroid_automatic module
##############################################################################
class confdroid_automatic::monitoring::target (
) inherits confdroid_automatic::params {
if $ac_manage_nagios == true {
@@nagios_service { "check_automatic_${fqdn}":
check_command => "check_nrpe!check_automatic!${ac_procs_allowed}!automatic-service",
use => 'generic-service',
host_name => $fqdn,
notification_period => '24x7',
service_description => "${fqdn}_check_automatic",
target => $ac_target_service,
owner => 'nagios',
group => 'nagios',
mode => '0640',
contacts => $ac_target_contacts,
}
}
}

21
manifests/params.pp
View File

@@ -14,17 +14,11 @@
# @param [String] ac_emit_via how to inform about emitted updates
# @param [String] ac_email_to where to send the email to
# @param [String] ac_email_host which host to use to send the email
# @param [Variant[String,Array[String]]] ac_excludepkgs packages to exclude from updates
# @param [Boolean] ac_manage_nagios whether to manage nagios monitoring
# @param [String] ac_target_service where to write the nagios service config
# @param [String] ac_target_contacts which nagios contacts to use
# @param [String] ac_procs_allowed how many processes are allowed to run
##############################################################################
class confdroid_automatic::params (
String $ac_reqpackages = 'dnf-automatic',
String $ac_pkg_ensure = 'latest',
Variant[String, Array[String]] $ac_excludepkgs = [],
String $ac_reqpackages = 'dnf-automatic',
String $ac_pkg_ensure = 'latest',
# updates
String $ac_upgrade_type = 'default',
@@ -37,12 +31,6 @@ class confdroid_automatic::params (
String $ac_email_to = 'root@example.net',
String $ac_email_host = 'localhost',
# monitoring
Boolean $ac_manage_nagios = false,
String $ac_target_service = '/etc/nagios/conf.d/automatic_service.cfg',
String $ac_target_contacts = 'nagiosadmin',
String $ac_procs_allowed = '1:',
) {
# Facts
$fqdn = $facts['networking']['fqdn']
@@ -57,11 +45,6 @@ class confdroid_automatic::params (
$ac_main_config = '/etc/dnf/automatic.conf'
$ac_main_config_erb = 'confdroid_automatic/automatic.conf.erb'
$ac_excludepkgs_normalized = $ac_excludepkgs ? {
Array => join($ac_excludepkgs, ','),
default => $ac_excludepkgs,
}
# includes must be last
include confdroid_automatic::main::config
}

4
templates/automatic.conf.erb
View File

@@ -93,9 +93,5 @@ email_to = <%= @ac_email_to %>
[base]
# This section overrides dnf.conf
<% unless @ac_excludepkgs_normalized.empty? -%>
excludepkgs = <%= @ac_excludepkgs_normalized %>
<% end -%>
# Use this to filter DNF core messages
debuglevel = 1