Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Fix rule editor: only one folder was shown

by Mathias Kettner

Module: check_mk Branch: master Commit: c4abd0324d5a3126d75d0396aa2a7c05411d04d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4abd0324d5a31… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 11:48:20 2013 +0200 Fix rule editor: only one folder was shown --- web/htdocs/wato.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7056e83..93a5f32 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10063,6 +10063,8 @@ def mode_edit_ruleset(phase): for rulenr in range(0, len(ruleset)): folder, rule = ruleset[rulenr] if folder != last_folder: + if last_folder != None: + table.end() first_in_group = True alias_path = get_folder_aliaspath(folder, show_main = False) table.begin(title = "%s %s" % (_("Rules in folder"), alias_path), css="ruleset")

11 years, 2 months

Check_MK Git: check_mk: Remove self-healing table.end()

by Mathias Kettner

Module: check_mk Branch: master Commit: 903a2174477db101e236c3c061a6421bb7beb807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=903a2174477db1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 12:21:17 2013 +0200 Remove self-healing table.end() --- web/htdocs/table.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 8f81e02..c8d833b 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -90,8 +90,6 @@ def end(): global table finish_previous() html.unplug() - if not table: - return if not table["rows"] and table["omit_if_empty"]: table = None

11 years, 2 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: ea2d617db8f98732ac3536edf679f282cf604a46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea2d617db8f987… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 12:18:54 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: web/htdocs/wato.py ---

11 years, 2 months

Check_MK Git: check_mk: Fix: remove duplicate table.end() in rule editor

by Mathias Kettner

Module: check_mk Branch: master Commit: bfb0fee572ed429548aad7e336fdd7f5493617ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfb0fee572ed42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 12:19:57 2013 +0200 Fix: remove duplicate table.end() in rule editor --- web/htdocs/wato.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 43aa2c2..756abed 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10067,7 +10067,6 @@ def mode_edit_ruleset(phase): table.end() first_in_group = True alias_path = get_folder_aliaspath(folder, show_main = False) - table.end() table.begin(title = "%s %s" % (_("Rules in folder"), alias_path), css="ruleset") rel_rulenr = 0 last_folder = folder

11 years, 2 months

Check_MK Git: check_mk: fixed html rendering of rulesets

by Andreas Boesl

Module: check_mk Branch: master Commit: 35f643bf131078f048d8e69ce12a78b58af7fe56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35f643bf131078… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 11 12:02:10 2013 +0200 fixed html rendering of rulesets --- web/htdocs/table.py | 2 ++ web/htdocs/wato.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index c8d833b..8f81e02 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -90,6 +90,8 @@ def end(): global table finish_previous() html.unplug() + if not table: + return if not table["rows"] and table["omit_if_empty"]: table = None diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c2cb14d..ea2a0a2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10065,6 +10065,7 @@ def mode_edit_ruleset(phase): if folder != last_folder: first_in_group = True alias_path = get_folder_aliaspath(folder, show_main = False) + table.end() table.begin(title = "%s %s" % (_("Rules in folder"), alias_path), css="ruleset") rel_rulenr = 0 last_folder = folder @@ -10200,8 +10201,9 @@ def mode_edit_ruleset(phase): html.icon_button(url, _("Context information about this rule"), "url", target="_blank") html.write(" ") html.write(htmllib.attrencode(rule_options.get("comment", ""))) + + table.end() - table.end() create_new_rule_form(rulespec, hostname, item)

11 years, 2 months

Check_MK Git: check_mk: fixed crash when check_interval in extra_service_conf is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: ed203da1e9560a828c404ab283d46f81d13d5d55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed203da1e9560a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 11 10:55:10 2013 +0200 fixed crash when check_interval in extra_service_conf is missing --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e07ad46..f9fe105 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1784,7 +1784,7 @@ def create_nagios_servicedefs(outfile, hostname): # (if configured) the snmp_check_interval for snmp based checks check_interval = 60 # default hardcoded interval # Customized interval of Check_MK service - values = service_extra_conf(hostname, "Check_MK", extra_service_conf.get('check_interval')) + values = service_extra_conf(hostname, "Check_MK", extra_service_conf.get('check_interval', [])) if values: check_interval = values[0] * 60 value = check_interval_of(hostname, checkname)

11 years, 2 months

Check_MK Git: check_mk: Rulesets: correct display of rules within subfolders

by Andreas Boesl

Module: check_mk Branch: master Commit: d648c8f188ab6e24239fa24f4b65f16e63b8f8d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d648c8f188ab6e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 11 10:27:14 2013 +0200 Rulesets: correct display of rules within subfolders --- ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b722116..664c7e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ for each logfile on a host * Configuration of an alternativ host check command * Inventory: Display link symbol for ps ruleset + * FIX: Rulesets: correct display of rules within subfolders 1.2.2p1: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1fd6d18..c2cb14d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10201,7 +10201,8 @@ def mode_edit_ruleset(phase): html.write(" ") html.write(htmllib.attrencode(rule_options.get("comment", ""))) - table.end() + table.end() + create_new_rule_form(rulespec, hostname, item)

11 years, 2 months

Check_MK Git: check_mk: Beautification of code in brightmail check

by Mathias Kettner

