Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64283 discussions

Check_MK Git: check_mk: Clearing refresh timers during scheduling new timers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03bae2e0abb9a457f0d2db44f295321e6c86f8b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03bae2e0abb9a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 21 16:39:14 2012 +0200 Clearing refresh timers during scheduling new timers --- web/htdocs/js/checkmk.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7267e72..36392b8 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -659,6 +659,8 @@ function setReload(secs, url) { } function startReloadTimer(url) { + if(gReloadTimer) + clearTimeout(gReloadTimer); gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); }

12 years, 4 months

Check_MK Git: check_mk: Better handling of invalid parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad09188c671126765b7741200dddef20188539ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad09188c671126… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 14:18:20 2012 +0200 Better handling of invalid parameters --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 45ee2e2..28e9325 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -584,7 +584,7 @@ class ListOf(ValueSpec): html.write('</td><td class=vlof_content>') self._valuespec.render_input( varprefix + "_" + self._magic, - self._valuespec.canonical_value()) + self._valuespec.default_value()) html.write('</td></tr></table>') # Actual table of currently existing entries @@ -1578,7 +1578,7 @@ class Tuple(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != tuple: raise MKUserError(varprefix, - _("The datatype must be a tuple, but is %s") % type(value)) + _("The datatype must be a tuple, but is %r") % type(value)) if len(value) != len(self._elements): raise MKUserError(varprefix, _("The number of elements in the tuple must be exactly %d.") % len(self._elements)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 87016d1..713f4f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9431,7 +9431,18 @@ def mode_edit_ruleset(phase): img = 'nmatch' html.write('<img align=absmiddle title="%s" class=icon src="images/icon_rule%s.png"> ' % (title, img)) if rulespec["valuespec"]: - value_html = rulespec["valuespec"].value_to_text(value) + try: + value_html = rulespec["valuespec"].value_to_text(value) + except: + try: + reason = "" + rulespec["valuespec"].validate_datatype(None, value) + except Exception, e: + reason = str(e) + + value_html = '<img src="images/icon_alert.png" class=icon>' \ + + _("The value of this rule is not valid. ") \ + + reason else: img = value and "yes" or "no" title = value and _("This rule results in a positive outcome.") \ @@ -9809,7 +9820,12 @@ def mode_edit_rule(phase): if valuespec: value = rule[0] forms.section() - valuespec.render_input("ve", value) + try: + valuespec.validate_datatype("ve", value) + valuespec.render_input("ve", value) + except: + valuespec.render_input("ve", valuespec.default_value()) + valuespec.set_focus("ve") else: forms.section("")

