Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64379 discussions

Check_MK Git: check_mk: FIX: zfsget: fix exception on snapshot volumes

by Mathias Kettner

Module: check_mk Branch: master Commit: 438daff35357fef70715913ff09f675269ac854a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438daff35357fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 08:24:48 2012 +0100 FIX: zfsget: fix exception on snapshot volumes --- ChangeLog | 1 + checks/zfsget | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30c344a..4a96c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * Add: check to monitor the summary status of HP EML tape libraries * Add: apc_rackpdu_status - monitor the power consumption on APC rack PDUs * Add: sym_brightmail_queues - monitor the queue levels on Symantec Brightmail mail scanners. + * FIX: zfsget: fix exception on snapshot volumes (where available is '-') Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/checks/zfsget b/checks/zfsget index fa5f8c2..0ed6f93 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -41,16 +41,16 @@ def parse_zfsget(info): def mb(x): - return int(x) / (1024.0 * 1024) + return saveint(x) / (1024.0 * 1024) - entries = {} + entries = [] entry = None last_name = None for line in info: name, what, value = line[:3] if last_name != name: if entry: - entries[entry["mountpoint"]] = entry + entries.append(entry) entry = {} last_name = name if what in ["used", "available"]: @@ -58,25 +58,28 @@ def parse_zfsget(info): elif what == "quota": if value not in [ '0', '-' ]: entry[what] = mb(value) - elif what in [ 'mountpoint', 'type' ]: + elif what in [ 'mountpoint', 'type', 'name' ]: entry[what] = value if entry: - entries[entry["mountpoint"]] = entry + entries.append(entry) - for mountpoint, entry in entries.items(): - if entry["type"] == 'volume': - del entries[mountpoint] - entry["is_pool"] = '/' not in name - return entries + parsed = {} + for entry in entries: + if entry["mountpoint"] != '-': + entry["is_pool"] = '/' not in name + parsed[entry["mountpoint"]] = entry + return parsed def inventory_zfsget(info): mplist = [] - for mountpoint in parse_zfsget(info): + parsed = parse_zfsget(info) + for mountpoint, properties in parsed.items(): if mountpoint not in inventory_df_exclude_mountpoints: - mplist.append(mountpoint) + if True or properties["available"] != 0: + mplist.append(mountpoint) return df_inventory(mplist)

11 years, 9 months

Check_MK Git: check_mk: Fix complaining of passwords

by Mathias Kettner

Module: check_mk Branch: master Commit: 049fb780f34aebf6c6ea60ac3a6ba3e9b45ba3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049fb780f34aeb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 7 13:07:55 2012 +0100 Fix complaining of passwords --- web/htdocs/js/checkmk.js | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 028e9e0..c187094 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1605,7 +1605,10 @@ function vs_passwordspec_randomize(img) { password += c; } } - img.previousElementSibling.value = password; + var oInput = img.previousElementSibling; + if (oInput.tagName != "INPUT") + oInput = oInput.firstChild; // in complain mode + oInput.value = password; }

11 years, 9 months

Check_MK Git: check_mk: Moved ValueSpec PasswordSpec to general lib

by Mathias Kettner

