confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

sorted deprecated syntax

Browse Source
This commit is contained in:
Arne Teuke
2017-07-26 14:04:39 +01:00
parent 6ee49a5e33
commit 6094321d4f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/nagios/objects/template_rules.pp
View File

@@ -96,6 +96,7 @@ class cd_nagios::nagios::objects::template_rules (
ng_template_object => 'service', ng_template_object => 'service',
ng_template_object_name => 'local-service', ng_template_object_name => 'local-service',
ng_max_check_attempts => '4', ng_max_check_attempts => '4',
ng_template_object_use => 'generic-service',
} }
} }
} }

8
manifests/nagios/objects/templates.pp
View File

@@ -94,9 +94,9 @@
# Valid options are `0` and `1`. # Valid options are `0` and `1`.
# @param [string] ng_is_volatile Whether the service is volatile. # @param [string] ng_is_volatile Whether the service is volatile.
# Valid options are `0` and `1`. # Valid options are `0` and `1`.
# @param [string] ng_normal_check_interval How often to check the service # @param [string] ng_check_interval How often to check the service
# under normal conditions. # under normal conditions.
# @param [string] ng_retry_check_interval Re-check the service every x minutes # @param [string] ng_retry_interval Re-check the service every x minutes
# until a hard state can be determined. # until a hard state can be determined.
################################################################################ ################################################################################
define cd_nagios::nagios::objects::templates ( define cd_nagios::nagios::objects::templates (
@@ -131,8 +131,8 @@ $ng_parallelize_check = '1',
$ng_obsess_over_service = '1', $ng_obsess_over_service = '1',
$ng_check_freshness = '0', $ng_check_freshness = '0',
$ng_is_volatile = '0', $ng_is_volatile = '0',
$ng_normal_check_interval = '10', $ng_check_interval = '10',
$ng_retry_check_interval = '2', $ng_retry_interval = '2',
) { ) {

8
templates/nagios/templates_cfg_rule.erb
View File

@@ -110,8 +110,8 @@ define <%= @ng_template_object %>{
is_volatile <%= @ng_is_volatile %> is_volatile <%= @ng_is_volatile %>
check_period <%= @ng_check_period %> check_period <%= @ng_check_period %>
max_check_attempts <%= @ng_max_check_attempts %> max_check_attempts <%= @ng_max_check_attempts %>
normal_check_interval <%= @ng_normal_check_interval %> check_interval <%= @ng_check_interval %>
retry_check_interval <%= @ng_retry_check_interval %> retry_interval <%= @ng_retry_interval %>
contact_groups <%= @ng_contact_groups %> contact_groups <%= @ng_contact_groups %>
notification_interval <%= @ng_notification_interval %> notification_interval <%= @ng_notification_interval %>
notification_period <%= @ng_notification_period %> notification_period <%= @ng_notification_period %>
@@ -123,8 +123,8 @@ define <%= @ng_template_object %>{
name <%= @ng_template_object_name %> name <%= @ng_template_object_name %>
use <%= @ng_template_object_use %> use <%= @ng_template_object_use %>
max_check_attempts <%= @ng_max_check_attempts %> max_check_attempts <%= @ng_max_check_attempts %>
normal_check_interval <%= @ng_normal_check_interval %> check_interval <%= @ng_check_interval %>
retry_check_interval <%= @ng_retry_check_interval %> retry_interval <%= @ng_retry_interval %>
register <%= @ng_object_register %> register <%= @ng_object_register %>
} }
<% end -%> <% end -%>