diff options
| author | John Ferlito <johnf@inodes.org> | 2008-12-09 11:46:21 +1100 |
|---|---|---|
| committer | John Ferlito <johnf@inodes.org> | 2008-12-09 14:42:26 +1100 |
| commit | da71ad53cc49b9a8c56785d865c47bb282e467b6 (patch) | |
| tree | 17a6d2e9be8847c3f0f6e2143bb0044732b63d56 | |
| parent | 4418b3436e96b6aa8d2310fe87e315533ed53415 (diff) | |
| download | puppet-da71ad53cc49b9a8c56785d865c47bb282e467b6.tar.gz puppet-da71ad53cc49b9a8c56785d865c47bb282e467b6.tar.xz puppet-da71ad53cc49b9a8c56785d865c47bb282e467b6.zip | |
Add a unique name to objects so we can determine uniqueness when read back in
The nagios object definitions have been updated to correlate with Nagios
3.0.6.
In Nagios it is possible to have multiple service checks with the
same service_description. eg I could have an check with a
service_description of 'SSH' for multiple hosts. So in puppet we can't
use it as a unique name for the resource. This patch modifies the code
to use $name as the unique name. For some types eg command_name $name
ends up in the config and thus we can tell which puppet resources match
to which nagios ones. For other types like service there is no direct
mapping from $name to a nagios attibute. So we use a custom attribute
called _naginator_name.
Signed-off-by: John Ferlito <johnf@inodes.org>
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rwxr-xr-x | lib/puppet/external/nagios/base.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/type/nagios_hostdependency.rb | 3 |
3 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,8 @@ 0.24.7 + Fixed #1496 - nagios_servicedependency needs a unique host_name? + + Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type + Bug #1803 Zfs should auto require the ancestor file systems Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb index 9b9d7ca34..6a0c1831c 100755 --- a/lib/puppet/external/nagios/base.rb +++ b/lib/puppet/external/nagios/base.rb @@ -437,7 +437,8 @@ 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 + :register, :use, + :_naginator_name setnamevar :_naginator_name end diff --git a/lib/puppet/type/nagios_hostdependency.rb b/lib/puppet/type/nagios_hostdependency.rb new file mode 100644 index 000000000..fea71a619 --- /dev/null +++ b/lib/puppet/type/nagios_hostdependency.rb @@ -0,0 +1,3 @@ +require 'puppet/util/nagios_maker' + +Puppet::Util::NagiosMaker.create_nagios_type :hostdependency |