Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Fixed not working notification plugin for Braintower SMS Gateway

by Sven Rueß

Module: check_mk Branch: master Commit: 5b9fe57488b59923fc65f82c72eb4b71a07142ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b9fe57488b599… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Apr 15 20:03:30 2015 +0200 Fixed not working notification plugin for Braintower SMS Gateway --- .werks/1235 | 3 +- ChangeLog | 2 +- doc/treasures/notifications/README | 8 +- doc/treasures/notifications/braintower | 40 +++-- web/plugins/wato/notifications.py | 281 ++++++++++++++++---------------- 5 files changed, 170 insertions(+), 164 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5b9fe57488…

9 years, 5 months

Check_MK Git: check_mk: Fixed exception in shortly added icons and actions code when ps checks are not configured with dict params

by Lars Michelsen

Module: check_mk Branch: master Commit: 54d172cbcbe526ae5ae2f4f9c74ecec4506b6915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54d172cbcbe526… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 15 16:57:21 2015 +0200 Fixed exception in shortly added icons and actions code when ps checks are not configured with dict params --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a89e404..0a3bbf5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1530,7 +1530,7 @@ def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, param # Some WATO rules might register icons on their own checkgroup = checkgroup_of.get(checkname, checkname) - if checkgroup in [ 'ps', 'services' ]: + if checkgroup in [ 'ps', 'services' ] and type(params) == dict: icon = params.get('icon') if icon: actions.add(icon)

9 years, 5 months

