summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/external/nagios/base.rb25
1 files changed, 10 insertions, 15 deletions
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 6a0c1831c..d95b808dd 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -416,20 +416,18 @@ class Nagios::Base
:dependent_service_description, :host_name, :hostgroup_name,
:service_description, :inherits_parent, :execution_failure_criteria,
:notification_failure_criteria, :dependency_period,
- :register, :use,
- :_naginator_name
+ :register, :use
- setnamevar :_naginator_name
+ setnamevar :service_description
end
newtype :serviceescalation do
setparameters :host_name, :hostgroup_name, :service_description, :contacts,
:contact_groups, :first_notification, :last_notification,
:notification_interval, :escalation_period, :escalation_options,
- :register, :use,
- :_naginator_name
+ :register, :use
- setnamevar :_naginator_name
+ setnamevar :service_description
end
newtype :hostdependency do
@@ -437,20 +435,18 @@ class Nagios::Base
setparameters :dependent_host_name, :dependent_hostgroup_name, :host_name,
:hostgroup_name, :inherits_parent, :execution_failure_criteria,
:notification_failure_criteria, :dependency_period,
- :register, :use,
- :_naginator_name
+ :register, :use
- setnamevar :_naginator_name
+ setnamevar :host_name
end
newtype :hostescalation do
setparameters :host_name, :hostgroup_name, :contacts, :contact_groups,
:first_notification, :last_notification, :notification_interval,
:escalation_period, :escalation_options,
- :register, :use,
- :_naginator_name
+ :register, :use
- setnamevar :_naginator_name
+ setnamevar :host_name
end
newtype :hostextinfo do
@@ -467,10 +463,9 @@ class Nagios::Base
setparameters :host_name, :service_description, :notes, :notes_url,
:action_url, :icon_image, :icon_image_alt,
- :register, :use,
- :_naginator_name
+ :register, :use
- setnamevar :_naginator_name
+ setnamevar :service_description
end
end