Module: check_mk Branch: master Commit: f28c05e79187bfb4739b307801c31c3961629171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f28c05e79187bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 10 17:12:13 2013 +0200 Beautification of code in brightmail check --- checks/sym_brightmail_queues | 75 ++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 36 deletions(-) diff --git a/checks/sym_brightmail_queues b/checks/sym_brightmail_queues index b3ffe5f..ed11970 100644 --- a/checks/sym_brightmail_queues +++ b/checks/sym_brightmail_queues @@ -25,32 +25,33 @@ # Boston, MA 02110-1301 USA. -#.1.3.6.1.4.1.393.200.130.2.1.2.1 = INTEGER: 1 -#.1.3.6.1.4.1.393.200.130.2.1.2.2 = INTEGER: 1 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.1 = INTEGER: 1 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.2 = INTEGER: 2 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.3 = INTEGER: 3 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.1 = STRING: "delivery" -#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.2 = STRING: "inbound" -#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.3 = STRING: "outbound" -#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.1 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.2 = Gauge32: 1 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.3 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.1 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.2 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.3 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.1 = Gauge32: 4 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.2 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.3 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.1 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.2 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.3 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.1 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.2 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.3 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.1 = Gauge32: 5 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.2 = Gauge32: 0 -#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.3 = Gauge32: 0 +# Example part from SNMP walk: +# .1.3.6.1.4.1.393.200.130.2.1.2.1 = INTEGER: 1 +# .1.3.6.1.4.1.393.200.130.2.1.2.2 = INTEGER: 1 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.1.1 = INTEGER: 1 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.1.2 = INTEGER: 2 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.1.3 = INTEGER: 3 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.2.1 = STRING: "delivery" +# .1.3.6.1.4.1.393.200.130.2.2.1.1.2.2 = STRING: "inbound" +# .1.3.6.1.4.1.393.200.130.2.2.1.1.2.3 = STRING: "outbound" +# .1.3.6.1.4.1.393.200.130.2.2.1.1.3.1 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.3.2 = Gauge32: 1 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.3.3 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.4.1 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.4.2 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.4.3 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.5.1 = Gauge32: 4 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.5.2 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.5.3 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.6.1 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.6.2 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.6.3 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.7.1 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.7.2 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.7.3 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.8.1 = Gauge32: 5 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.8.2 = Gauge32: 0 +# .1.3.6.1.4.1.393.200.130.2.2.1.1.8.3 = Gauge32: 0 # Legacy default #brightmail_message_levels = {} @@ -104,14 +105,16 @@ check_info["sym_brightmail_queues"] = { "inventory_function" : inventory_sym_brightmail_queues, "service_description" : "Queue %s", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower() and oid(".1.3.6.1.4.1.393.200.130.2.1.2.1"), - "snmp_info" : (".1.3.6.1.4.1.393.200.130.2", [ - "2.1.1.2", # InstanceDescr - "2.1.1.3", # Connections - "2.1.1.4", # dataRate - "2.1.1.5", # deferedMessages - "2.1.1.6", # messageRate - "2.1.1.7", # queueSize - "2.1.1.8", # queuedMessages - ]) + "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + oid(".1.3.6.1.4.1.393.200.130.2.1.2.1"), + "snmp_info" : ( + ".1.3.6.1.4.1.393.200.130.2", [ + "2.1.1.2", # InstanceDescr + "2.1.1.3", # Connections + "2.1.1.4", # dataRate + "2.1.1.5", # deferedMessages + "2.1.1.6", # messageRate + "2.1.1.7", # queueSize + "2.1.1.8", # queuedMessages + ]), }

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_datastores: Fix exception if uncommitted is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a0b9a22b65968ff4c23c9c750e462bbd2685a42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0b9a22b65968… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 10 17:05:55 2013 +0200 esx_vsphere_datastores: Fix exception if uncommitted is missing --- checks/esx_vsphere_datastores | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 1893635..5eabe63 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -69,7 +69,7 @@ def check_esx_vsphere_datastores(item, params, info): #VMFS Stores has no field uncommitted if store['type'] == 'NFS': - uncommitted_mb = store["uncommitted"] / 1024.0 / 1024.0 + uncommitted_mb = store.get("uncommitted", 0.0) / 1024.0 / 1024.0 used_mb = size_mb - avail_mb overprov_mb = used_mb + uncommitted_mb overprov_percent = (overprov_mb / size_mb) * 100

11 years, 2 months

Check_MK Git: check_mk: Fix check output in sym_brightmail_queues

by Mathias Kettner

Module: check_mk Branch: master Commit: 6b6345c38515a90c561045378a7207776de3739a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b6345c38515a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 10 16:24:49 2013 +0200 Fix check output in sym_brightmail_queues --- checks/sym_brightmail_queues | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/sym_brightmail_queues b/checks/sym_brightmail_queues index c18b12d..b3ffe5f 100644 --- a/checks/sym_brightmail_queues +++ b/checks/sym_brightmail_queues @@ -96,7 +96,7 @@ def check_sym_brightmail_queues(item, params, info): - return (3, "UNKW - Queue not found in agent output") + return (3, "Queue not found in agent output") check_info["sym_brightmail_queues"] = {

11 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013