Merge pull request #550 from opinkerfi/nagios-daemon-interface

Nagios process interaction through adagios.daemon

Author: hakong

adagios/bi/__init__.py

@@ -21,7 +21,7 @@
 import simplejson as json
 import pynag.Model
 import pynag.Parsers
-import pynag.Control
+import adagios.daemon
 import adagios.pnp.functions
 import adagios.settings
 import time
@@ -760,11 +760,7 @@ def create_host(self):
             #host.hostgroups = 'domains,nameservers,mailservers,http-servers,https-servers'
             host.save()
 
-            daemon = pynag.Control.daemon(
-                nagios_bin=adagios.settings.nagios_binary,
-                nagios_cfg=adagios.settings.nagios_config,
-                nagios_init=adagios.settings.nagios_init_script,
-            )
+            daemon = adagios.daemon.Daemon()
 
             result = daemon.reload()
             time.sleep(1)

adagios/context_processors.py

@@ -21,6 +21,7 @@
 
 from adagios import notifications, settings, add_plugin
 from adagios.misc.rest import add_notification, clear_notification
+from adagios.daemon import Daemon
 
 import pynag.Model.EventHandlers
 import pynag.Parsers
@@ -292,11 +293,8 @@ def check_destination_directory(request):
 def check_nagios_running(request):
     """ Notify user if nagios is not running """
     try:
-        if pynag.Model.config is None:
-            pynag.Model.config = pynag.Parsers.config(
-                adagios.settings.nagios_config)
-        nagios_pid = pynag.Model.config._get_pid()
-        return {"nagios_running": (nagios_pid is not None)}
+        d = Daemon()
+        return {"nagios_running": (d.running())}
     except Exception:
         return {}
 

adagios/daemon.py

@@ -0,0 +1,37 @@
+# Adagios is a web based Nagios configuration interface
+#
+# Copyright (C) 2014, Tomas Edwardsson <tommi@tommi.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Methods for controlling and getting status of the Nagios daemon"""
+
+from pynag.Control import daemon
+from adagios import settings
+
+class Daemon(daemon):
+    def __init__(self):
+        super(Daemon, self).__init__()
+
+        # Mapping needed
+        if settings.nagios_binary:
+            self.nagios_bin = settings.nagios_binary
+        if settings.nagios_config:
+            self.nagios_cfg = settings.nagios_config
+        if settings.nagios_init_script:
+            self.nagios_init = settings.nagios_init_script
+        if settings.nagios_service:
+            self.service_name = settings.nagios_service
+
+# vim: sts=4 expandtab autoindent

adagios/etc/adagios/adagios.conf

@@ -34,9 +34,13 @@ enable_loghandler = False
 # a nagios reload after every single change.
 auto_reload = False
 
+# nagios_service - Service name used to start/stop nagios
+# Adagios uses this to reload nagios after configuration changes
+nagios_service = "nagios"
+
 # nagios_init_script - Path to init script used to start/stop nagios
 # Adagios uses this to reload nagios after configuration changes
-nagios_init_script="sudo /etc/init.d/nagios"
+nagios_init_script=""
 
 # nagios_binary - Path to your nagios binary
 # Adagios uses this to run "nagios -v /etc/nagios/nagios.cfg"

adagios/etc/sudoers.d/adagios

@@ -1,3 +1,5 @@
-Defaults:nagios    !requiretty
-nagios             ALL = (root) NOPASSWD: /etc/init.d/nagios
+Defaults:%nagios    !requiretty
+%nagios             ALL = (root) NOPASSWD: /etc/init.d/nagios
+%nagios             ALL = (root) NOPASSWD: /sbin/service nagios *
+%nagios             ALL = (root) NOPASSWD: /usr/sbin/nagios -v /etc/nagios/nagios.cfg
 

adagios/misc/forms.py

@@ -28,10 +28,11 @@
 import os.path
 from adagios import settings
 import adagios.utils
-from pynag import Model, Control
+from pynag import Model
 from django.core.mail import EmailMultiAlternatives
 import pynag.Parsers
 import pynag.Control.Command
+import adagios.daemon
 
 
 TOPIC_CHOICES = (
@@ -120,8 +121,12 @@ class AdagiosSettingsForm(forms.Form):
         required=False, initial=settings.destination_directory, help_text=_("Where to save new objects that adagios creates."))
     nagios_url = forms.CharField(required=False, initial=settings.nagios_url,
                                  help_text=_("URL (relative or absolute) to your nagios webcgi. Adagios will use this to make it simple to navigate from a configured host/service directly to the cgi."))
+    nagios_service = forms.CharField(
+        required=False,
+        help_text=_("The name of the nagios service, commonly nagios or nagios3. Adagios will use this when stopping/starting/reloading nagios"))
     nagios_init_script = forms.CharField(
-        help_text=_("Path to you nagios init script. Adagios will use this when stopping/starting/reloading nagios"))
+        required=False,
+        help_text=_("You should define either 'Nagios service' or 'Nagios init script'. Path to you nagios init script. Adagios will use this when stopping/starting/reloading nagios"))
     nagios_binary = forms.CharField(
         help_text=_("Path to you nagios daemon binary. Adagios will use this to verify config with 'nagios -v nagios_config'"))
     livestatus_path = forms.CharField(
@@ -204,7 +209,7 @@ def clean_nagios_init_script(self):
         filename = self.cleaned_data['nagios_init_script']
         if filename.startswith('sudo'):
             self.check_file_exists(filename.split()[1])
-        else:
+        elif filename:
             self.check_file_exists(filename)
         return filename
 
@@ -499,31 +504,31 @@ class NagiosServiceForm(forms.Form):
 
     def save(self):
         #nagios_bin = self.cleaned_data['nagios_bin']
+        daemon = adagios.daemon.Daemon()
         if "reload" in self.data:
-            command = "reload"
+            command = daemon.reload
+            self.command = "reload"
         elif "restart" in self.data:
-            command = "restart"
+            command = daemon.restart
+            self.command = "restart"
         elif "stop" in self.data:
-            command = "stop"
+            command = daemon.stop
+            self.command = "stop"
         elif "start" in self.data:
-            command = "start"
+            command = daemon.start
+            self.command = "start"
         elif "status" in self.data:
-            command = "status"
+            command = daemon.status
+            self.command = "status"
         elif "verify" in self.data:
-            command = "verify"
+            command = daemon.verify_config
+            self.command = "verify"
         else:
             raise Exception(_("Unknown command"))
-        self.command = command
-        nagios_init = settings.nagios_init_script
-        nagios_binary = settings.nagios_binary
-        nagios_config = settings.nagios_config or pynag.Model.config.cfg_file
-        if command == "verify":
-            command = "%s -v '%s'" % (nagios_binary, nagios_config)
-        else:
-            command = "%s %s" % (nagios_init, command)
-        code, stdout, stderr = pynag.Utils.runCommand(command)
-        self.stdout = stdout or ""
-        self.stderr = stderr or ""
+
+        code = command()
+        self.stdout = daemon.stdout or ""
+        self.stderr = daemon.stderr or ""
         self.exit_code = code
 
     def verify(self):

adagios/misc/helpers.py

@@ -28,11 +28,11 @@
 import re
 from pynag import Model
 from pynag import Parsers
-from pynag import Control
 from pynag import Utils
 from pynag import __version__
 from socket import gethostbyname_ex
 import adagios.settings
+from adagios.daemon import Daemon
 from django.utils.translation import ugettext as _
 
 
@@ -240,11 +240,7 @@ def set_maincfg_attribute(attribute, new_value, old_value='None', append=False):
 
 def reload_nagios():
     """ Reloads nagios. Returns "Success" on Success """
-    daemon = Control.daemon(
-        nagios_cfg=Model.config.cfg_file,
-        nagios_init=adagios.settings.nagios_init_script,
-        nagios_bin=adagios.settings.nagios_binary
-    )
+    daemon = Daemon()
     result = {}
     if daemon.reload() == 0:
         result['status'] = _("success")

adagios/misc/templates/nagios_service.html

@@ -47,19 +47,20 @@ <h4>{% trans "Errors" %}</h4>
             {% endif %}
         </div>
 
-        {% if not stdout and not stderr %}
+        {% if stderr|slice:":5" == 'sudo:' %}
             <div class="alert alert-danger">
                 <p>
-                    {% blocktrans %}Something does not smell right. We ran {{ command }} and got no output.
+                    {% blocktrans %}Something does not smell right. We ran {{ command }} and got the error above.
                     Usually when this happens there is a problem with sudoers configuration.{% endblocktrans %}
                 </p>
                 <p>
                     {% blocktrans %}Inspect webserver apache log and check if there are any sudo errors.
                     Your <a>/etc/sudoers.d/adagios</a> should have something like this:{% endblocktrans %}
                 </p>
             <pre>
-                Defaults:{{ local_user }}    !requiretty
-                {{ local_user }} ALL = (root) NOPASSWD: /etc/init.d/nagios3
+Defaults:{{ local_user }}    !requiretty
+{{ local_user }} ALL = (root) NOPASSWD: /sbin/service nagios *
+{{ local_user }} ALL = (root) NOPASSWD: {{ nagios_bin }} -v *
             </pre>
             </div>
         {% endif %}
@@ -84,4 +85,4 @@ <h5>{% trans "Diagnostics" %}</h5>
 
 {% endblock %}
 
-{% block footer %} {{ block.super }} {% endblock %}
+{% block footer %} {{ block.super }} {% endblock %}

adagios/misc/views.py

@@ -31,7 +31,7 @@
 
 import pynag.Model
 import pynag.Utils
-import pynag.Control
+import adagios.daemon
 import pynag.Model.EventHandlers
 import pynag.Utils
 import os.path
@@ -182,9 +182,7 @@ def nagios_service(request):
     c = {}
     c['errors'] = []
     c['messages'] = []
-    nagios_bin = adagios.settings.nagios_binary
-    nagios_init = adagios.settings.nagios_init_script
-    nagios_cfg = adagios.settings.nagios_config
+
     if request.method == 'GET':
         form = forms.NagiosServiceForm(initial=request.GET)
     else:
@@ -194,20 +192,20 @@ def nagios_service(request):
             c['stdout'] = form.stdout
             c['stderr'] = form.stderr
             c['command'] = form.command
+            c['exit_code'] = form.exit_code
 
             for i in form.stdout.splitlines():
                 if i.strip().startswith('Error:'):
                     c['errors'].append(i)
     c['form'] = form
-    service = pynag.Control.daemon(
-        nagios_bin=nagios_bin, nagios_cfg=nagios_cfg, nagios_init=nagios_init)
-    c['status'] = s = service.status()
-    if s == 0:
+    daemon = adagios.daemon.Daemon()
+    c['nagios_bin'] = daemon.nagios_bin
+    if daemon.running():
+        c['status'] = 0
         c['friendly_status'] = "running"
-    elif s == 1:
-        c['friendly_status'] = "not running"
     else:
-        c['friendly_status'] = 'unknown (exit status %s)' % (s, )
+        c['status'] = 1
+        c['friendly_status'] = "not running"
     needs_reload = pynag.Model.config.needs_reload()
     c['needs_reload'] = needs_reload
     return render_to_response('nagios_service.html', c, context_instance=RequestContext(request))

adagios/settings.py

@@ -228,7 +228,9 @@
 # Anything put in /etc/adagios.d/adagios.conf will overwrite this.
 nagios_config = None  # Sensible default is "/etc/nagios/nagios.cfg"
 nagios_url = "/nagios"
-nagios_init_script = "/etc/init.d/nagios"
+# define if you are using a sysv5 init script
+nagios_init_script = None
+nagios_service = "nagios"
 nagios_binary = "/usr/bin/nagios"
 livestatus_path = None
 livestatus_limit = 500