Merge branch 'jenkins' into 'master'

Jenkins

See merge request !94
This commit is contained in:
12ww1160
2017-09-27 14:31:33 +02:00
43 changed files with 115 additions and 43 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c1203c268d86892">c1203c268d86892</a> Arne Teuke <i>2017-09-23 16:02:57</i>
<p>
<h3>updated documentation</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a1d795c52da9136">a1d795c52da9136</a> Jenkins Server <i>2017-09-23 16:01:52</i>
<p>
<h3>recommit for updates in build 156</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e6256e44f5fb204">e6256e44f5fb204</a> Arne Teuke <i>2017-09-18 16:57:19</i>
<p>
<h3>added service checks for nagios host including fqdn etc. so that nagios server can be treated both as nagios process and client</h3>

View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status|
|---|---|---|---|
|`cd_nagios`| 0.0.1.8 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
|`cd_nagios`| 0.0.1.9 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
### Synopsis
Nagios is a powerful open source software solution for monitoring your IT environments.

View File

@@ -123,6 +123,7 @@
| |-- checknagios.erb
| |-- checknrpe.erb
| |-- statuscgi.erb
| |-- statusdat.erb
| `-- taccgi.erb
|-- tests
| `-- UTF_Files
@@ -134,4 +135,4 @@
|-- README.md
`-- REPOSTRUCTURE.md
20 directories, 114 files
20 directories, 115 files

View File

@@ -281,7 +281,7 @@
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:38 2017 by
Generated on Wed Sep 27 14:29:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.8 | <a
|<code>cd_nagios</code>| 0.0.1.9 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -404,7 +404,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sat Sep 23 18:01:40 2017 by
Generated on Wed Sep 27 14:29:38 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.8 | <a
|<code>cd_nagios</code>| 0.0.1.9 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -404,7 +404,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sat Sep 23 18:01:39 2017 by
Generated on Wed Sep 27 14:29:36 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:41 2017 by
Generated on Wed Sep 27 14:29:38 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -384,7 +384,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:44 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -213,7 +213,7 @@ class cd_nagios::main::install (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -194,7 +194,7 @@ class cd_nagios::main::user (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -217,7 +217,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -575,7 +575,7 @@ class cd_nagios::nagios::objects::commands (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -5294,7 +5294,8 @@ particular item.</p>
1008
1009
1010
1011</pre>
1011
1012</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 653</span>
@@ -5595,6 +5596,7 @@ $ng_htpasswd_head = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
$ng_taccgi_erb = &#39;cd_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;cd_nagios/selinux/statuscgi.erb&#39;
$ng_statdat_erb = &#39;cd_nagios/selinux/statusdat.erb&#39;
$ng_checknrpe_erb = &#39;cd_nagios/selinux/checknrpe.erb&#39;
$ng_checknagios_erb = &#39;cd_nagios/selinux/checknagios.erb&#39;
$ng_nagios_conf = &#39;/etc/httpd/conf.d/nagios.conf&#39;
@@ -5665,7 +5667,7 @@ $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/us
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:44 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -220,7 +220,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
111
112
113
114</pre>
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 23</span>
@@ -315,6 +334,25 @@ class cd_nagios::selinux::config (
refreshonly =&gt; true,
notify =&gt; Service[$ng_service],
}
# sealert status.dat
exec { &#39;create_policy_statusdat&#39;:
command =&gt; template($ng_statdat_erb),
path =&gt; [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
cwd =&gt; $ng_user_home,
creates =&gt; &quot;${ng_user_home}/my-http.pp&quot;,
notify =&gt; Exec[&#39;semodule_statusdat&#39;],
}
exec { &#39;semodule_statusdat&#39;:
command =&gt; &#39;semodule -i my-http.pp&#39;,
path =&gt; [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
cwd =&gt; $ng_user_home,
require =&gt; Exec[&#39;create_policy_statusdat&#39;],
refreshonly =&gt; true,
notify =&gt; Service[$ng_service],
}
}
}</pre>
</td>
@@ -324,7 +362,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:45 2017 by
Generated on Wed Sep 27 14:29:42 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -532,7 +532,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:46 2017 by
Generated on Wed Sep 27 14:29:43 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -285,7 +285,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:48 2017 by
Generated on Wed Sep 27 14:29:45 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:49 2017 by
Generated on Wed Sep 27 14:29:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:48 2017 by
Generated on Wed Sep 27 14:29:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -245,7 +245,7 @@ $ng_tgt_svcgrp_rule_erb = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:49 2017 by
Generated on Wed Sep 27 14:29:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -370,7 +370,7 @@ $ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:48 2017 by
Generated on Wed Sep 27 14:29:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -906,7 +906,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:48 2017 by
Generated on Wed Sep 27 14:29:45 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:47 2017 by
Generated on Wed Sep 27 14:29:45 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Sat Sep 23 18:01:40 2017 by
Generated on Wed Sep 27 14:29:38 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -946,6 +946,7 @@ $ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb'
$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb'
$ng_statdat_erb = 'cd_nagios/selinux/statusdat.erb'
$ng_checknrpe_erb = 'cd_nagios/selinux/checknrpe.erb'
$ng_checknagios_erb = 'cd_nagios/selinux/checknagios.erb'
$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf'

View File

@@ -110,5 +110,24 @@ class cd_nagios::selinux::config (
refreshonly => true,
notify => Service[$ng_service],
}
# sealert status.dat
exec { 'create_policy_statusdat':
command => template($ng_statdat_erb),
path => ['/usr/bin','/usr/sbin'],
cwd => $ng_user_home,
creates => "${ng_user_home}/my-http.pp",
notify => Exec['semodule_statusdat'],
}
exec { 'semodule_statusdat':
command => 'semodule -i my-http.pp',
path => ['/usr/bin','/usr/sbin'],
cwd => $ng_user_home,
require => Exec['create_policy_statusdat'],
refreshonly => true,
notify => Service[$ng_service],
}
}
}

View File

@@ -0,0 +1 @@
ausearch -c 'httpd' --raw | audit2allow -M my-httpd