12 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92fce2c7121d0e3d0cfdb77486a785f9c79877cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92fce2c7121d0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 15:01:10 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fix two bugs in ValueSpec:validate_datatype

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 615ebcd9c87a5428edeb0105e00d47f59463c032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615ebcd9c87a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 14:53:53 2012 +0200 Fix two bugs in ValueSpec:validate_datatype --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 28e9325..3898041 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -634,8 +634,8 @@ class ListOf(ValueSpec): return value def validate_datatype(self, value, varprefix): - if type(self) != list: - raise MKUserError(varprefx, _("The type must be list, but is %s") % type(value)) + if type(value) != list: + raise MKUserError(varprefix, _("The type must be list, but is %r") % type(value)) for n, v in enumerate(value): self._valuespec.validate_datatype(v, varprefix + "_%d" % (n+1)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 713f4f4..a0a2eb0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9436,7 +9436,7 @@ def mode_edit_ruleset(phase): except: try: reason = "" - rulespec["valuespec"].validate_datatype(None, value) + rulespec["valuespec"].validate_datatype(value, "") except Exception, e: reason = str(e) @@ -9821,9 +9821,11 @@ def mode_edit_rule(phase): value = rule[0] forms.section() try: - valuespec.validate_datatype("ve", value) + valuespec.validate_datatype(value, "ve") valuespec.render_input("ve", value) except: + if config.debug: + raise valuespec.render_input("ve", valuespec.default_value()) valuespec.set_focus("ve")

12 years, 4 months

Check_MK Git: check_mk: services: introduce parameters, including WATO rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5000f0dad31880562ad50e3d801767f6669c18f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5000f0dad31880… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 15:01:06 2012 +0200 services: introduce parameters, including WATO rule --- ChangeLog | 2 + checkman/services | 25 ++++++++- checks/services | 94 ++++++++++++++++++++++++--------- web/plugins/wato/check_parameters.py | 58 ++++++++++++++++++++- 4 files changed, 148 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5000f0dad3…

12 years, 4 months

Check_MK Git: check_mk: Add heading and rename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c33d21e4a3cfdb76d87d40a0900b0b73e869d08b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c33d21e4a3cfdb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:54:22 2012 +0200 Add heading and rename --- agents/plugins/lnx_lvmstat | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lnx_lvmstat b/agents/plugins/lnx_lvmstat index 7e6f5ef..7539353 100755 --- a/agents/plugins/lnx_lvmstat +++ b/agents/plugins/lnx_lvmstat @@ -23,6 +23,8 @@ lvlist = subprocess.Popen(["lvs", "--nosuffix", "-o", "vg_name,lv_name" ], stdout=subprocess.PIPE) +print "<<<lnx_lvmstat>>>" + # with this list from lvm we can now find the dm nodes of the volumes for line in lvlist.stdout.readlines():

12 years, 4 months

Check_MK Git: check_mk: Add heading and rename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d54dcfb612a0313f01f0991b9922a4f7c972f97c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d54dcfb612a031… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:54:05 2012 +0200 Add heading and rename --- agents/plugins/{lvmstat => lnx_lvmstat} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lvmstat b/agents/plugins/lnx_lvmstat similarity index 100% rename from agents/plugins/lvmstat rename to agents/plugins/lnx_lvmstat

12 years, 4 months

Check_MK Git: check_mk: Linux Agent: Plugin for tracking LVM volume statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41678d1fe567c583c02fb27c0a16791aa3d12861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41678d1fe567c5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:50:32 2012 +0200 Linux Agent: Plugin for tracking LVM volume statistics --- agents/plugins/lvmstat | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lvmstat b/agents/plugins/lvmstat new file mode 100755 index 0000000..7e6f5ef --- /dev/null +++ b/agents/plugins/lvmstat @@ -0,0 +1,60 @@ +#!/usr/bin/python + +# Agent plugin to gather io statistics on lvm volumes +# as tricky as i'd have expected. +# it seems there is no way to ask devmapper for lvm volumes only. +# (...major numbers were such an awesome idea) + + +import os +import subprocess + + +# should be a dict +# { "dm-1" : (vg01, lvol12)} +devices = {} +stats = {} + + +# grab volume groups and lv's from lvm. Otherwise we might also find devices that +# are used by "something completely different" - i.e. multipath targets +lvlist = subprocess.Popen(["lvs", + "--separator", ";", "--noheadings", + "--nosuffix", "-o", "vg_name,lv_name" ], + stdout=subprocess.PIPE) + + +# with this list from lvm we can now find the dm nodes of the volumes +for line in lvlist.stdout.readlines(): + line = line.strip() + vg_name, lv_name = line.split(";") + # Found this in dtc-xen's statistics server. Greetings to Thomas! + minor = os.minor(os.stat("/dev/%s/%s" % (vg_name, lv_name)).st_rdev) + dmdev = "dm-%s" % minor + devices.update( { dmdev : (vg_name, lv_name)}) + + + +# then we can parse our nice new dictionary and grab the stats for each blockdev +for dmdev in devices.keys(): + counter = "/sys/block/%s/stat" % dmdev + stats[dmdev] = file(counter).read().rstrip() + + # read the gathered stats and if they are showing no IO, then + # either there was the counters disabled (and we enable them) + # or there was simply no IO to the LVM volume. + + if sum(map(int, stats[dmdev].split()[3-8])) == 0: + stats_switch = "/sys/block/%s/queue/iostats" % dmdev + if map(int, file(stats_switch).read().rstrip()) == 0: + os.system("echo 1 > /sys/block/%s/queue/iostats" % dmdev) + + print ("%s/%s %s") % (devices[dmdev][0],devices[dmdev][1], stats[dmdev]) + + + + + +# BUGS: this script uses stat and open/read/close on each lvm volume. +# in large-scale systems this is quite inefficient. +# OTOH systems of that scale typically use VxVM instead of LVM.

12 years, 4 months

Check_MK Git: check_mk: printer_alerts: new configuration variable printer_alerts_text_map

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af337e558b8fecbb5ee93bc81722f84c7bab2dd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af337e558b8fec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 10:31:45 2012 +0200 printer_alerts: new configuration variable printer_alerts_text_map --- ChangeLog | 2 ++ checkman/printer_alerts | 10 ++++++++++ checks/printer_alerts | 22 ++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a982db3..a986b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,8 @@ * FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name * New active check via WATO: check_ldap + * printer_alerts: new configuration variable printer_alerts_text_map. Make + 'Energiesparen' on Brother printers an OK state. BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checkman/printer_alerts b/checkman/printer_alerts index 85ab277..b217657 100644 --- a/checkman/printer_alerts +++ b/checkman/printer_alerts @@ -23,9 +23,19 @@ examples: 0: [ 4, 6, 7, 19, 20, 23, 24, 25, 27, 35, 36, 37, 38, 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, 1503, 1504, 1505, 1506, 1509 ], } + # Make 'Energiesparen' an OK state + printer_alerts_text_map = { + 'Energiesparen' : 0, + } + [configuration] printer_alerts_state_map(dict): Can be used to configure state codes reported by the printer to result in individual nagios states. This dictionary contains three elements. One for each nagios state. Each element holds a list of state codes to result in this state. Take a look at the example section to see the defaults. + +printer_alerts_text_map(dict): Some printers send a status code of {-1} in some cases. + But you can use the additional descriptive text sent by the printer for assigning + a monitoring state by using this dictionary. The key is the descriptive text. The + value is 0 (OK), 1 (WARN), 2 (CRIT) or 3 (UNKNOWN). diff --git a/checks/printer_alerts b/checks/printer_alerts index 58ba220..95ac1dc 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -70,6 +70,14 @@ printer_alerts_state_map = { 1503, 1504, 1505, 1506, 1509 ], } +# Some printers send a code of -1 but an additional text +# that allows us to generate a useful state - at the price +# of providing texts in the native language of the country +# of the printers user. +printer_alerts_text_map = { + 'Energiesparen' : 0, +} + def inventory_printer_alerts(info): return [ (None, None) ] @@ -84,10 +92,16 @@ def check_printer_alerts(_not_used, _not_used1, info): for sev, group, group_index, code, desc in info: state = 3 # UNKNOWN + if desc in printer_alerts_text_map: + state = printer_alerts_text_map[desc] + sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) + break + for s in [ 2, 1, 0 ]: if saveint(code) in printer_alerts_state_map[s]: state = s break + # Code not found -> take into account severity if state == 3 and sev == '1': state = 0 @@ -103,8 +117,11 @@ def check_printer_alerts(_not_used, _not_used1, info): elif state > sum_state: sum_state = state - sum_txt.append('%s - %s - %s (%s)' % (nagios_state_names[state], - group_txt, desc, code)) + info_text = '%s - %s - %s' % (nagios_state_names[state], group_txt, desc) + if state == 3 and code != -1: + info_text += " (code: %d)" % code + + sum_txt.append(info_text) return (sum_state, ', '.join(sum_txt)) @@ -119,6 +136,7 @@ snmp_info['printer_alerts'] = ( ".1.3.6.1.2.1.43.18.1.1", [ ] ) check_config_variables.append("printer_alerts_state_map") +check_config_variables.append("printer_alerts_text_map") snmp_scan_functions['printer_alerts'] = \ lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0753

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ae05162aed050b01f051df14a86fb8863ec1be2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae05162aed050… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 19:06:11 2012 +0200 Updated bug entries #0753 --- .bugs/753 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/753 b/.bugs/753 new file mode 100644 index 0000000..08df980 --- /dev/null +++ b/.bugs/753 @@ -0,0 +1,11 @@ +Title: Table-Layout with multiple columns: gap missing if no grouping +Component: multisite +State: open +Date: 2012-05-20 19:05:00 +Targetversion: 1.2.0 +Class: bug + +In the table layout if you select more than one column, then +there should be a small gap between the columns. This is painted, +but only when there is at least one grouping column - even if it +is not visible.

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits