Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65232 discussions

Check_MK Git: check_mk: Final fix for omd apache shared mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fd4e84df63c5447b2b04ca686ac515766fb5fdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fd4e84df63c54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 17:44:11 2010 +0100 Final fix for omd apache shared mode --- web/htdocs/wato.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c0d68c..68a5b8b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -489,18 +489,18 @@ def check_mk_automation(command, args=[], indata=""): # - When not set try to detect the command for OMD or non OMD installations # - OMD 'own' apache mode or non OMD: check_mk --automation # - OMD 'shared' apache mode: Full path to the binary and the defaults - commandargs = [] if defaults.check_mk_automation: commandargs = defaults.check_mk_automation.split() + cmd = commandargs + [ command ] + args else: apache_user, omd_mode, omd_site = html.omd_mode() if not omd_mode or omd_mode == 'own': commandargs = [ 'check_mk', '--automation' ] + cmd = commandargs + [ command ] + args else: - commandargs = [ 'sudo', '-u', omd_site, '/usr/bin/env', 'python', - '/omd/sites/'+omd_site+'/share/check_mk/modules/check_mk.py', - '--defaults', '/omd/sites/'+omd_site+'/etc/check_mk/defaults', - '--automation' ] + commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] + cmd = commandargs + cmd[-1] += ' ' + ' '.join([ command ] + args) if commandargs[0] == 'sudo': sudo_msg = ("The webserver is running as user which has no rights on the " @@ -513,9 +513,7 @@ def check_mk_automation(command, args=[], indata=""): "%s ALL = (%s) NOPASSWD: %s *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, omd_site, " ".join(commandargs[3:]))) - - cmd = commandargs + [ command ] + args + (apache_user, apache_user, omd_site, " ".join(commandargs[1:]))) try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

13 years, 11 months