Check_MK Git: check_mk: Some more js cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 422a1cd4c9d15e1bd9cf6f633d5690e9ccee34db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=422a1cd4c9d15e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 15 15:33:39 2015 +0200 Some more js cleanups --- web/htdocs/js/checkmk.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4770be8..c3d7b26 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2004,30 +2004,30 @@ function view_toggle_form(oButton, idForm) { } function init_optiondial(id) { - var oDiv = document.getElementById(id); - make_unselectable(oDiv); + var container = document.getElementById(id); + make_unselectable(container); var eventname = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel" - add_event_handler(eventname, optiondial_wheel); + add_event_handler(eventname, optiondial_wheel, container); } var g_dial_direction = 1; -function optiondial_wheel(e) { - var evt = window.event || e; - var delta = evt.detail ? evt.detail * (-120) : evt.wheelDelta; +function optiondial_wheel(event) { + event = event || window.event; + var delta = event.detail ? event.detail * (-120) : event.wheelDelta; - var oDiv = getTarget(evt); - if (evt.nodeType == 3) // defeat Safari bug - oDiv = oDiv.parentNode; - while (!oDiv.className) - oDiv = oDiv.parentNode; + var container = getTarget(event); + if (event.nodeType == 3) // defeat Safari bug + container = container.parentNode; + while (!container.className) + container = container.parentNode; if (delta > 0) g_dial_direction = -1; - oDiv.onclick(e); + container.onclick(event); g_dial_direction = 1; - return prevent_default_events(e); + return prevent_default_events(event); } // used for refresh und num_columns

9 years, 5 months

Check_MK Git: check_mk: #2114 hitachi_hus_dkc, hitachi_hus_dku: new checks to monitor hardware states of Hitachi Unified Storage DKUs and DKCs

by Goetz Golla

Module: check_mk Branch: master Commit: ba7b4e4a4413d76516c43bce6f38dacc829e6b9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba7b4e4a4413d7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 15 15:49:05 2015 +0200 #2114 hitachi_hus_dkc, hitachi_hus_dku: new checks to monitor hardware states of Hitachi Unified Storage DKUs and DKCs --- .werks/2114 | 9 +++++ ChangeLog | 1 + checkman/hitachi_hus_dkc | 23 +++++++++++++ checkman/hitachi_hus_dku | 21 ++++++++++++ checks/hitachi_hus_dkc | 82 ++++++++++++++++++++++++++++++++++++++++++++++ checks/hitachi_hus_dku | 75 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 211 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ba7b4e4a44…

9 years, 5 months

Check_MK Git: check_mk: downtime script: fixed missing 'verbose' in long_options

by Andreas Boesl

Module: check_mk Branch: master Commit: e8b2d459e126e1d5b72ba857257c0c2ad9cdbf05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8b2d459e126e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 15 11:13:54 2015 +0200 downtime script: fixed missing 'verbose' in long_options --- doc/treasures/downtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 06a0d82..b17a180 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -61,7 +61,7 @@ Options: short_options = 'vhrsc:d:u:S:aU:' -long_options = [ "help", "set", "remove", "comment=", "url=", +long_options = [ "verbose", "help", "set", "remove", "comment=", "url=", "duration=", "user=", "secret=", "all" ] opt_all = False

9 years, 5 months

Check_MK Git: check_mk: citrix_serverload: Fix interpretation of levels to comply with guidelines

by Konstantin Büttner

Module: check_mk Branch: master Commit: 93450b732dfc1f95e1da785facd82f2a2a3c9d0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93450b732dfc1f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 15 11:13:16 2015 +0200 citrix_serverload: Fix interpretation of levels to comply with guidelines --- checks/citrix_serverload | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/citrix_serverload b/checks/citrix_serverload index 512f332..c2eac3a 100644 --- a/checks/citrix_serverload +++ b/checks/citrix_serverload @@ -40,9 +40,9 @@ def check_citrix_serverload(_no_item, params, info): warn, crit = params state = 0 - if load > crit: + if load >= crit: state = 2 - elif load > warn: + elif load >= warn: state = 1 return state, "Current Citrix Load is: " + str(load), [ ('perf', load, warn, crit ) ]

9 years, 5 months

Check_MK Git: check_mk: citrix_serverload: Fixed formatting of manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7d883ed5f3422671bdc8b986a156ab432c242633 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d883ed5f34226… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 15 11:09:05 2015 +0200 citrix_serverload: Fixed formatting of manpage --- checkman/citrix_serverload | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checkman/citrix_serverload b/checkman/citrix_serverload index 565fc77..16f44b6 100644 --- a/checkman/citrix_serverload +++ b/checkman/citrix_serverload @@ -4,8 +4,10 @@ catalog: app/citrix license: GPL distribution: check_mk description: - The Citrix Server load is score calculated by citrix (See: http://www.virtualizationadmin.com/articles-tutorials/terminal-services/gen…) - With this check it's possible to set thresholds for this value. In order to work the {{citrix_serverload.ps1}} plugin is needed. + The Citrix Server load is score calculated by citrix (See: + http://www.virtualizationadmin.com/articles-tutorials/terminal-services/gen…) + With this check it's possible to set thresholds for this value. In order + to work the {citrix_serverload.ps1} plugin is needed. inventory: One service will be created.

9 years, 5 months

Check_MK Git: check_mk: #2067 FIX windows agent: product version is no longer set to 1.0.0

by Andreas Boesl

Module: check_mk Branch: master Commit: 651f6425439eaf8da1490cc81641f3cb0d7ea469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=651f6425439eaf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 15 10:39:48 2015 +0200 #2067 FIX windows agent: product version is no longer set to 1.0.0 The windows agent no longer has a fixed product version of 1.0.0. Instead it now shows product versions like 1.2.6.142 (Check_MK version + revision) or 15.4.15.152 (Daily Build 2015.04.15 + revision) --- .werks/2067 | 13 +++++++++++++ ChangeLog | 3 ++- agents/windows/msibuild/msi-update | 21 +++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.werks/2067 b/.werks/2067 new file mode 100644 index 0000000..872b00c --- /dev/null +++ b/.werks/2067 @@ -0,0 +1,13 @@ +Title: windows agent: product version is no longer set to 1.0.0 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429086999 + +The windows agent no longer has a fixed product version of 1.0.0. +Instead it now shows product versions like 1.2.6.142 (Check_MK version + revision) +or 15.4.15.152 (Daily Build 2015.04.15 + revision) + diff --git a/ChangeLog b/ChangeLog index fac4580..7bd6dd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -324,10 +324,11 @@ * 2198 FIX: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past... * 1955 FIX: lnx_quota: Fixed status message to show the correct values of limits... * 2064 FIX: windows agent: crash.log now uses \r\n as newline - * 2065 FIX: windows agent: now correctly installs service with elevated privileges... * 2202 FIX: hr_fs: Remove Label:... from mount point, replace \ with /... NOTE: Please refer to the migration notes! + * 2065 FIX: windows agent: now correctly installs service with elevated privileges... * 2179 FIX: apc_symmetra: Fixed regression introduced with last release when output state is empty + * 2067 FIX: windows agent: product version is no longer set to 1.0.0... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 71d97e0..8b5ac0c 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -47,16 +47,29 @@ try: # Directory where the sources are contained source_dir = sys.argv[2] - # Version formatted, e.g. 1.2.4.99 + # Revision (from build_version) revision = sys.argv[3] # Official version name, e.g 1.2.5i4p1 new_version_name = sys.argv[4] - match = re.search("[a-z]", new_version_name) + major, minor, build = 1, 0, 0 + try: + major, minor, build = map(lambda x: x.lstrip("0"), new_version_name.split(".")[:3]) + if len(major) > 3: + # Looks like a daily build.. 2015.03.05 + major = major[2:].lstrip("0") + except: + pass + new_product_version = "%s.%s.%s" % (major, minor, build) + + # Remove any traces of i, p, b versions. Windows can't handle them... + # The revision should be enough to uniquely identify this build + # The original version name is also still visible in the list of programs + match = re.search("[a-z]", new_product_version) if match: - new_version_build = new_version_name[:match.start(0)] + "." + revision + new_version_build = "%s.%s" % (new_product_version[:match.start(0)], revision) else: - new_version_build = new_version_name + "." + revision + new_version_build = "%s.%s" % (new_product_version, revision) except: bail_out("Usage: %s MSIFILE.msi SOURCEDIR BUILDNUMBER VERSION" % sys.argv[0])

9 years, 5 months

Check_MK Git: check_mk: Not trying time graphs for IE<9

by Lars Michelsen

Module: check_mk Branch: master Commit: 33ec31040ad9ade07a8a136e459ccae4bd04eed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ec31040ad9ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 15 10:19:00 2015 +0200 Not trying time graphs for IE<9 --- web/htdocs/htmllib.py | 3 +++ web/htdocs/index.py | 2 +- web/plugins/views/painters.py | 26 +++++++++++++++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a853f1a..7117e43 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -128,6 +128,9 @@ class html: BACKSPACE = 8 F1 = 112 + def get_user_agent(self): + return self.req.headers_in.get('User-Agent', '') + def set_page_context(self, c): self.page_context = c diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 26604f1..c8fe615 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -141,7 +141,7 @@ def handler(req, fields = None, profiling = True): if html.has_var("mobile"): html.mobile = not not html.var("mobile") else: - user_agent = html.req.headers_in.get('User-Agent', '') + user_agent = html.get_user_agent() html.mobile = mobile.is_mobile(user_agent) # Redirect to mobile GUI if we are a mobile device and diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bf30b9b..95242ac 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -798,15 +798,23 @@ multisite_painters["svc_group_memberlist"] = { } def paint_graph(row): - # For hosts graphs always use PNP - try: - css, htmlcode = paint_time_graph(row) - if htmlcode: - return css, htmlcode - except NameError: - if config.debug: - raise - pass + # Filter some clients which do not support our graphing, for example IE < 8 + try_time_graph = True + + user_agent = html.get_user_agent() + if 'MSIE' in user_agent: + matches = regex('MSIE ([0-9]{1,}[\.0-9]{0,})').search(user_agent) + try_time_graph = not matches or float(matches.group(1)) >= 9.0 + + if try_time_graph: + try: + css, htmlcode = paint_time_graph(row) + if htmlcode: + return css, htmlcode + except NameError: + if config.debug: + raise + pass sitename = row["site"] host = row["host_name"]

9 years, 5 months

Check_MK Git: check_mk: #2179 FIX apc_symmetra: Fixed regression introduced with last release when output state is empty

by Lars Michelsen

Module: check_mk Branch: master Commit: 91484912146a52bba613a754683e69d849d2e1ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91484912146a52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 15 09:33:40 2015 +0200 #2179 FIX apc_symmetra: Fixed regression introduced with last release when output state is empty --- .werks/2179 | 10 ++++++++++ ChangeLog | 1 + checks/apc_symmetra | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2179 b/.werks/2179 new file mode 100644 index 0000000..5092172 --- /dev/null +++ b/.werks/2179 @@ -0,0 +1,10 @@ +Title: apc_symmetra: Fixed regression introduced with last release when output state is empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429083180 + + diff --git a/ChangeLog b/ChangeLog index c441a0f..d0b3bf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -326,6 +326,7 @@ * 2064 FIX: windows agent: crash.log now uses \r\n as newline * 2202 FIX: hr_fs: Remove Label:... from mount point, replace \ with /... NOTE: Please refer to the migration notes! + * 2179 FIX: apc_symmetra: Fixed regression introduced with last release when output state is empty Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 9cffafd..dd89bf1 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -65,7 +65,10 @@ def check_apc(item, params, info): time_remaining, calib_result, output_load = [ saveint(x) for x in info[0][:13] ] last_diag_date = info[0][13] - output_state_bitmask = int(info[0][14], 2) # string contains a bitmask, convert to int + if info[0][14] != '': + output_state_bitmask = int(info[0][14], 2) # string contains a bitmask, convert to int + else: + output_state_bitmask = 0 self_test_in_progress = output_state_bitmask & 1<<35 != 0 # convert old format tuple to dict

9 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015