Changeset 6612

Timestamp:

Jan 16, 2009, 12:23:53 PM (16 years ago)

Author:

maarten

Message:

• fixed some nagios template files - updated paths in main nagios config - removed unneeded functioncall in viewNagios

Location:

trunk/exodus

Files:

• templates/nagios/exodus.cfg (modified) (1 diff)
• templates/nagios/object.nagios (modified) (1 diff)
• templates/nagios/services/check_if.nagios (modified) (2 diffs)
• views.py (modified) (1 diff)

trunk/exodus/templates/nagios/exodus.cfg

@@ -10 +10 @@
 
 {% for node in nodes %}
-    {% include "object.nagios" %}
-    {% include "services/check_snmp.nagios" %}
-    {% include "services/check_dns.nagios" %}
-    {% include "services/check_pen.nagios" %}
-    {% include "services/check_version.nagios" %}
-    {% include "services/check_if.nagios" %}  
+    {% include "nagios/object.nagios" %}
+    {% 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" %}  
 {% endfor %}

trunk/exodus/templates/nagios/object.nagios

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

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

@@ -1 @@
-{% for nic in node.interface_set.all() %}
+{% for nic in node.interface_set.all %}
 define service {
     host_name           {{ node.name }}
     use                 check_if
-    service_description Check interface nic.iface
+    service_description Check interface {{ nic.iface }}
     check_command       check_if!{{ nic.ip }}
     servicegroups       all_interfaces
 }
-    {% if nic != nic.link %}
+    {% ifnotequal nic nic.link %}
 define servicedependency{
     host_name       {{ node.name }}
@@ -15 +15 @@
     execution_failure_criteria  w,u,c
 }
-    {% endif %}
+    {% endifnotequal %}
 {% endfor %}

trunk/exodus/views.py

@@ -77 +77 @@
 def viewNagios(request):
     nodes = Node.objects.all()
-    interfaces = Interface.objects.all()
     return render_to_response('nagios/exodus.cfg', {'nodes' : nodes}, mimetype='text/plain')