Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3364 FIX Fixed exception when creating a view of a single log entry

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cfc791db6860ee0192eb79adb766074d311df1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cfc791db6860e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 11:34:28 2016 +0200 3364 FIX Fixed exception when creating a view of a single log entry When one creates a view of a single log entry, this resulted in an exception like "TypeError: 'NoneType' object is not iterable". This has been fixed now. However it is currently not possible to create such a view since the logfile info (data source) is not supporting referencing of single log entries. --- .werks/3364 | 14 ++++++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 6 +++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/3364 b/.werks/3364 new file mode 100644 index 0000000..6ab78f3 --- /dev/null +++ b/.werks/3364 @@ -0,0 +1,14 @@ +Title: Fixed exception when creating a view of a single log entry +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459935119 + +When one creates a view of a single log entry, this resulted in an +exception like "TypeError: 'NoneType' object is not iterable". This +has been fixed now. However it is currently not possible to create +such a view since the logfile info (data source) is not supporting +referencing of single log entries. diff --git a/ChangeLog b/ChangeLog index fe50c76..77563e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -168,6 +168,7 @@ * 3360 FIX: Fixed different exceptions in predictive monitoring GUI * 3320 FIX: Fix bogus interfering snapins Tree of folders and Folders... * 3321 FIX: Globes in dashboards now correctly reflect selected WATO folder... + * 3364 FIX: Fixed exception when creating a view of a single log entry... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index c7c1cf0..2bafd63 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1265,7 +1265,11 @@ def visual_title(what, visual): # the variables "event_id" and "history_line" to be set in order # to exactly specify one history entry. def info_params(info_key): - return dict(infos[info_key]['single_spec']).keys() + single_spec = infos[info_key]['single_spec'] + if single_spec == None: + return [] + else: + return dict(single_spec).keys() def get_single_info_keys(visual): keys = []

8 years, 5 months

3323 FIX kernel.util: fix graph template in case steal is present but guest not

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cc83c8ddfc41e2d00dc888348edfbb706d55f81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc83c8ddfc41e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 11:17:52 2016 +0200 3323 FIX kernel.util: fix graph template in case steal is present but guest not --- .werks/3323 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 16 ++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/.werks/3323 b/.werks/3323 new file mode 100644 index 0000000..5485b1c --- /dev/null +++ b/.werks/3323 @@ -0,0 +1,10 @@ +Title: kernel.util: fix graph template in case steal is present but guest not +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459934244 + + diff --git a/ChangeLog b/ChangeLog index 3f75f3f..fe50c76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 3022 FIX: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)... * 3112 FIX: esx_vsphere_counters: made levels configurable * 3113 FIX: windows agent: fixed process handle weren't freed when using wmi-based ps check + * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 82b2d4b..0195927 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5278,6 +5278,22 @@ graph_info.append({ ( "user", "area" ), ( "system", "stack" ), ( "io_wait", "stack" ), + ( "cpu_util_steal", "stack" ), + ( "user,system,io_wait,cpu_util_steal,+,+,+#004080", "line", _("Total") ), + ], + "conflicting_metrics" : [ + "cpu_util_guest", + ], + "omit_zero_metrics" : True, + "range" : (0, 100), +}) + +graph_info.append({ + "title" : _("CPU utilization"), + "metrics" : [ + ( "user", "area" ), + ( "system", "stack" ), + ( "io_wait", "stack" ), ( "cpu_util_guest", "stack" ), ( "cpu_util_steal", "stack" ), ( "user,system,io_wait,cpu_util_guest,cpu_util_steal,+,+,+,+#004080", "line", _("Total") ),

8 years, 5 months

3363 FIX Exceptions in WATO Web-API are now rendered as plain text messages

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a9afa21d80092a29fd2d8bc0ef9453ebd03a16e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a9afa21d80092… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 11:08:41 2016 +0200 3363 FIX Exceptions in WATO Web-API are now rendered as plain text messages --- .werks/3363 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3363 b/.werks/3363 new file mode 100644 index 0000000..cb0e632 --- /dev/null +++ b/.werks/3363 @@ -0,0 +1,10 @@ +Title: Exceptions in WATO Web-API are now rendered as plain text messages +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459933673 + + diff --git a/ChangeLog b/ChangeLog index 811e81c..3f75f3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -216,6 +216,7 @@ * 3359 FIX: Fixed exception when trying to edit non existant host... * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot * 3362 FIX: Fixed reload of Event Console in distributed monitoring slave site + * 3363 FIX: Exceptions in WATO Web-API are now rendered as plain text messages Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b65c788..8a4f383 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -203,7 +203,7 @@ def fail_silently(): # Webservice functions may decide to get a normal result code # but a text with an error message in case of an error def plain_error(): - return html.has_var("_plain_error") + return html.has_var("_plain_error") or html.myfile == "webapi" def page_not_found():

8 years, 5 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c99dc54319bdd5edb02a0718f0ceb4b85f463a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c99dc54319bdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 11:07:40 2016 +0200 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 994cdb5..8899893 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3363 +3393

8 years, 5 months

3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a3118560c76e684050d7afc2621e8ff103d3389 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3118560c76e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 11:04:47 2016 +0200 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag Thanks to Markus Weber. --- .werks/3322 | 9 +++++++++ ChangeLog | 1 + inventory/esx_vsphere_hostsystem | 13 +++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/3322 b/.werks/3322 new file mode 100644 index 0000000..05e0e2b --- /dev/null +++ b/.werks/3322 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1459933454 +Class: feature + +Thanks to Markus Weber. diff --git a/ChangeLog b/ChangeLog index c037d03..811e81c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ HW/SW-Inventory: * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... + * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag... * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/inventory/esx_vsphere_hostsystem b/inventory/esx_vsphere_hostsystem index f357675..c22098b 100644 --- a/inventory/esx_vsphere_hostsystem +++ b/inventory/esx_vsphere_hostsystem @@ -61,7 +61,8 @@ def inv_esx_vsphere_hostsystem(info): "hardware.cpuPkg": { "index": True}, "hardware.cpuInfo": { "index": False}, "hardware.biosInfo": { "index": False}, - "hardware.systemInfo": { "index": False} + "hardware.systemInfo": { "index": False}, + "hardware.memorySize": { "index": False} } data = inv_esx_vsphere_hostsystem_parse(info, inv_items) @@ -89,7 +90,6 @@ def inv_esx_vsphere_hostsystem(info): node = inv_tree("hardware.bios.") node["version"] = data["hardware.biosInfo"]["biosVersion"] - import time try: node["date"] = float(time.strftime("%s", \ time.strptime(data["hardware.biosInfo"]["releaseDate"],"%Y-%m-%dT%H:%M:%SZ"))) @@ -104,6 +104,15 @@ def inv_esx_vsphere_hostsystem(info): if node["vendor"] == "HP": node["serial"] = data["hardware.systemInfo.otherIdentifyingInfo.ServiceTag"]["0"] + if "uuid" in data["hardware.systemInfo"]: + node["uuid"] = data["hardware.systemInfo"]["uuid"] + if "0" in data["hardware.systemInfo"]: + node["serial"] = data["hardware.systemInfo"]["0"]["ServiceTag"] + if "memorySize" in data["hardware"]: + node = inv_tree("hardware.memory.") + node["total_ram_usable"] = int(data["hardware"]["memorySize"]) + + inv_info['esx_vsphere_hostsystem'] = { "inv_function" : inv_esx_vsphere_hostsystem, }

8 years, 5 months

ewon: fixed crash if levels weren't configured

by Sebastian Herbord

Module: check_mk Branch: master Commit: 255d0856e59b99faf1c85f9e5d89f2ba47cbbdcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255d0856e59b99… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 6 10:40:52 2016 +0200 ewon: fixed crash if levels weren't configured --- checks/ewon | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/ewon b/checks/ewon index 5ca0b03..9d4aab9 100644 --- a/checks/ewon +++ b/checks/ewon @@ -227,7 +227,8 @@ def check_ewon(item, params, parsed): else: return 0, "Configured for %s" % params["device"] if params["device"]: - return globals()["check_%s" % params["device"]](item, params[params["device"]], parsed) + return globals()["check_%s" % params["device"]](item, params.get(params["device"], {}), + parsed) check_info["ewon"] = {

8 years, 5 months

3362 FIX Fixed reload of Event Console in distributed monitoring slave site

by Lars Michelsen

