Changeset 6615

Timestamp:

Jan 16, 2009, 5:47:29 PM (17 years ago)

Author:

maarten

Message:

-cleanup main nagios config template -split up interface check config in multi template

Location:

trunk/exodus/templates/nagios

Files:

• exodus.cfg (modified) (1 diff)
• interface.nagios (added)
• object.nagios (modified) (1 diff)
• services/check_if.nagios (modified) (2 diffs)
• services/dependend_interface.nagios (added)
• services/dependend_snmp.nagios (added)

trunk/exodus/templates/nagios/exodus.cfg

@@ -1 @@
-{#
-Main template for nagios configuration.
-Nagios object templates can be identified with the .nagios extension
-
-todo:
-for parent child relations (as far as possible in nagios) detect them 
-and make use of the 'parents' directive in the object.cfg.
-? possibly inserted in template with template tags ?
-#}
+{# Main template for nagios configuration.                               #}
+{# Nagios object templates can be identified with the .nagios extension  #}
+{#                                                                       #}
+{# TODO:                                                                 #}
+{# for parent child relations (as far as possible in nagios) detect them #}
+{# and make use of the 'parents' directive in the object.cfg.            #}
+{# ? possibly inserted in template with template tags ?                  #}
 
 {% for node in nodes %}
+    {# generate host definition #}
     {% include "nagios/object.nagios" %}
+    
+    {# generate service definitions #}
     {% include "nagios/services/check_snmp.nagios" %}
     {% include "nagios/services/check_dns.nagios" %}
     {% include "nagios/services/check_pen.nagios" %}
     {% include "nagios/services/check_version.nagios" %}
-    {% include "nagios/services/check_if.nagios" %}  
+    
+    {# generate interface services and dependencies #}
+    {% include "nagios/interface.nagios" %}  
 {% endfor %}

trunk/exodus/templates/nagios/object.nagios

@@ -1 +1 @@
 define host {
     host_name       {{ node.name }}
-{#    alias           {{ node.name + '.' + node.network.name }} #}
-    alias           {{ node.name }}
+    alias           {{ node.name }}.{{ node.network.name }}
     use             nodes
     address         {{ node.masterip }}

trunk/exodus/templates/nagios/services/check_if.nagios

@@ -1 @@
-{% for nic in node.interface_set.all %}
 define service {
     host_name           {{ node.name }}
@@ -7 +6 @@
     servicegroups       all_interfaces
 }
-    {% ifnotequal nic nic.link %}
-define servicedependency{
-    host_name       {{ node.name }}
-    service_description     Check interface {{ nic.iface }}
-    dependent_host_name     {{ nic.link.node }}
-    dependent_service_description   Check interface {{ nic.link.iface }}
-    execution_failure_criteria  w,u,c
-}
-    {% endifnotequal %}
-{% endfor %}