Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: AIX Agent: Add NTP check for AIX (

by git＠mathias-kettner.de

thanks to Florian Holeczek and Dale Stubblefield) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 277b535c1ded086bf8363029db6a784f7f1a60b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=277b535c1ded08… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 07:01:56 2012 +0200 AIX Agent: Add NTP check for AIX (thanks to Florian Holeczek and Dale Stubblefield) --- agents/check_mk_agent.aix | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 341d76a..51b7e2a 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -85,6 +85,14 @@ do done +echo '<<<ntp>>>' +if which ntpq > /dev/null 2>&1 ; then + if [ $(lssrc -s xntpd|grep -c active) -gt 0 ] ; then + # remote heading, make first column space separated + ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + fi +fi + if cd $PLUGINSDIR 2>/dev/null then

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 480ed0c9c8dc7e12d31d15424cf7a22c6cef8259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480ed0c9c8dc7e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 15 17:10:56 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Readme for Agent install

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c880c78b0d5479e26f888a7d2c96768c5ff5bd91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c880c78b0d5479… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 15 17:10:18 2012 +0200 Readme for Agent install --- doc/agents/README.AIX | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/doc/agents/README.AIX b/doc/agents/README.AIX new file mode 100644 index 0000000..c956598 --- /dev/null +++ b/doc/agents/README.AIX @@ -0,0 +1,54 @@ + + +# Install the Agent +cp /tmp/check_mk_agent.aix /usr/bin/check_mk_agent + +# Agent Config +Change the defaults from +export MK_LIBDIR="/to/be/changed" +export MK_CONFDIR="/to/be/changed" + +to +export MK_CONFDIR="/etc/check_mk" +export MK_LIBDIR="/usr/lib/check_mk_agent" + +And create the directories +mkdir /etc/check_mk /usr/lib/check_mk_agent /usr/lib/check_mk_agent/local /usr/lib/check_mk_agent/plugins + + +# INETD SETUP +/etc/services +check_mk 6556/tcp + +# WITHOUT TCPWRAPPERS +/etc/inetd.conf +check_mk stream tcp nowait root /usr/bin/check_mk_agent + +# WITH TCPWRAPPERS +or, if your system has TCPWrappers +check_mk stream tcp nowait root /path/to/tcpd /usr/bin/check_mk_agent +Note - in our testing, tcpwrappers only delivered correct example every 2nd call. +One might be able to use genfilt as an alternate firewall + +and add an allow entry in /etc/hosts.allow: +check_mk: nagioshost, ip_of_nagios_host, 127.0.0.1 + + + +# Extra FEATURES +If you wish to have more stats, +there's 3 ways: +a) +you need to get a hold of the utilities for perfstat from +http://www.ibm.com/developerworks/wikis/display/WikiPtype/ryo +Do not use the binaries since they do an eternal loop. Instead download +adapt.c, cpu.c, memory.c and net.c and remove the loops. + +This code seems to be not GPLed, so we cannot include it. + + +b) +enable SNMP and install the correct bundles for host stats + + +c) compile install libstatgrab (recommended!)

12 years, 2 months

Check_MK Git: check_mk: Snapin Custom Links allows to specify HTTP link target

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e9928a32046f3e742333c30cd33c24abdba9ea7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e9928a32046f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 11:52:42 2012 +0200 Snapin Custom Links allows to specify HTTP link target --- ChangeLog | 1 + multisite.mk | 18 +++++++++--------- web/htdocs/sidebar.py | 14 +++++++------- web/plugins/sidebar/shipped.py | 5 +++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 193a0b1..26286c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views * FIX: Fixed syntax error in "Single-Host Problems" view definition * New help button at top right of each page now toggles help texts + * Snapin Custom Links allows to specify HTTP link target Mobile GUI: * FIX: commands can be executed again diff --git a/multisite.mk b/multisite.mk index 0222aed..dd2f289 100644 --- a/multisite.mk +++ b/multisite.mk @@ -53,13 +53,13 @@ custom_links['guest'] = [ # but some in addition custom_links['user'] = custom_links['guest'] + [ ( "Open Source Components", False, [ - ( "Multisite", "http://mathias-kettner.de/checkmk_multisite.html" ), - ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html" ), - ( "Check_MK", "http://mathias-kettner.de/check_mk.html" ), - ( "Nagios", "http://www.nagios.org/" ), - ( "PNP4Nagios", "http://pnp4nagios.org/" ), - ( "NagVis", "http://nagvis.org/" ), - ( "RRDTool", "http://oss.oetiker.ch/rrdtool/" ), + ( "Multisite", "http://mathias-kettner.de/checkmk_multisite.html", None, "_blank"), + ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html", None, "_blank"), + ( "Check_MK", "http://mathias-kettner.de/check_mk.html", None, "_blank"), + ( "Nagios", "http://www.nagios.org/", None, "_blank"), + ( "PNP4Nagios", "http://pnp4nagios.org/", None, "_blank"), + ( "NagVis", "http://nagvis.org/", None, "_blank"), + ( "RRDTool", "http://oss.oetiker.ch/rrdtool/", None, "_blank"), ]) ] @@ -68,8 +68,8 @@ custom_links['admin'] = custom_links['user'] + [ ( "Support", False, [ ( "Mathias Kettner", "http://mathias-kettner.de/" ), ( "Check_MK Mailinglists", "http://mathias-kettner.de/check_mk_lists.html" ), - ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/" ), - ( "Nagios Portal (German)", "http://nagios-portal.org"), + ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/", None, "_blank" ), + ( "Nagios Portal (German)", "http://nagios-portal.org", None, "_blank"), ]) ] diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 52015f3..3010413 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -55,7 +55,7 @@ def load_plugins(): snapin["allowed"]) # Helper functions to be used by snapins -def link(text, target): +def link(text, target, frame="main"): # Convert relative links into absolute links. We have three kinds # of possible links and we change only [3] # [1] protocol://hostname/url/link.py @@ -63,14 +63,14 @@ def link(text, target): # [3] relative.py if not (":" in target[:10]) and target[0] != '/': target = defaults.url_prefix + "check_mk/" + target - return '<a onfocus="if (this.blur) this.blur();" target="main" ' \ - 'class=link href="%s">%s</a>' % (target, htmllib.attrencode(text)) + return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \ + 'class=link href="%s">%s</a>' % (frame, target, htmllib.attrencode(text)) -def simplelink(text, target): - html.write(link(text, target) + "<br>\n") +def simplelink(text, target, frame="main"): + html.write(link(text, target, frame) + "<br>\n") -def bulletlink(text, target): - html.write("<li class=sidebar>" + link(text, target) + "</li>\n") +def bulletlink(text, target, frame="main"): + html.write("<li class=sidebar>" + link(text, target, frame) + "</li>\n") def iconlink(text, target, icon): linktext = '<img class=iconlink src="images/icon_%s.png">%s' % \ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 96d577a..06ea8a9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1171,11 +1171,12 @@ def render_custom_links(): render_list(idss, entry[2]) html.write('</div>\n') elif type(entry[1]) == str: - if len(entry) > 2: + frame = len(entry) > 3 and entry[3] or "main" + if len(entry) > 2 and entry[2]: html.write('<img src="images/%s">' % entry[2]) else: html.write('<img src="images/link_link.gif">') - simplelink(entry[0], entry[1]) + simplelink(entry[0], entry[1], frame) else: html.write(_("Second part of tuple must be list or string, not %s\n") % str(entry[1])) except Exception, e:

12 years, 2 months

Check_MK Git: check_mk: Fixed typo in english text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9c5e7721490eb8fcc449307863375bff4372b5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9c5e7721490eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 10:40:23 2012 +0200 Fixed typo in english text --- 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 bdaca6a..82894b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2660,7 +2660,7 @@ def mode_bulk_cleanup(phase): html.write("<p>" + _("You have selected <b>%d</b> hosts for bulk cleanup. This means removing " "explicit attribute values from hosts. The hosts will then inherit attributes " - "configured at the host list or folders or simply fall back to the builin " + "configured at the host list or folders or simply fall back to the builtin " "default values.") % len(hostnames)) html.write("</p>")

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0750

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb63b1effad09e58469be032c377413de6574478 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb63b1effad09e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 09:17:31 2012 +0200 Updated bug entries #0750 --- .bugs/750 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/750 b/.bugs/750 new file mode 100644 index 0000000..c5cc8fe --- /dev/null +++ b/.bugs/750 @@ -0,0 +1,9 @@ +Title: IE8: Sidebarscrolling garbles layout +Component: multisite +State: open +Date: 2012-05-15 09:16:40 +Targetversion: 1.2.0 +Class: bug + +If you scroll the sidebar up and down on IE8 then some +things do not scroll but seem to be fixed to the screen.

12 years, 2 months

Check_MK Git: check_mk: Another styling fix for the sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4558ab2e953f9b8480855c74d457d3d6b44f04cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4558ab2e953f9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 17:28:15 2012 +0200 Another styling fix for the sidebar --- web/htdocs/js/sidebar.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index d624d49..1440a8d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -391,7 +391,7 @@ function setSidebarHeight() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight + 0) + 'px'; + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight + 4) + 'px'; oFooter = null; oContent = null;

12 years, 2 months

Check_MK Git: check_mk: compile helper: do not restart SITE if it is set to -

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a8cd099df360e5de78d7bd48017a71b1116cc68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a8cd099df360e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 17:14:14 2012 +0200 compile helper: do not restart SITE if it is set to - --- web/.f12 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/.f12 b/web/.f12 index 2b960e5..2c8d957 100644 --- a/web/.f12 +++ b/web/.f12 @@ -3,4 +3,6 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) #C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l) echo "$C files copied" -sudo omd restart $SITE apache +if [ "$SITE" != - ] ; then + sudo omd restart $SITE apache +fi

12 years, 2 months

Check_MK Git: check_mk: Better error handling in D/WATO Login

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e72fbcb6ad07eff4464e940f23631601b5486c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e72fbcb6ad07e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 17:14:39 2012 +0200 Better error handling in D/WATO Login --- web/htdocs/htmllib.py | 11 +++++++++++ web/htdocs/index.py | 38 +++++++++++++++++++++++++++++--------- web/htdocs/login.py | 9 ++++----- web/htdocs/wato.py | 28 ++++++++++++++++++++-------- 4 files changed, 64 insertions(+), 22 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5a130c3..1106a4c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -154,6 +154,17 @@ def strip_tags(ht): ht = ht[0:x] + ht[y+1:] return ht +def strip_scripts(ht): + while True: + x = ht.find('<script') + if x == -1: + break + y = ht.find('</script>') + if y == -1: + break + ht = ht[0:x] + ht[y+9:] + return ht + class html: def __init__(self, req): diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 19f6074..26e991e 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -206,6 +206,10 @@ def handler(req, profiling = True): # just a plain server result code of 500 fail_silently = html.has_var("_ajaxid") + # Webservice functions may decide to get a normal result code + # but a text with an error message in case of an error + plain_error = html.has_var("_plain_error") + config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True @@ -268,7 +272,7 @@ def handler(req, profiling = True): load_language(html.var("lang", config.get_language())) # After auth check the regular page can be shown - result = login.page_login() + result = login.page_login(plain_error) if type(result) == tuple: # This is the redirect to the requested page directly after successful login req.user = result[0] @@ -312,40 +316,52 @@ def handler(req, profiling = True): handler() except MKUserError, e: - if not fail_silently: + if plain_error: + html.write(_("User error") + ": %s\n" % e) + elif not fail_silently: html.header("Invalid User Input") html.show_error(str(e)) html.footer() except MKAuthException, e: - if not fail_silently: + if plain_error: + html.write(_("Authentication error") + ": %s\n" % e) + elif not fail_silently: html.header(_("Permission denied")) html.show_error(str(e)) html.footer() except MKUnauthenticatedException, e: - if not fail_silently: + if plain_error: + html.write(_("Missing authentication credentials") + ": %s\n" % e) + elif not fail_silently: html.header(_("Not authenticated")) html.show_error(str(e)) html.footer() response_code = apache.HTTP_UNAUTHORIZED except MKConfigError, e: - if not fail_silently: + if plain_error: + html.write(_("Configuration error") + ": %s\n" % e) + elif not fail_silently: html.header(_("Configuration Error")) html.show_error(str(e)) html.footer() apache.log_error(_("Configuration error: %s") % (e,), apache.APLOG_ERR) except MKGeneralException, e: - if not fail_silently: + if plain_error: + html.write(_("General error") + ": %s\n" % e) + elif not fail_silently: html.header(_("Error")) html.show_error(str(e)) html.footer() apache.log_error(_("Error: %s") % (e,), apache.APLOG_ERR) except livestatus.MKLivestatusNotFoundError, e: - if not fail_silently: + if plain_error: + html.write(_("Livestatus-data not found") + ": %s\n" % e) + elif not fail_silently: html.header(_("Data not found")) html.show_error(_("The following query produced no output:\n<pre>\n%s</pre>\n") % \ e.query) @@ -353,7 +369,9 @@ def handler(req, profiling = True): response_code = apache.HTTP_NOT_FOUND except livestatus.MKLivestatusException, e: - if not fail_silently: + if plain_error: + html.write(_("Livestatus problem") + ": %s\n" % e) + elif not fail_silently: html.header(_("Livestatus problem")) html.show_error(_("Livestatus problem: %s") % e) html.footer() @@ -364,7 +382,9 @@ def handler(req, profiling = True): raise except Exception, e: - if not fail_silently: + if plain_error: + html.write(_("Internal error") + ": %s\n" % e) + elif not fail_silently: html.header(_("Internal error")) if config.debug: html.show_error("%s: %s<pre>%s</pre>" % diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0035894..fb9eacb 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -29,9 +29,6 @@ from lib import * from mod_python import apache import os, md5, md5crypt, crypt, time -class MKAuthException(MKGeneralException): - pass - def site_cookie_name(site_id = None): if not site_id: url_prefix = defaults.url_prefix @@ -193,10 +190,12 @@ def do_login(): html.add_user_error(e.varname, e.message) return e.message -def page_login(): +def page_login(no_html_output = False): result = do_login() if type(result) == tuple: - return result # Successfull login + return result # Successful login + elif no_html_output: + raise MKAuthException(_("Invalid login credentials.")) if html.mobile: import mobile diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8e96ce8..a5c7731 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6718,14 +6718,26 @@ def do_site_login(site_id, name, password): raise MKUserError("_passwd", _("Please specify your password.")) - # Trying basic auth AND form based auth to ensure the site login works - response = get_url(site["multisiteurl"] + 'automation_login.py?_login=1' - '&_username=%s&_password=%s&_origtarget=automation_login.py' % - (name, password), site.get('insecure', False), name, password) - try: - return eval(response) - except: - raise MKAutomationException(response) + # Trying basic auth AND form based auth to ensure the site login works. + # Adding _ajaxid makes the web service fail silently with an HTTP code and + # not output HTML code for an error screen. + url = site["multisiteurl"] + 'automation_login.py?_login=1' \ + '&_username=%s&_password=%s&_origtarget=automation_login.py&_plain_error=1' % \ + (name, password) + response = get_url(url, site.get('insecure', False), name, password).strip() + if '<html>' in response.lower(): + message = _("Authentication to web service failed.<br>Message:<br>%s") % \ + htmllib.strip_tags(htmllib.strip_scripts(response)) + if config.debug: + message += "<br>Automation URL: <tt>%s</tt><br>" % url + raise MKAutomationException(message) + elif not response: + raise MKAutomationException(_("Empty response from web service")) + else: + try: + return eval(response) + except: + raise MKAutomationException(response) def upload_file(url, file_path, insecure): return get_url(url, insecure, params = ' -F snapshot=@%s' % file_path)

12 years, 2 months

Check_MK Git: check_mk: Fixed styling of globes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 818154d03feec00df42aedba49e0da7328ea72f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=818154d03feec0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 17:30:43 2012 +0200 Fixed styling of globes --- web/htdocs/dashboard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index e4ca77c..99b3c17 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -526,7 +526,7 @@ def render_statistics(pie_id, what, table, filter): len(pies) > 1 and " narrow" or "")) table_entries = pies while len(table_entries) < 6: - table_entries = table_entries + [ (("", "#fff", "", ""), " ") ] + table_entries = table_entries + [ (("", "#95BBCD", "", ""), " ") ] table_entries.append(((_("Total"), "", "all%s" % what, ""), total)) for (name, color, viewurl, query), count in table_entries: url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \

12 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012