Check_MK Git: check_mk: wato: This is hopefully really the latest final fix to make the omd apache shared mode work

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9b9886f880405e48132e813cf5b1675e6f4700ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9886f880405e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 18:06:40 2010 +0100 wato: This is hopefully really the latest final fix to make the omd apache shared mode work --- web/htdocs/wato.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68a5b8b..11f5921 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -499,8 +499,7 @@ def check_mk_automation(command, args=[], indata=""): cmd = commandargs + [ command ] + args else: commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] - cmd = commandargs - cmd[-1] += ' ' + ' '.join([ command ] + args) + cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] if commandargs[0] == 'sudo': sudo_msg = ("The webserver is running as user which has no rights on the " @@ -510,10 +509,10 @@ def check_mk_automation(command, args=[], indata=""): "<li>Append the following to the <code>/etc/sudoers</code> file:\n" "<pre># Needed for WATO - the Check_MK Web Administration Tool\n" "Defaults:%s !requiretty\n" - "%s ALL = (%s) NOPASSWD: %s *\n" + "%s ALL = (root) NOPASSWD: %s\ *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, omd_site, " ".join(commandargs[1:]))) + (apache_user, apache_user, " ".join(commandargs[1:-1] + [ commandargs[-1].replace(' ', '\ ')]))) try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

13 years, 11 months

Check_MK Git: check_mk: Fixed error message output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0e4b062b6ae288635e8e0ddf68c489b08a4ab3f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e4b062b6ae288… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 16:52:53 2010 +0100 Fixed error message output --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b3df4c..4c0d68c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -513,7 +513,7 @@ def check_mk_automation(command, args=[], indata=""): "%s ALL = (%s) NOPASSWD: %s *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, omd_site, " ".join(commandargs[2:]))) + (apache_user, apache_user, omd_site, " ".join(commandargs[3:]))) cmd = commandargs + [ command ] + args try:

13 years, 11 months

Check_MK Git: check_mk: wato: Implemented usage of sudo in wato when running e.g. in OMD shared mode; Added nice error message with detailed instructions on how to fix the problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a9a96b6d020a651d309a4207eff1c3aaa35b126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a9a96b6d020a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 16:37:02 2010 +0100 wato: Implemented usage of sudo in wato when running e.g. in OMD shared mode; Added nice error message with detailed instructions on how to fix the problem --- web/htdocs/htmllib.py | 7 ++++--- web/htdocs/wato.py | 27 ++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5673a09..333fda4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import time, cgi, config, os, defaults +import time, cgi, config, os, defaults, pwd from lib import * # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' @@ -496,7 +496,8 @@ class html: self.write("Booom (%s)" % url) def omd_mode(self): + apache_user = pwd.getpwuid( os.getuid() )[ 0 ] if 'OMD_SITE' in self.req.subprocess_env and 'OMD_MODE' in self.req.subprocess_env: - return (self.req.subprocess_env['OMD_MODE'], self.req.subprocess_env['OMD_SITE']) + return (apache_user, self.req.subprocess_env['OMD_MODE'], self.req.subprocess_env['OMD_SITE']) else: - return (None, None) + return (apache_user, None, None) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 020f7c8..1b3df4c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -493,27 +493,44 @@ def check_mk_automation(command, args=[], indata=""): if defaults.check_mk_automation: commandargs = defaults.check_mk_automation.split() else: - omd_mode, omd_site = html.omd_mode() + apache_user, omd_mode, omd_site = html.omd_mode() if not omd_mode or omd_mode == 'own': commandargs = [ 'check_mk', '--automation' ] else: - commandargs = [ 'python', + commandargs = [ 'sudo', '-u', omd_site, '/usr/bin/env', 'python', '/omd/sites/'+omd_site+'/share/check_mk/modules/check_mk.py', '--defaults', '/omd/sites/'+omd_site+'/etc/check_mk/defaults', '--automation' ] + + if commandargs[0] == 'sudo': + sudo_msg = ("The webserver is running as user which has no rights on the " + "needed Check_MK/Nagios files. Please ensure you have set-up " + "the sudo environment correctly. e.g. proceed as follows:\n" + "<ol><li>install sudo package</li>\n" + "<li>Append the following to the <code>/etc/sudoers</code> file:\n" + "<pre># Needed for WATO - the Check_MK Web Administration Tool\n" + "Defaults:%s !requiretty\n" + "%s ALL = (%s) NOPASSWD: %s *\n" + "</pre></li>\n" + "<li>Retry this operation</li></ol>\n" % + (apache_user, apache_user, omd_site, " ".join(commandargs[2:]))) + cmd = commandargs + [ command ] + args try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except Exception, e: - raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) + if commandargs[0] == 'sudo': + raise MKGeneralException("Cannot execute <tt>%s</tt>: %s %s" % (commandargs[0], e, sudo_msg)) + else: + raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) p.stdin.write(repr(indata)) p.stdin.close() outdata = p.stdout.read() exitcode = p.wait() if exitcode != 0: - raise MKGeneralException("Error running <tt>%s</tt>: <pre>%s</pre>" % - (" ".join(cmd), outdata)) + raise MKGeneralException("Error running <tt>%s</tt>: <pre>%s</pre>%s" % + (" ".join(cmd), outdata, sudo_msg)) try: return eval(outdata) except Exception, e:

13 years, 11 months

Check_MK Git: check_mk: Added OMD apache mode detection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b31985a880a72386c37f5c1ec81ed027372a510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b31985a880a72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 15:46:59 2010 +0100 Added OMD apache mode detection --- web/htdocs/htmllib.py | 6 ++++++ web/htdocs/wato.py | 29 +++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3408052..5673a09 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -494,3 +494,9 @@ class html: '<param name="autostart" value="true"><param name="playcount" value="1"></object>' % (url, url)) if config.debug: self.write("Booom (%s)" % url) + + def omd_mode(self): + if 'OMD_SITE' in self.req.subprocess_env and 'OMD_MODE' in self.req.subprocess_env: + return (self.req.subprocess_env['OMD_MODE'], self.req.subprocess_env['OMD_SITE']) + else: + return (None, None) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9c8185d..020f7c8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -484,9 +484,26 @@ def parse_audit_log(what): def check_mk_automation(command, args=[], indata=""): - commandargs = defaults.check_mk_automation.split() + # Gather the command to use for executing --automation calls to check_mk + # - First try to use the check_mk_automation option from the defaults + # - When not set try to detect the command for OMD or non OMD installations + # - OMD 'own' apache mode or non OMD: check_mk --automation + # - OMD 'shared' apache mode: Full path to the binary and the defaults + commandargs = [] + if defaults.check_mk_automation: + commandargs = defaults.check_mk_automation.split() + else: + omd_mode, omd_site = html.omd_mode() + if not omd_mode or omd_mode == 'own': + commandargs = [ 'check_mk', '--automation' ] + else: + commandargs = [ 'python', + '/omd/sites/'+omd_site+'/share/check_mk/modules/check_mk.py', + '--defaults', '/omd/sites/'+omd_site+'/etc/check_mk/defaults', + '--automation' ] + cmd = commandargs + [ command ] + args try: - p = subprocess.Popen(commandargs + [ command ] + args, + p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except Exception, e: raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) @@ -495,13 +512,13 @@ def check_mk_automation(command, args=[], indata=""): outdata = p.stdout.read() exitcode = p.wait() if exitcode != 0: - raise MKGeneralException("Error running <tt>%s %s %s</tt>: <pre>%s</pre>" % - (defaults.check_mk_automation, command, " ".join(args), outdata)) + raise MKGeneralException("Error running <tt>%s</tt>: <pre>%s</pre>" % + (" ".join(cmd), outdata)) try: return eval(outdata) except Exception, e: - raise MKGeneralException("Error running <tt>%s %s %s</tt>. Invalid output from webservice (%s): <pre>%s</pre>" % - (defaults.check_mk_automation, command, " ".join(args), e, outdata)) + raise MKGeneralException("Error running <tt>%s</tt>. Invalid output from webservice (%s): <pre>%s</pre>" % + (" ".join(cmd), e, outdata)) def read_configuration_file():

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 597e1206ccb720081ac51b023587380aafcb746e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=597e1206ccb720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 12:39:00 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 11 months

Check_MK Git: check_mk: wato: Fixed hostname field handling when trying to create already existing host

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37034aa7427fe030dfd979ac490f624095dc022e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37034aa7427fe0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 12:35:34 2010 +0100 wato: Fixed hostname field handling when trying to create already existing host --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f1e8a4f..9c8185d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -271,7 +271,7 @@ def mode_edithost(phase, new): title = "Create clone of %s" % clonename alias, ipaddress, tags = g_hosts[clonename] mode = "clone" - elif hostname in g_hosts: + elif not new and hostname in g_hosts: title = "Edit host " + hostname alias, ipaddress, tags = g_hosts[hostname] mode = "edit"

13 years, 11 months

Check_MK Git: check_mk: Merge commit 'HEAD'; branch 'wato'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e5f7b84f4e660205454235a7376ab7c5331ceec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e5f7b84f4e660… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 10:03:10 2010 +0100 Merge commit 'HEAD'; branch 'wato' ---

13 years, 11 months

Check_MK Git: check_mk: Merged changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01f42303d604bdcd5802a901bf63e6947eda1286 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01f42303d604bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 10:03:52 2010 +0100 Merged changelog --- ChangeLog | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65e71a7..7761070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,3 @@ -WATO: - INCOMPATIBLE CHANGES: - * Multisite: parameters nagios_url, nagios_cgi_url and pnp_url are now - obsolete. Instead the new parameter url_prefix is used (which must - end with a /). - * TCP / SNMP: hosts using TCP and SNMP now must use the tags 'tcp' - and 'snmp'. Hosts with the tag 'ping' will not inventorize any - service. New configuration variable tcp_hosts. - - Core, Setup, etc.: - * new variable ignored_checks: Similar to ignored_checktypes, but allows - per-host configuration - 1.1.9i1 INCOMPATIBLE CHANGES: * perfdata_format now defaults to "pnp". Previous default was "standard". @@ -35,6 +22,12 @@ WATO: to the peformance data for the Perf-O-Meters. Also changed service descriptions. You need to reinventurize the kernel checks. You old RRDs will not be deleted, new ones will be created. + * Multisite: parameters nagios_url, nagios_cgi_url and pnp_url are now + obsolete. Instead the new parameter url_prefix is used (which must + end with a /). + * TCP / SNMP: hosts using TCP and SNMP now must use the tags 'tcp' + and 'snmp'. Hosts with the tag 'ping' will not inventorize any + service. New configuration variable tcp_hosts. Core, Setup, etc.: * Improve error handling: if hosts are monitored with SNMP *and* TCP, @@ -56,6 +49,8 @@ WATO: with numbers now anyway. * check_mk -I snmp will now try all checktypes not having an snmp scan function. That way all possible checks should be inventorized. + * new variable ignored_checks: Similar to ignored_checktypes, but allows + per-host configuration Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now

13 years, 11 months

Check_MK Git: check_mk: Fixed error handling and stdout output in check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0eca259f706f9fc1d2a4c483b58e3ac9cc7a40e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eca259f706f9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 11:42:56 2010 +0100 Fixed error handling and stdout output in check_mk --- modules/check_mk.py | 2 +- web/htdocs/wato.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 531d388..4b3cad3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -666,7 +666,7 @@ def snmp_scan(hostname, ipaddress): sys.stdout.write("Scanning host %s(%s) for SNMP checks..." % (hostname, ipaddress)) sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") if sys_descr == None: - print "no SNMP answer" + sys.stderr.write("no SNMP answer\n") return [] found = [] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dab6df6..f1e8a4f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -497,7 +497,11 @@ def check_mk_automation(command, args=[], indata=""): if exitcode != 0: raise MKGeneralException("Error running <tt>%s %s %s</tt>: <pre>%s</pre>" % (defaults.check_mk_automation, command, " ".join(args), outdata)) - return eval(outdata) + try: + return eval(outdata) + except Exception, e: + raise MKGeneralException("Error running <tt>%s %s %s</tt>. Invalid output from webservice (%s): <pre>%s</pre>" % + (defaults.check_mk_automation, command, " ".join(args), e, outdata)) def read_configuration_file(): @@ -525,7 +529,7 @@ def read_configuration_file(): else: alias = None g_hosts[hostname] = (alias, ipaddress, tags) - + def write_configuration_file(): all_hosts = []

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits