Recommit for updates in build 181
This commit is contained in:
@@ -140,7 +140,12 @@ additional servicegroups through external Puppet rules via define.
|
|||||||
36
|
36
|
||||||
37
|
37
|
||||||
38
|
38
|
||||||
39</pre>
|
39
|
||||||
|
40
|
||||||
|
41
|
||||||
|
42
|
||||||
|
43
|
||||||
|
44</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_servicegroup_rules.pp', line 12</span>
|
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_servicegroup_rules.pp', line 12</span>
|
||||||
@@ -171,6 +176,11 @@ class confdroid_nagios::nagios::objects::add_servicegroup_rules (
|
|||||||
content => template($ng_tgt_svcgrp_head_erb),
|
content => template($ng_tgt_svcgrp_head_erb),
|
||||||
order => '000',
|
order => '000',
|
||||||
}
|
}
|
||||||
|
# add default servicegroup rules through defines and parameters
|
||||||
|
confdroid_nagios::nagios::objects::add_servicegroups { $ng_servicegroup_name:
|
||||||
|
ng_servicegroup_name => $ng_servicegroup_name,
|
||||||
|
ng_servicegroup_alias => $ng_servicegroup_alias
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -4295,7 +4295,9 @@ inherited by all classes except defines.
|
|||||||
752
|
752
|
||||||
753
|
753
|
||||||
754
|
754
|
||||||
755</pre>
|
755
|
||||||
|
756
|
||||||
|
757</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 431</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 431</span>
|
||||||
@@ -4331,6 +4333,8 @@ class confdroid_nagios::params (
|
|||||||
# hostgroups
|
# hostgroups
|
||||||
String $ng_hostgroup_name = 'linux-servers',
|
String $ng_hostgroup_name = 'linux-servers',
|
||||||
String $ng_hostgroup_alias = 'Linux Servers',
|
String $ng_hostgroup_alias = 'Linux Servers',
|
||||||
|
|
||||||
|
# servicegroups
|
||||||
String $ng_servicegroup_name = 'linux-services',
|
String $ng_servicegroup_name = 'linux-services',
|
||||||
String $ng_servicegroup_alias = 'Linux Services',
|
String $ng_servicegroup_alias = 'Linux Services',
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user