Module: check_mk Branch: master Commit: 6db0c4965d7742a68cae34073327ef95ccad9750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db0c4965d7742… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 10:40:30 2016 +0200 3362 FIX Fixed reload of Event Console in distributed monitoring slave site --- .werks/3362 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 16 ++++++++++++++++ web/plugins/wato/mkeventd.py | 8 -------- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/3362 b/.werks/3362 new file mode 100644 index 0000000..749bb37 --- /dev/null +++ b/.werks/3362 @@ -0,0 +1,10 @@ +Title: Fixed reload of Event Console in distributed monitoring slave site +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459932013 + + diff --git a/ChangeLog b/ChangeLog index 475f31c..c037d03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -215,6 +215,7 @@ * 3357 FIX: Fixed service conditions of Disk IO related rulesets * 3359 FIX: Fixed exception when trying to edit non existant host... * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot + * 3362 FIX: Fixed reload of Event Console in distributed monitoring slave site Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 000b5a3..546a7e1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3606,6 +3606,12 @@ def automation_push_snapshot(): else: configuration_warnings = [] + # When core restart/reload is done above the EC is reloaded regularly. But + # even when the core does not need to be restarted, EC rules might have + # changed. So reload the EC in all cases. + if hasattr(config, "mkeventd_enabled") and config.mkeventd_enabled: + mkeventd_reload() + return configuration_warnings except Exception, e: if config.debug: @@ -3614,6 +3620,16 @@ def automation_push_snapshot(): return _("Internal automation error: %s") % e +def mkeventd_reload(): + import mkeventd + mkeventd.query("COMMAND RELOAD") + try: + os.remove(log_dir + "mkeventd.log") + except OSError: + pass # ignore not existing logfile + log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) + + # Isolated restart without prior synchronization. Currently this # is only being called for the local site. def restart_site(site): diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 3773a16..118dfbe 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1556,14 +1556,6 @@ def mode_mkeventd_edit_rule(phase): html.end_form() -def mkeventd_reload(): - mkeventd.query("COMMAND RELOAD") - try: - os.remove(log_dir + "mkeventd.log") - except OSError: - pass # ignore not existing logfile - log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) - # This hook is executed when one applies the pending configuration changes # related to the mkeventd via WATO on the local system. The hook is called # without parameters.

8 years, 5 months

Fix default value for graph number of PNP graph

by Mathias Kettner

Module: check_mk Branch: master Commit: aed78980972099cfdd099be148329aeac9ef6f1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aed78980972099… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 10:25:03 2016 +0200 Fix default value for graph number of PNP graph --- web/plugins/dashboard/dashlets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index e21b7fe..70d8d23 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -410,8 +410,8 @@ dashlet_types["pnpgraph"] = { ], )), ("source", Integer( - title = _('Source (n\'th Graph)'), - default_value = 0, + title = _('Source (n\'th graph)'), + default_value = 1, minvalue = 1, )), ("show_legend", Checkbox(

8 years, 5 months

Updated bug entries #2483

by Mathias Kettner

Module: check_mk Branch: master Commit: 35b7e8638b2edb57b7c2973332f50b0d75a99b3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35b7e8638b2edb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 10:15:17 2016 +0200 Updated bug entries #2483 --- .bugs/2483 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2483 b/.bugs/2483 new file mode 100644 index 0000000..623ac38 --- /dev/null +++ b/.bugs/2483 @@ -0,0 +1,14 @@ +Title: WATO folder filter does not work in group summary viewss +Component: multisite +State: open +Date: 2016-04-06 10:13:15 +Targetversion: future +Class: bug + +The views hostgroups ("Host Groups (Summary)") and svcgroups ("Service +Groups (Summary)") cannot be filtered via the snapin "Folders" or "Tree +of Folders". Reason: the underlying livestatus table is a table of +groups - not of hosts. So no host filters can be applied here. Solution +could be *not* using that table. But then Multisite would need some +stats feature which we currently do not have. Small thing - big issue +to solve....

8 years, 5 months

3361 FIX Event Console files not synced to remote site nor backed up with WATO snapshot

by Lars Michelsen

Module: check_mk Branch: master Commit: 25060e036285ba9346294d81d57ae2bcb4a16dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25060e036285ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 10:15:11 2016 +0200 3361 FIX Event Console files not synced to remote site nor backed up with WATO snapshot --- .werks/3361 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 7 +++++++ web/plugins/wato/mkeventd.py | 6 ------ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/3361 b/.werks/3361 new file mode 100644 index 0000000..e76da4a --- /dev/null +++ b/.werks/3361 @@ -0,0 +1,10 @@ +Title: Event Console files not synced to remote site nor backed up with WATO snapshot +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459930482 + + diff --git a/ChangeLog b/ChangeLog index 24fa9f6..475f31c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 3354 FIX: Added missing option to exclude IP addresses by regex * 3357 FIX: Fixed service conditions of Disk IO related rulesets * 3359 FIX: Fixed exception when trying to edit non existant host... + * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5b091ff..000b5a3 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -82,6 +82,13 @@ def initialize_before_loading_plugins(): # ( "dir", "autochecks", defaults.autochecksdir ), ] + # Include rule configuration into backup/restore/replication. Current + # status is not backed up. + if config.mkeventd_enabled: + mkeventd_config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" + replication_paths.append(("dir", "mkeventd", mkeventd_config_dir)) + backup_paths.append(("dir", "mkeventd", mkeventd_config_dir)) + global backup_domains backup_domains = {} diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f6cd62d..3773a16 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -35,12 +35,6 @@ mkeventd_config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" if defaults.omd_root: mkeventd_status_file = defaults.omd_root + "/var/mkeventd/status" -# Include rule configuration into backup/restore/replication. Current -# status is not backed up. -if mkeventd_enabled: - replication_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) - backup_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) - #. # .--ValueSpecs----------------------------------------------------------. # | __ __ _ ____ |

8 years, 5 months

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016