Module: check_mk Branch: master Commit: 049d423d1281bf77b2af99ffcf254ae12809542d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049d423d1281bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 7 13:05:45 2012 +0100 Moved ValueSpec PasswordSpec to general lib --- web/htdocs/index.py | 2 +- web/htdocs/js/checkmk.js | 16 ++++++++++++++++ web/htdocs/lib.py | 4 ++-- web/htdocs/valuespec.py | 16 ++++++++++++++-- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index c946514..9a878ed 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -371,7 +371,7 @@ def handler(req, profiling = True): html.header(_("Error")) html.show_error(str(e)) html.footer() - apache.log_error(_("Error: %s") % (e,), apache.APLOG_ERR) + # apache.log_error(_("Error: %s") % (e,), apache.APLOG_ERR) except livestatus.MKLivestatusNotFoundError, e: if plain_error: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 29b5434..028e9e0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1594,6 +1594,22 @@ function valuespec_listof_fixarrows(oTbody) { } } +function vs_passwordspec_randomize(img) { + password = ""; + while (password.length < 8) { + a = parseInt(Math.random() * 128); + if ((a >= 97 && a <= 122) || + (a >= 65 && a <= 90) || + (a >= 48 && a <= 57)) { + c = String.fromCharCode(a); + password += c; + } + } + img.previousElementSibling.value = password; +} + + + function help_enable() { var aHelp = document.getElementById('helpbutton'); aHelp.style.display = "inline-block"; diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5af2f44..00f7e7c 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -34,13 +34,13 @@ class MKGeneralException(Exception): def __init__(self, reason): self.reason = reason def __str__(self): - return str(self.reason) + return self.reason class MKAuthException(Exception): def __init__(self, reason): self.reason = reason def __str__(self): - return str(self.reason) + return self.reason class MKUnauthenticatedException(MKGeneralException): pass diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6f9498e..76fe659 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -336,10 +336,10 @@ class TextAscii(ValueSpec): if self._none_is_empty and value == "": raise MKUserError(varprefix, _("An empty value must be represented with None here.")) if not self._allow_empty and value.strip() == "": - raise MKUserError(varprefix, self.title() + ": " + _("An empty value is not allowed here.")) + raise MKUserError(varprefix, _("An empty value is not allowed here.")) if value and self._regex: if not self._regex.match(value): - raise MKUserError(varprefix, self.title() + ": " + self._regex_error) + raise MKUserError(varprefix, self._regex_error) # Internal ID as used in many places (for contact names, group name, # an so on) @@ -2158,3 +2158,15 @@ class Password(TextAscii): return _("none") else: return '******' + +class PasswordSpec(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + + def render_input(self, varprefix, value): + TextAscii.render_input(self, varprefix, value) + if not value: + html.icon_button("#", _(u"Randomize password"), "random", + onclick="vs_passwordspec_randomize(this);") + +

11 years, 9 months

