Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2739 FIX wut_webtherm: support firmware of article number 57620

by Mathias Kettner

Module: check_mk Branch: master Commit: a57d68cfb8878ed7c9498d91e110870a97a8cbb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a57d68cfb8878e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 13:16:38 2015 +0100 #2739 FIX wut_webtherm: support firmware of article number 57620 Thanks to Christoph Musik. --- .werks/2739 | 9 +++++++++ checks/wut_webtherm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/2739 b/.werks/2739 new file mode 100644 index 0000000..19f6313 --- /dev/null +++ b/.werks/2739 @@ -0,0 +1,9 @@ +Title: wut_webtherm: support firmware of article number 57620 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.6p13 +Date: 1446812153 +Class: fix + +Thanks to Christoph Musik. diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 62f3b55..6ed9de0 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -93,7 +93,7 @@ check_info["wut_webtherm"] = { 'check_function' : check_wut_webtherm, 'service_description' : 'Temperature %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18'], [ + 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36'], [ '1.2.1.1', # sensorNo '1.8.1.1' # valuePkt ]),

8 years, 7 months

jasperreport: Do not check in compiled classes anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: 7aae0dc5e876f076806541c61ecf13526f78811f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aae0dc5e876f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 12:07:52 2015 +0100 jasperreport: Do not check in compiled classes anymore --- doc/treasures/jasperreports/.gitignore | 1 + doc/treasures/jasperreports/Makefile | 2 +- .../jasperreports/classes/livestatus/LivestatusDatasource.class | Bin 3565 -> 0 bytes .../jasperreports/classes/livestatus/LivestatusFieldsProvider.class | Bin 3584 -> 0 bytes .../jasperreports/classes/livestatus/LivestatusQueryExecuter.class | Bin 7050 -> 0 bytes .../classes/livestatus/LivestatusQueryExecuterFactory.class | Bin 1117 -> 0 bytes 6 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/treasures/jasperreports/.gitignore b/doc/treasures/jasperreports/.gitignore new file mode 100644 index 0000000..90b07e9 --- /dev/null +++ b/doc/treasures/jasperreports/.gitignore @@ -0,0 +1 @@ +classes diff --git a/doc/treasures/jasperreports/Makefile b/doc/treasures/jasperreports/Makefile index 77dcd36..eafb0ba 100644 --- a/doc/treasures/jasperreports/Makefile +++ b/doc/treasures/jasperreports/Makefile @@ -27,4 +27,4 @@ all: jar cf livestatus.jar -C classes . clean: - rm -rf classes/* + rm -rf classes/* livestatus.jar diff --git a/doc/treasures/jasperreports/classes/livestatus/LivestatusDatasource.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusDatasource.class deleted file mode 100644 index d1d73b9..0000000 Binary files a/doc/treasures/jasperreports/classes/livestatus/LivestatusDatasource.class and /dev/null differ diff --git a/doc/treasures/jasperreports/classes/livestatus/LivestatusFieldsProvider.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusFieldsProvider.class deleted file mode 100644 index 7a5fac7..0000000 Binary files a/doc/treasures/jasperreports/classes/livestatus/LivestatusFieldsProvider.class and /dev/null differ diff --git a/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuter.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuter.class deleted file mode 100644 index 666a83b..0000000 Binary files a/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuter.class and /dev/null differ diff --git a/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class deleted file mode 100644 index cfb8bfe..0000000 Binary files a/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class and /dev/null differ

8 years, 7 months

Move jasperreports from doc/ to doc/treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e43ba89a9fd3c2405497d069a1250e2003e07bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e43ba89a9fd3c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 12:03:24 2015 +0100 Move jasperreports from doc/ to doc/treasures --- doc/{ => treasures}/jasperreports/Makefile | 0 doc/{ => treasures}/jasperreports/README.jasperreports-livestatus | 0 .../jasperreports/classes/livestatus/LivestatusDatasource.class | Bin 3565 -> 3565 bytes .../jasperreports/classes/livestatus/LivestatusFieldsProvider.class | Bin 3584 -> 3584 bytes .../jasperreports/classes/livestatus/LivestatusQueryExecuter.class | Bin 7050 -> 7050 bytes .../classes/livestatus/LivestatusQueryExecuterFactory.class | Bin 1117 -> 1117 bytes doc/{ => treasures}/jasperreports/libs/.gitignore | 0 doc/{ => treasures}/jasperreports/livestatus.jar | Bin 8488 -> 8488 bytes doc/{ => treasures}/jasperreports/src/LivestatusDatasource.java | 0 doc/{ => treasures}/jasperreports/src/LivestatusFieldsProvider.java | 0 doc/{ => treasures}/jasperreports/src/LivestatusQueryExecuter.java | 0 .../jasperreports/src/LivestatusQueryExecuterFactory.java | 0 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/jasperreports/Makefile b/doc/treasures/jasperreports/Makefile similarity index 100% rename from doc/jasperreports/Makefile rename to doc/treasures/jasperreports/Makefile diff --git a/doc/jasperreports/README.jasperreports-livestatus b/doc/treasures/jasperreports/README.jasperreports-livestatus similarity index 100% rename from doc/jasperreports/README.jasperreports-livestatus rename to doc/treasures/jasperreports/README.jasperreports-livestatus diff --git a/doc/jasperreports/classes/livestatus/LivestatusDatasource.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusDatasource.class similarity index 100% rename from doc/jasperreports/classes/livestatus/LivestatusDatasource.class rename to doc/treasures/jasperreports/classes/livestatus/LivestatusDatasource.class diff --git a/doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusFieldsProvider.class similarity index 100% rename from doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class rename to doc/treasures/jasperreports/classes/livestatus/LivestatusFieldsProvider.class diff --git a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuter.class similarity index 100% rename from doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class rename to doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuter.class diff --git a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class b/doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class similarity index 100% rename from doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class rename to doc/treasures/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class diff --git a/doc/jasperreports/libs/.gitignore b/doc/treasures/jasperreports/libs/.gitignore similarity index 100% rename from doc/jasperreports/libs/.gitignore rename to doc/treasures/jasperreports/libs/.gitignore diff --git a/doc/jasperreports/livestatus.jar b/doc/treasures/jasperreports/livestatus.jar similarity index 100% rename from doc/jasperreports/livestatus.jar rename to doc/treasures/jasperreports/livestatus.jar diff --git a/doc/jasperreports/src/LivestatusDatasource.java b/doc/treasures/jasperreports/src/LivestatusDatasource.java similarity index 100% rename from doc/jasperreports/src/LivestatusDatasource.java rename to doc/treasures/jasperreports/src/LivestatusDatasource.java diff --git a/doc/jasperreports/src/LivestatusFieldsProvider.java b/doc/treasures/jasperreports/src/LivestatusFieldsProvider.java similarity index 100% rename from doc/jasperreports/src/LivestatusFieldsProvider.java rename to doc/treasures/jasperreports/src/LivestatusFieldsProvider.java diff --git a/doc/jasperreports/src/LivestatusQueryExecuter.java b/doc/treasures/jasperreports/src/LivestatusQueryExecuter.java similarity index 100% rename from doc/jasperreports/src/LivestatusQueryExecuter.java rename to doc/treasures/jasperreports/src/LivestatusQueryExecuter.java diff --git a/doc/jasperreports/src/LivestatusQueryExecuterFactory.java b/doc/treasures/jasperreports/src/LivestatusQueryExecuterFactory.java similarity index 100% rename from doc/jasperreports/src/LivestatusQueryExecuterFactory.java rename to doc/treasures/jasperreports/src/LivestatusQueryExecuterFactory.java

8 years, 7 months

gitbug

by Sebastian Herbord

Module: check_mk Branch: master Commit: b51152b4f63e7df7a5ff958a0b65adfbe319d3cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b51152b4f63e7d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 11:58:15 2015 +0100 gitbug --- .bugs/2400 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2400 b/.bugs/2400 new file mode 100644 index 0000000..a408324 --- /dev/null +++ b/.bugs/2400 @@ -0,0 +1,8 @@ +Title: Windows Agent may fail to read large event logs +Component: checks +State: open +Date: 2015-11-06 11:48:19 +Targetversion: future +Class: bug + +Due to a bug in the ReadEventLog function (kb 177199) reading large event logs may fail. This could be worked around in the agent by using sequential read and a manual seek to the right offset but we'd have to check the performance implications.

8 years, 7 months

#2726 FIX veeam_backup_status: Fixed missing agent section error in case of aborted tasks

by Lars Michelsen

Module: check_mk Branch: master Commit: f18f14f1075766d982122bccd90568df5a872e02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f18f14f1075766… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 11:49:48 2015 +0100 #2726 FIX veeam_backup_status: Fixed missing agent section error in case of aborted tasks --- .werks/2726 | 10 ++++++++++ ChangeLog | 1 + agents/windows/plugins/veeam_backup_status.ps1_ | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/2726 b/.werks/2726 new file mode 100644 index 0000000..5e97975 --- /dev/null +++ b/.werks/2726 @@ -0,0 +1,10 @@ +Title: veeam_backup_status: Fixed missing agent section error in case of aborted tasks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446806931 + + diff --git a/ChangeLog b/ChangeLog index b3d6d35..81c1705 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 2737 FIX: bluecoat_sensors: fix crash when using Nagios as core (missing include)... * 2738 FIX: Check_MK Caching agent on Linux: introduce timeout for lock... * 2725 FIX: Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes... + * 2726 FIX: veeam_backup_status: Fixed missing agent section error in case of aborted tasks Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 8daed9f..99ee5d3 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -60,10 +60,22 @@ foreach ($myJob in $myBackupJobs) $myJobsText = "$myJobsText" + "$myJobName" + "`t" + "$myJobType" + "`t" + "$myJobLastState" + "`t" + "$myJobLastResult" + "`t" + "$myJobCreationTime" + "`t" + "$myJobEndTime" + "`n" + # For Non Backup Jobs (Replicas) we bail out + # because we are interested in the status of the original backup but + # for replicas the overall job state is all we need. + if ($myJob.IsBackup -eq $false) { continue } + # Each backup job has a number of tasks which were executed (VMs which were processed) # Get all Tasks of the L A S T backup session - # Caution: Each backup job MAY have run SEVERAL times for retries - $myJobLastSessionTasks = $myJobLastSession | Get-VBRTaskSession -ErrorAction SilentlyContinue + # Caution: Each backup job MAY have run SEVERAL times for retries, + # thats why we need all sessions related to the last one if its a retry + $sessions = @($myJobLastSession) + if ($myJobLastSession.IsRetryMode) + { + $sessions = $myJobLastSession.GetOriginalAndRetrySessions($TRUE) + } + + $myJobLastSessionTasks = $sessions | Get-VBRTaskSession -ErrorAction SilentlyContinue # Iterate through all tasks in the last backup job $myTask = ""

8 years, 7 months

#2725 FIX Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes

by Lars Michelsen

Module: check_mk Branch: master Commit: f8c65a40e06adb52774fdcce3abfbeb3ed7ff146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c65a40e06adb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 11:08:15 2015 +0100 #2725 FIX Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes When configuring dynamic levels, e.g. for filesystems, if you configure the dynamic levels for example like this: larger than 100GB: 90% WARN / 95% CRIT larger than 1TB: 95% WARN / 98% CRIT This will result in all filesystems smaller than 100GB in always being OK. This was confusing users. The validation of these rules has now been changed to enforce creation of an entry for filesystems larger than 0 bytes. --- .werks/2725 | 18 ++++++++++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/.werks/2725 b/.werks/2725 new file mode 100644 index 0000000..d01d383 --- /dev/null +++ b/.werks/2725 @@ -0,0 +1,18 @@ +Title: Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446804337 + +When configuring dynamic levels, e.g. for filesystems, if you configure the dynamic levels +for example like this: + +larger than 100GB: 90% WARN / 95% CRIT +larger than 1TB: 95% WARN / 98% CRIT + +This will result in all filesystems smaller than 100GB in always being OK. This was confusing +users. The validation of these rules has now been changed to enforce creation of an entry +for filesystems larger than 0 bytes. diff --git a/ChangeLog b/ChangeLog index 4bfb9c6..b3d6d35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 2735 FIX: esx_vsphere_datastores: fix labelling, help and performance data of provisioned space... * 2737 FIX: bluecoat_sensors: fix crash when using Nagios as core (missing include)... * 2738 FIX: Check_MK Caching agent on Linux: introduce timeout for lock... + * 2725 FIX: Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 62c5e79..6e938b5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2780,8 +2780,14 @@ def get_free_used_dynamic_valuespec(what, name, default_value = (80.0, 90.0)): ) ] + def validate_dynamic_levels(value, varprefix): + if not [ v for v in value if v[0] == 0 ]: + raise MKUserError(varprefix, _("You need to specify levels for " + "%ss larger than 0 bytes." % name)) + return Alternative( title = _("Levels for %s %s") % (name, title), + style = "dropdown", show_alternative_title = True, default_value = default_value, elements = vs_subgroup + [ @@ -2796,6 +2802,8 @@ def get_free_used_dynamic_valuespec(what, name, default_value = (80.0, 90.0)): ] ), title = _('Dynamic levels'), + allow_empty = False, + validate = validate_dynamic_levels, )], )

8 years, 7 months

#2738 FIX Check_MK Caching agent on Linux: introduce timeout for lock

by Mathias Kettner

Module: check_mk Branch: master Commit: a55151eee196a1a7b1abf9a60d4f1f693979e7cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a55151eee196a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 11:06:22 2015 +0100 #2738 FIX Check_MK Caching agent on Linux: introduce timeout for lock This avoids out of memory in situtations where the agent is hanging forever. Thanks to Andreas Pflug. --- .werks/2738 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_caching_agent.linux | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2738 b/.werks/2738 new file mode 100644 index 0000000..8266b0a --- /dev/null +++ b/.werks/2738 @@ -0,0 +1,11 @@ +Title: Check_MK Caching agent on Linux: introduce timeout for lock +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446804323 + +This avoids out of memory in situtations where the agent is hanging forever. Thanks +to Andreas Pflug. diff --git a/ChangeLog b/ChangeLog index cd35d9e..4bfb9c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ NOTE: Please refer to the migration notes! * 2735 FIX: esx_vsphere_datastores: fix labelling, help and performance data of provisioned space... * 2737 FIX: bluecoat_sensors: fix crash when using Nagios as core (missing include)... + * 2738 FIX: Check_MK Caching agent on Linux: introduce timeout for lock... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_caching_agent.linux b/agents/check_mk_caching_agent.linux index 7a4c6e3..67b7552 100755 --- a/agents/check_mk_caching_agent.linux +++ b/agents/check_mk_caching_agent.linux @@ -82,7 +82,8 @@ SEENFILE=$CACHEFILE.seenby.$REMOTE_HOST # is not very unlikely since the agent might run a couple # of seconds ( - flock --exclusive 200 + flock --timeout 180 --exclusive 200 || exit 1 + if [ ! -e "$CACHEFILE" -o -e "$SEENFILE" ] then check_mk_agent > $CACHEFILE

8 years, 7 months

#2737 FIX bluecoat_sensors: fix crash when using Nagios as core ( missing include)

by Mathias Kettner

Module: check_mk Branch: master Commit: 4977cb0d595b2cbd6883b0c762f00224645de0b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4977cb0d595b2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 10:33:40 2015 +0100 #2737 FIX bluecoat_sensors: fix crash when using Nagios as core (missing include) Thanks to Markus Weber! --- .werks/2737 | 9 +++++++++ ChangeLog | 1 + checks/bluecoat_sensors | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2737 b/.werks/2737 new file mode 100644 index 0000000..997762d --- /dev/null +++ b/.werks/2737 @@ -0,0 +1,9 @@ +Title: bluecoat_sensors: fix crash when using Nagios as core (missing include) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446802395 +Class: fix + +Thanks to Markus Weber! diff --git a/ChangeLog b/ChangeLog index 0a0c94b..cd35d9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 1301 FIX: cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks... NOTE: Please refer to the migration notes! * 2735 FIX: esx_vsphere_datastores: fix labelling, help and performance data of provisioned space... + * 2737 FIX: bluecoat_sensors: fix crash when using Nagios as core (missing include)... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/bluecoat_sensors b/checks/bluecoat_sensors index c8e1bb1..feb8c83 100644 --- a/checks/bluecoat_sensors +++ b/checks/bluecoat_sensors @@ -75,6 +75,6 @@ check_info["bluecoat_sensors"] = { 'service_description': '%s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.3417.2.1.1.1.1.1', [9, 5, 7, 4, 3]), - 'snmp_scan_function': \ - lambda oid: '1.3.6.1.4.1.3417.1.1' in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function': lambda oid: '1.3.6.1.4.1.3417.1.1' in oid(".1.3.6.1.2.1.1.2.0"), + 'includes': [ "temperature.include" ], }

8 years, 7 months

#2724 FIX Discovery check: Fixed exception in simulation mode when no cache file present

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b0553a3fcb8325bc1ff25243f5b593383c7ba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b0553a3fcb83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 10:32:50 2015 +0100 #2724 FIX Discovery check: Fixed exception in simulation mode when no cache file present --- .werks/2724 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2724 b/.werks/2724 new file mode 100644 index 0000000..d505179 --- /dev/null +++ b/.werks/2724 @@ -0,0 +1,10 @@ +Title: Discovery check: Fixed exception in simulation mode when no cache file present +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446802316 + + diff --git a/ChangeLog b/ChangeLog index a8f4c60..0a0c94b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 2682 FIX: Fixed exception Error creating configuration: global name 'extra_host_attributes' is not defined * 2443 FIX: Fixed quoting of ! in classical nagios checks configured via WATO... * 2718 FIX: Fixed agent timeouts not resulting in a crash report anympore... + * 2724 FIX: Discovery check: Fixed exception in simulation mode when no cache file present Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index ea758c3..6bfce7b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -404,7 +404,8 @@ def get_host_info(hostname, ipaddress, checkname, max_cachefile_age=None, ignore # # This function assumes, that each check type is queried # only once for each host. -def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_check_interval=False, use_snmpwalk_cache=True): +def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, + ignore_check_interval=False, use_snmpwalk_cache=True): info = get_cached_hostinfo(hostname) if info and info.has_key(check_type): return info[check_type] @@ -706,11 +707,10 @@ def read_cache_file(relpath, max_cache_age): (cachefile, cachefile_age(cachefile), max_cache_age)) if simulation_mode and not opt_no_cache: - raise MKGeneralException("Simulation mode and no cachefile present.") + raise MKAgentError("Simulation mode and no cachefile present.") if opt_no_tcp: - raise MKGeneralException("Host is unreachable, no usable cache file present") - #Cache file '%s' missing or too old. TCP disallowed by you." % cachefile) + raise MKAgentError("Host is unreachable, no usable cache file present") def write_cache_file(relpath, output):

8 years, 7 months

#2735 FIX esx_vsphere_datastores: fix labelling, help and performance data of provisioned space

by Mathias Kettner

Module: check_mk Branch: master Commit: c3ac938878ff892bdc3dd4f62e12cc29c21cbc0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ac938878ff89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 10:11:22 2015 +0100 #2735 FIX esx_vsphere_datastores: fix labelling, help and performance data of provisioned space In the check output and the WATO texts for its configuration the words provisioning and over provisioning where mixed up. This has been fixed. Also in the output performance data the levels for WARN and CRIT have been corrected. Thanks to Marten Vanraes. --- .werks/2735 | 13 +++++++++++++ ChangeLog | 1 + checks/esx_vsphere_datastores | 27 +++++++++++++-------------- web/plugins/wato/check_parameters.py | 9 ++++++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.werks/2735 b/.werks/2735 new file mode 100644 index 0000000..a9511ee --- /dev/null +++ b/.werks/2735 @@ -0,0 +1,13 @@ +Title: esx_vsphere_datastores: fix labelling, help and performance data of provisioned space +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446800972 + +In the check output and the WATO texts for its configuration the words provisioning +and over provisioning where mixed up. This has been fixed. Also in the output +performance data the levels for WARN and CRIT have been corrected. Thanks to Marten +Vanraes. diff --git a/ChangeLog b/ChangeLog index 219e99b..a8f4c60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 1300 FIX: ovs_bonding: Fixed discovery exception in case of not active bond * 1301 FIX: cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks... NOTE: Please refer to the migration notes! + * 2735 FIX: esx_vsphere_datastores: fix labelling, help and performance data of provisioned space... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index ce2c373..d7b55e8 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -70,32 +70,31 @@ def check_esx_vsphere_datastores(item, params, info): if 'uncommitted' in store: uncommitted_mb = store["uncommitted"] / 1024.0 / 1024.0 used_mb = size_mb - avail_mb - overprov_mb = used_mb + uncommitted_mb + prov_mb = used_mb + uncommitted_mb if size_mb == 0: - overprov_percent = 0 + prov_percent = 0 else: - overprov_percent = (overprov_mb / size_mb) * 100 + prov_percent = (prov_mb / size_mb) * 100 - overprov_txt = '' - overprov_warn_mb = None - overprov_crit_mb = None + prov_txt = '' if 'provisioning_levels' in params: warn, crit = params['provisioning_levels'] - overprov_warn_mb = avail_mb / 100 * warn - overprov_crit_mb = avail_mb / 100 * crit - if overprov_percent >= crit: + levels_text = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) + if prov_percent >= crit: state = max(state, 2) - overprov_txt = ' (!!)' - elif overprov_percent >= warn: + prov_txt = levels_text + '(!!)' + elif prov_percent >= warn: state = max(state, 1) - overprov_txt = ' (!)' + prov_txt = levels_text + '(!)' infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % ( - uncommitted_mb / 1024, overprov_percent, overprov_txt) + uncommitted_mb / 1024, prov_percent, prov_txt) if perfdata: + prov_warn_mb = size_mb / 100 * warn + prov_crit_mb = size_mb / 100 * crit perfdata += [ ('uncommitted', str(uncommitted_mb) + 'MB'), - ('overprovisioned', str(overprov_mb) + 'MB', overprov_warn_mb, overprov_crit_mb), + ('overprovisioned', str(prov_mb) + 'MB', prov_warn_mb, prov_crit_mb), ] if not store["accessible"]: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b153f59..62c5e79 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3059,10 +3059,13 @@ register_check_parameters( elements = filesystem_elements + [ ("provisioning_levels", Tuple( title = _("Provisioning Levels"), - help = _("Configure thresholds for overprovisioning of datastores."), + help = _("A provisioning of more than 100% is called " + "over provisioning and can be a useful strategy for saving disk space. But you cannot guarantee " + "any longer that every VM can really use all space that it was assigned. Here you can " + "set levels for the maximum provisioning. A warning level of 150% will warn at 50% over provisioning."), elements = [ - Percentage(title = _("Warning at overprovisioning of"), maxvalue = None), - Percentage(title = _("Critical at overprovisioning of"), maxvalue = None), + Percentage(title = _("Warning at a provisioning of"), maxvalue = None, default_value = 120.0), + Percentage(title = _("Critical at a provisioning of"), maxvalue = None, default_value = 150.0), ] )), ],

8 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015