Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: Removed testing exception

by Konstantin Büttner

Module: check_mk Branch: master Commit: de697e55bf9a03dce442ac15526fc55a1dff40e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de697e55bf9a03… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 30 16:58:19 2015 +0200 Removed testing exception --- checks/cpu_load.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index 9c0387d..9401a31 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -32,7 +32,7 @@ # load is a triple of three floats: average load of # the last 1, 5 or 15 minutes def check_cpu_load_generic(params, load, num_cpus=1): - raise Exception("XXXX") + # Prepare performance data if type(params) == tuple: warn, crit = [ p*num_cpus for p in params ]

9 years, 2 months

Check_MK Git: check_mk: temperature.include: fix unicodeification of Celsius

by Mathias Kettner

Module: check_mk Branch: master Commit: c54d781d1ec5ff92fad5d16e4ac5bb202a63a2ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c54d781d1ec5ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 16:55:39 2015 +0200 temperature.include: fix unicodeification of Celsius --- checks/temperature.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index c07938b..a4ec436 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -58,8 +58,8 @@ def render_temp(n, output_unit): return "%.1f" % t temp_unitsym = { - "c": "°C", - "f": "°F", + "c": u"°C", + "f": u"°F", "k": "K", }

9 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2177

by Andreas Boesl

Module: check_mk Branch: master Commit: d69df86c9ef71bafc767eb4f02924b62085a91c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69df86c9ef71b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 30 16:07:05 2015 +0200 Updated bug entries #2177 --- .bugs/2177 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2177 b/.bugs/2177 new file mode 100644 index 0000000..e496dd3 --- /dev/null +++ b/.bugs/2177 @@ -0,0 +1,9 @@ +Title: new windows agent: eventlog monitoring should be able to process cleared logfiles +Component: checks +State: open +Date: 2015-07-30 16:04:54 +Targetversion: future +Class: bug + +If someone clears the event log with the event viewer, the windows agent +is unable to start from event log record 0. It insists to continue at 51212, for example.

9 years, 2 months

Check_MK Git: check_mk: Updated manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: ef256d75d6e25f0c974438ce10cb63cf054c7adb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef256d75d6e25f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 30 13:36:53 2015 +0200 Updated manpage --- checkman/cisco_srst_state | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/cisco_srst_state b/checkman/cisco_srst_state index e1de5a0..b6dbe7d 100644 --- a/checkman/cisco_srst_state +++ b/checkman/cisco_srst_state @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors the status of the Cisco Unified SRST feature of a Cisco device which supports that feature. - There are two possible states: active (OK) or inactive (WARN). + There are two possible states: active (WARN) or inactive (OK). Moreover the check displays the time (in minutes) since the SRST feature switched to active mode.

9 years, 2 months

Check_MK Git: check_mk: Fixed interpretation of states; inactive is ok, active is not ok

by Konstantin Büttner

Module: check_mk Branch: master Commit: 46027b400047450c8c5c2407eb02a2838aabe422 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46027b40004745… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 30 13:35:46 2015 +0200 Fixed interpretation of states; inactive is ok, active is not ok --- checks/cisco_srst_state | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_srst_state b/checks/cisco_srst_state index 2023421..56ba614 100644 --- a/checks/cisco_srst_state +++ b/checks/cisco_srst_state @@ -39,9 +39,9 @@ def check_cisco_srst_state(_no_item, _no_params, info): # Check the state if srst_state == '1': - yield 0, "SRST active" + yield 1, "SRST active" else: - yield 1, "SRST inactive" + yield 0, "SRST inactive" # Display SRST uptime yield check_uptime_seconds(None, int(uptime_text) * 60)

9 years, 2 months

Check_MK Git: check_mk: #2413 esx_vsphere_counters: new check to monitor the disk throughput and latency for ESX datastores

by Andreas Boesl

Module: check_mk Branch: master Commit: fcda5472c1fb823ef6da8547fd9e52d333f3bcb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcda5472c1fb82… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 30 13:14:01 2015 +0200 #2413 esx_vsphere_counters: new check to monitor the disk throughput and latency for ESX datastores --- .werks/2413 | 9 +++ ChangeLog | 1 + checkman/esx_vsphere_counters | 17 +++++ checks/esx_vsphere_counters | 167 +++++++++++++++++++++++++++-------------- 4 files changed, 136 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fcda5472c1…

9 years, 2 months

Check_MK Git: check_mk: #2491 Allow clickable URLs in comments and downtime texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 18c3e74f06e329c5cd06fbfd6683892e23fc02e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18c3e74f06e329… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 11:51:39 2015 +0200 #2491 Allow clickable URLs in comments and downtime texts When you in include an URL like <tt>http://www.mysite.de/...</tt> into the comment of a downtime or an acknowledgment then this URL will now be replaced with a clickable icon pointing to that link. --- .werks/2491 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2491 b/.werks/2491 new file mode 100644 index 0000000..938294c --- /dev/null +++ b/.werks/2491 @@ -0,0 +1,11 @@ +Title: Allow clickable URLs in comments and downtime texts +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1438249800 +Class: feature + +When you in include an URL like <tt>http://www.mysite.de/...</tt> into the +comment of a downtime or an acknowledgment then this URL will now be replaced +with a clickable icon pointing to that link. diff --git a/ChangeLog b/ChangeLog index baaf9dc..a77a1be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 2471 User IDs are now allowed to contain special characters (like German umlauts)... * 2484 Virtual Host Tree now allows adding levels of WATO folders... * 2501 Implemented new crash report handling... + * 2491 Allow clickable URLs in comments and downtime texts... * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e1ff050..fc9f0b9 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1751,7 +1751,7 @@ multisite_painters["comment_author"] = { multisite_painters["comment_comment"] = { "title" : _("Comment text"), "columns" : ["comment_comment"], - "paint" : lambda row: (None, html.attrencode(row["comment_comment"])), + "paint" : lambda row: (None, format_plugin_output(row["comment_comment"])), } multisite_painters["comment_what"] = { @@ -1837,7 +1837,7 @@ multisite_painters["downtime_comment"] = { "title" : _("Downtime comment"), "short" : _("Comment"), "columns" : ["downtime_comment"], - "paint" : lambda row: (None, html.attrencode(row["downtime_comment"])), + "paint" : lambda row: (None, format_plugin_output(row["downtime_comment"])), } multisite_painters["downtime_fixed"] = {

9 years, 2 months

Check_MK Git: check_mk: #2490 FIX synology_disks: treat SSDs with state " not initialized" as OK if state does not change later

by Mathias Kettner

Module: check_mk Branch: master Commit: f662612f45fc71a40579d42aafbd1a54531e1321 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f662612f45fc71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 11:30:07 2015 +0200 #2490 FIX synology_disks: treat SSDs with state "not initialized" as OK if state does not change later --- .werks/2490 | 9 +++++++++ ChangeLog | 1 + checkman/synology_disks | 7 +++++-- checks/synology_disks | 38 ++++++++++++++++++++++++++------------ 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.werks/2490 b/.werks/2490 new file mode 100644 index 0000000..5d6dada --- /dev/null +++ b/.werks/2490 @@ -0,0 +1,9 @@ +Title: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438248573 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9b348cc..fb0cf12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 1275 FIX: Fileinfo: Fixed handling of output from AIX Agent * 2500 FIX: qlogic_fcport: Can now deal with missing port status information... * 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values + * 2490 FIX: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checkman/synology_disks b/checkman/synology_disks index ff5171d..96d4e09 100644 --- a/checkman/synology_disks +++ b/checkman/synology_disks @@ -4,12 +4,15 @@ catalog: hw/storagehw/synology license: GPL distribution: check_mk description: - This check monitors the health and current Status of - Hardisks attached to a Synology NAS device. + This check monitors the health and current status of + hardisks attached to a Synology NAS device. The check returns an {CRIT} in case of an error state reported by the device. The check also reports the model number and the temperature for each disk. + SSDs that are found within the state {3} (not initialized) during recovery + are assumed to be cache disks and will always interprete state {3} as OK. + item: The name of the disk like reported in the MIB diff --git a/checks/synology_disks b/checks/synology_disks index 1ade456..7ac46cb 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -25,25 +25,39 @@ # Boston, MA 02110-1301 USA. def inventory_synology_disks(info): - for line in info: - yield line[0], None + for disk, model, status, temperature in info: + # SSD used as cache are "not initialized". We remember that + # here. + if "SSD" in model and status == '3': + params = { "used_as_cache" : True } + else: + params = {} + + yield disk, params + -def check_synology_disks(item, _no_params, info): +def check_synology_disks(item, params, info): states = { - 1 : ("OK", 0), - 2 : ("OK", 0), - 3 : ("not initialized", 1), - 4 : ("system partition failed", 2), - 5 : ("crashed", 2) + 1 : (0, "OK"), + 2 : (0, "OK"), + 3 : (1, "not initialized"), + 4 : (2, "system partition failed"), + 5 : (2, "crashed") } + for disk, model, status, temperature in info: if disk == item: - state = int(status) temp = int(temperature) - message = "Status: %s, Temperature: %d °C, Model: %s" % \ - ( states[state][0], temp, model ) - return states[state][1], message, [("temp", temp )] + if status == '3' and params.get("used_as_cache"): + status_text = "used as cache" + status_code = 0 + else: + status_code, status_text = states[int(status)] + + message = "Status: %s, Temperature: %d °C, Model: %s" % ( status_text, temp, model ) + return status_code, message, [("temp", temp )] + check_info["synology_disks"] = { "check_function" : check_synology_disks,

9 years, 2 months

Check_MK Git: check_mk: #2501 Implemented new crash report handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 24ce6cc6a81fa1e0c9161f3c44ffd4181138d495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24ce6cc6a81fa1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 30 10:56:43 2015 +0200 #2501 Implemented new crash report handling Some versions ago we introduced a reporting mechanism for crashes within the checks and the GUI. It was possible to click on a "report crash" button which opened a "new mail" dialog containing the crash information. The problem with this approach was that when using Outlook it resulted in incomplete crash dumps which were mostly unusable. The reporting mechanism has been completely reworked. The reports are now sent via HTTP POST calls to our crash reporting server. To be able to contact you in case of any question, we need your name and email address when you submit a crash report. All information which is submitted to our servers is displayed to you before submitting. You can always choose not to report a crash. --- .werks/2501 | 21 +++ ChangeLog | 1 + checks/cpu_load.include | 2 +- modules/check_mk_base.py | 123 +++++++++++----- web/htdocs/crash_reporting.py | 313 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/crashed_check.py | 98 ------------- web/htdocs/js/checkmk.js | 120 +++++++++++++++- web/htdocs/js/search.js | 6 +- web/htdocs/js/wato.js | 2 +- web/plugins/pages/shipped.py | 5 +- 10 files changed, 542 insertions(+), 149 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24ce6cc6a8…

9 years, 2 months

Check_MK Git: check_mk: synology_disks: fix SNMP variable into human readable texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 5adf9cb58ad62094525d62f94800e4a6b5a956ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5adf9cb58ad620… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 11:00:48 2015 +0200 synology_disks: fix SNMP variable into human readable texts --- checks/synology_disks | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/synology_disks b/checks/synology_disks index 2dc2d88..1ade456 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -32,9 +32,9 @@ def check_synology_disks(item, _no_params, info): states = { 1 : ("OK", 0), 2 : ("OK", 0), - 3 : ("NotInitialized", 1), - 4 : ("SystemPartitionFailed", 2), - 5 : ("Crashed", 2) + 3 : ("not initialized", 1), + 4 : ("system partition failed", 2), + 5 : ("crashed", 2) } for disk, model, status, temperature in info:

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015