Check_MK Git: check_mk: EC: fix omd Makefile

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e54db97549aa1c6a91f2c719c3facad2f0257fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e54db97549aa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 7 10:51:32 2012 +0100 EC: fix omd Makefile --- mkeventd/omd/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mkeventd/omd/Makefile b/mkeventd/omd/Makefile index b0619de..42ae43a 100644 --- a/mkeventd/omd/Makefile +++ b/mkeventd/omd/Makefile @@ -12,6 +12,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/bin install -m 755 $(DIR)/bin/* $(DESTDIR)$(OMD_ROOT)/bin install -m 755 $(DIR)/src/mkevent $(DESTDIR)$(OMD_ROOT)/bin + install -m 755 $(DIR)/src/mkeventd_open514 $(DESTDIR)$(OMD_ROOT)/bin mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins install -m 755 $(DIR)/lib/* $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/checks

11 years, 9 months

Check_MK Git: check_mk: EC: remove some debug messages

by Mathias Kettner

Module: check_mk Branch: master Commit: c20a3511d74b6cf1c9adeacf6cceb6270df20b4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c20a3511d74b6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 6 21:22:52 2012 +0100 EC: remove some debug messages --- mkeventd/bin/mkeventd | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 36ec45c..2cec2a3 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -736,8 +736,6 @@ class EventServer: listen_list = [ pipe ] if self._syslog != None: listen_list.append(self._syslog.fileno()) - log("FD geerbt: %d" % opt_syslog_fd) - log("FD von syslog: %d" % self._syslog.fileno()) while True: readable = select.select(listen_list, [], [], None)[0] @@ -746,7 +744,6 @@ class EventServer: try: data = os.read(pipe, 4096) if len(data) == 0: # END OF FILE! - log("DAS GIBTS NICHT!") os.close(pipe) pipe = self.open_pipe() listen_list[0] = pipe @@ -756,7 +753,6 @@ class EventServer: data = self._syslog.recv(4096) if data: - log("JUHU: [%s]" % data) lines = data.splitlines() for line in lines: line = line.rstrip()

11 years, 9 months

Check_MK Git: check_mk: EC: new builtin syslog server

by Mathias Kettner

Module: check_mk Branch: master Commit: 312d7fb546947386f62dde9c2b21ff197d082ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=312d7fb5469473… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 6 20:51:15 2012 +0100 EC: new builtin syslog server --- ChangeLog | 1 + mkeventd/.f12 | 4 +- mkeventd/bin/mkeventd | 104 +++++++++++++++++++++++++++++-------- mkeventd/omd/.f12 | 2 + mkeventd/omd/MKEVENTD_SYSLOG.hook | 25 +++++++++ mkeventd/omd/mkeventd.init | 9 +++- mkeventd/src/.gitignore | 1 + mkeventd/src/Makefile | 7 ++- mkeventd/src/mkeventd_open514.c | 105 +++++++++++++++++++++++++++++++++++++ 9 files changed, 232 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=312d7fb546…

11 years, 9 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: ca729450fb741cb6c8844abeba150a69e27d37ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca729450fb741c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 6 20:51:22 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 864565cc63b3390098d0dee4f915e74677b8bea1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=864565cc63b339… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 17:36:11 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: ldap: added debug notes

by Lars Michelsen

Module: check_mk Branch: master Commit: aaaf9899067345386e083620a60ffe87e4f7fb4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaaf9899067345… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 17:33:53 2012 +0100 ldap: added debug notes --- web/plugins/userdb/ldap.py | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 8538efd..8942f77 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -29,7 +29,19 @@ import time # FIXME: For some reason mod_python is missing /usr/lib/python2.7/dist-packages # in sys.path. Therefor the ldap module can not be found. Need to fix this! -import sys ; sys.path.append('/usr/lib/python2.7/dist-packages') +#import sys ; sys.path.append('/usr/lib/python2.7/dist-packages') +# +# details: /usr/lib/python2.7/site.py +# +# My assumption is that there is a problem during compilation/execution of mod_python. +# When starting python as site user, the correct sys.path is set, when printing sys.path +# from mod_python code for debugging, it misses a lot of paths. +# +# mod_python: +# ['/omd/sites/event/local/share/check_mk/web/htdocs', '/omd/sites/event/share/check_mk/web/htdocs', '/omd/versions/2012.10.25.mk/lib/python', '/omd/sites/event/lib/python', '/omd/sites/event/local/lib/python', '/usr/lib/python2.7/', '/usr/lib/python2.7/plat-linux2', '/usr/lib/python2.7/lib-tk', '/usr/lib/python2.7/lib-old', '/usr/lib/python2.7/lib-dynload'] +# +# >>> sys.path +# ['', '/usr/local/lib/python2.7/dist-packages/pip-1.1-py2.7.egg', '/usr/local/lib/python2.7/dist-packages/xhtml2pdf-0.0.4-py2.7.egg', '/usr/local/lib/python2.7/dist-packages/pyPdf-1.13-py2.7.egg', '/usr/local/lib/python2.7/dist-packages/html5lib-0.95-py2.7.egg', '/usr/lib/python2.7/dist-packages/PIL', '/usr/local/lib/python2.7/dist-packages/pisa-3.0.33-py2.7.egg', '/usr/lib/python2.7', '/usr/lib/python2.7/plat-linux2', '/usr/lib/python2.7/lib-tk', '/usr/lib/python2.7/lib-old', '/usr/lib/python2.7/lib-dynload', '/usr/local/lib/python2.7/dist-packages', '/usr/lib/python2.7/dist-packages', '/usr/lib/python2.7/dist-packages/gst-0.10', '/usr/lib/python2.7/dist-packages/gtk-2.0', '/usr/lib/pymodules/python2.7', '/usr/lib/python2.7/dist-packages/ubuntu-sso-client', '/usr/lib/python2.7/dist-packages/ubuntuone-client', '/usr/lib/python2.7/dist-packages/ubuntuone-control-panel', '/usr/lib/python2.7/dist-packages/ubuntuone-couch', '/usr/lib/python2.7/dist-packages/ubuntuone-installer', '/usr/lib/python2.7/dist-packages/ubuntuone-storage-protocol', '/usr/lib/python2.7/dist-packages/wx-2.8-gtk2-unicode'] try: # docs: http://www.python-ldap.org/doc/html/index.html import ldap

11 years, 10 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 363f7a8d16e75ac27c2617ba84fb10f6e56cc31a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=363f7a8d16e75a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 17:23:47 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits