Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: ibm_svc_nodestats.disk_latency, ibm_svc_systemstats .disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 243bbf3534a17fc214160c8114ec006dc797570c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=243bbf3534a17f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 18:42:17 2014 +0200 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices --- .werks/898 | 8 +++ ChangeLog | 1 + checkman/ibm_svc_nodestats.disk_latency | 24 +++++++ checkman/ibm_svc_systemstats.disk_latency | 24 +++++++ checks/ibm_svc_nodestats | 67 +++++++++++++++----- checks/ibm_svc_systemstats | 47 ++++++++++++-- .../check_mk-ibm_svc_nodestats.disk_latency.php | 59 +++++++++++++++++ .../check_mk-ibm_svc_systemstats.disk_latency.php | 1 + web/plugins/perfometer/check_mk.py | 10 +++ 9 files changed, 220 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=243bbf3534…

10 years, 4 months

Check_MK Git: check_mk: improving check manpage for wagner_titanus_topsense .airflow_deviation

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2ad7e7167b23b3516b821cd201f6569422ddd6d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad7e7167b23b3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 17:16:20 2014 +0200 improving check manpage for wagner_titanus_topsense.airflow_deviation --- checkman/wagner_titanus_topsense.airflow_deviation | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/checkman/wagner_titanus_topsense.airflow_deviation b/checkman/wagner_titanus_topsense.airflow_deviation index 2875f97..2db4c6f 100644 --- a/checkman/wagner_titanus_topsense.airflow_deviation +++ b/checkman/wagner_titanus_topsense.airflow_deviation @@ -37,17 +37,17 @@ examples: ] [parameters] -lower_crit(float): If the airflow deviation in percent from the set point - is lower or equal this value, the check returns {CRIT}. -lower_warn(float): If the airflow deviation in percent from the set point - is lower or equal this value, the check returns {WARN}. -upper_warn(float): If the airflow deviation in percent from the set point - is higher or equal this value, the check returns {WARN}. -upper_crit(float): If the airflow deviation in percent from the set point - is higher or equal this value, the check returns {CRIT}. +parameters (tuple): Containing the four numbers lower_crit, lower_warn, upper_warn, upper_crit. + If the airflow deviation in percent from the set point + is lower or equal lower_crit, the check returns {CRIT}. + If the airflow deviation in percent from the set point + is lower or equal lower_warn, the check returns {WARN}. + If the airflow deviation in percent from the set point + is higher or equal upper_warn, the check returns {WARN}. + If the airflow deviation in percent from the set point + is higher or equal upper_crit, the check returns {CRIT}. [configuration] wagner_titanus_topsense_airflow_deviation_default_values(float, float, float, float): - Lower level for critical, lower level for warning, upper level for warning, - upper level for critical, all in percent. - Defaults to (-20.0, -20.0, 20.0, 20.0) + Default values for lower_crit, lower_warn, upper_warn, upper_crit, + preset to (-20.0, -20.0, 20.0, 20.0)

10 years, 4 months

Check_MK Git: check_mk: wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: fca5c62bfd8466339fcefed3de39ca3dbb7de976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fca5c62bfd8466… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 17:10:17 2014 +0200 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices --- .werks/897 | 8 ++++ ChangeLog | 3 +- checkman/wagner_titanus_topsense.temp | 43 +++++++++++++++++ checks/wagner_titanus_topsense | 49 +++++++++++++++++++- .../check_mk-wagner_titanus_topsense.temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 103 insertions(+), 2 deletions(-) diff --git a/.werks/897 b/.werks/897 new file mode 100644 index 0000000..e0c01b1 --- /dev/null +++ b/.werks/897 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398179376 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7c05bee..d51b00a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,8 +32,9 @@ * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices * 0895 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices - * 0896 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices * 0152 fsc_fans: Added support for Wato configuration and upper limits + * 0896 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices + * 0897 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.temp b/checkman/wagner_titanus_topsense.temp new file mode 100644 index 0000000..fd34c68 --- /dev/null +++ b/checkman/wagner_titanus_topsense.temp @@ -0,0 +1,43 @@ +title: Wagner Titanus Top Sens: Temperature +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Checks the temperature measured by Detectors in Wagner Titanus Top Sens devices. + + Returns {WARN} or {CRIT} if the value exeeds given levels and {OK} otherwise. + +inventory: + Creates two checks per device, one for every Detector. + +item: + The ID of the detector. + +perfdata: + One value: The temperature in degree celsius, together with levels for warning + and critical. + +examples: + # set other default levels + wagner_titanus_topsense_temperature_default_values = (25, 40) + + # check detector 1 with default levels + checks += [ + ("ras", "wagner_titanus_topsense.temp", '1', wagner_titanus_topsense_temperature_default_values) + ] + + # check detector 1 with individual levels + checks += [ + ( "ras", "wagner_titanus_topsense.temp", '1', (20, 50) ) + ] + +[parameters] +parameters (tuple): A pair of numbers for warn and crit level. + If the temperature in degree celsius is higher or equal warn, + the check returns {WARN}. If the temperature in degree celsius is higher + or equal crit, the check returns {CRIT}. + +[configuration] +wagner_titanus_topsense_temperature_default_values(int, int): + Default levels for warning and critical, preset to (30, 35) diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 587ccfd..53bee65 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -48,7 +48,9 @@ wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # 245950000, # tsD1ChamberValueString 246090000, # tsD2ChamberValueString 245960000, # tsD1AirFlowDeviationString - 246100000]), # tsD2AirFlowDeviationString + 246100000, # tsD2AirFlowDeviationString + 245970000, # tsD1AirTemperatureString + 246110000]), # tsD2AirTemperatureString ] def wagner_titanus_topsense_scan(oid): @@ -295,3 +297,48 @@ check_info["wagner_titanus_topsense.airflow_deviation"] = { } #. +# .--air temp------------------------------------------------------------. +# | _ _ | +# | __ _(_)_ __ | |_ ___ _ __ ___ _ __ | +# | / _` | | '__| | __/ _ \ '_ ` _ \| '_ \ | +# | | (_| | | | | || __/ | | | | | |_) | | +# | \__,_|_|_| \__\___|_| |_| |_| .__/ | +# | |_| | +# '----------------------------------------------------------------------' + +wagner_titanus_topsense_temperature_default_values = (30, 35) + +def inventory_wagner_titanus_topsense_temp(info): + return [ ("1", "wagner_titanus_topsense_temperature_default_values"), + ("2", "wagner_titanus_topsense_temperature_default_values") ] + +def check_wagner_titanus_topsense_temp(item, params, info): + warn, crit = params + status=0 + if item == "1": + temp = float(info[2][0][7]) + elif item == "2": + temp = float(info[2][0][8]) + else: + return 3, "Temperature Detector %s not found in SNMP" % item + + if temp >= warn: + status = 1 + if temp >= crit: + status = 2 + + perfdata = [("temp", str(temp) + "C", warn, crit)] + + return status, "Temperature is %0.2f °C" % temp, perfdata + +check_info["wagner_titanus_topsense.temp"] = { + "check_function" : check_wagner_titanus_topsense_temp, + "inventory_function" : inventory_wagner_titanus_topsense_temp, + "service_description" : "Temperature Detector %s", + "has_perfdata" : True, + "group" : "room_temperature", + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/pnp-templates/check_mk-wagner_titanus_topsense.temp.php b/pnp-templates/check_mk-wagner_titanus_topsense.temp.php new file mode 120000 index 0000000..23897c1 --- /dev/null +++ b/pnp-templates/check_mk-wagner_titanus_topsense.temp.php @@ -0,0 +1 @@ +check_mk-hitachi_hnas_temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 94bdf97..166ae6f 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -288,6 +288,7 @@ perfometers["check_mk-dell_chassis_temp"] = perfometer_temperature perfometers["check_mk-innovaphone_temp"] = perfometer_temperature perfometers["check_mk-cmciii.temp"] = perfometer_temperature perfometers["check_mk-ibm_svc_enclosurestats.temp"] = perfometer_temperature +perfometers["check_mk-wagner_titanus_topsense.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

10 years, 4 months

Check_MK Git: check_mk: BI: Add error message when no statehist data available

by Mathias Kettner

Module: check_mk Branch: master Commit: f1bd57cecc7bfbc0d61917da55e80c82a6083325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1bd57cecc7bfb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 22 17:09:07 2014 +0200 BI: Add error message when no statehist data available --- web/plugins/views/availability.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index a76f7f0..5a60a48 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1354,6 +1354,8 @@ def render_bi_availability(title, aggr_rows): html.end_context_buttons() avoptions = render_availability_options() + timewarpcode = "" + if not html.has_user_errors(): rows = [] for aggr_row in aggr_rows: @@ -1424,6 +1426,9 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): query += "Filter: host_name = %s\n" % host query += "Or: %d\n" % len(hosts) data = html.live.query(query) + if not data: + raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query) + html.live.set_prepend_site(False) html.live.set_only_sites(None) columns = ["site"] + columns

10 years, 4 months

Check_MK Git: check_mk: wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b348a989f9939cb6ec9270b0f39bb55a513a5762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b348a989f9939c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 17 16:11:33 2014 +0200 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices --- .werks/895 | 8 +++++ ChangeLog | 1 + checkman/wagner_titanus_topsense.chamber_deviation | 21 +++++++++++ checks/wagner_titanus_topsense | 38 +++++++++++++++++++- ...k-wagner_titanus_topsense.chamber_deviation.php | 34 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 6 ++++ 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/.werks/895 b/.werks/895 new file mode 100644 index 0000000..41dac2c --- /dev/null +++ b/.werks/895 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397743848 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b4e41b8..fdaa40b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices + * 0895 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.chamber_deviation b/checkman/wagner_titanus_topsense.chamber_deviation new file mode 100644 index 0000000..a736b94 --- /dev/null +++ b/checkman/wagner_titanus_topsense.chamber_deviation @@ -0,0 +1,21 @@ +title: Wagner Titanus Top Sens: Chamber Deviation from Calibration Point +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Reports the Chamber Deviation from Calibration Point of Detectors in + Wagner Titanus Top Sens devices. The value is in percent from the chamber + deviation limits, where a chamber fault condition occures. + + The check is informational only and returns always {OK}. + +inventory: + Creates two checks, one for every Detector. + +item: + The ID of the detector. + +perfdata: + One value: The chamber deviation in percent from the chamber deviation + limits. diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 7fec122..100038f 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -44,7 +44,9 @@ wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # (".1.3.6.1.4.1.34187.21501.2.1", [24584008, # tsLSNbusOnline 0 # offline(0),online(1) 245810000, # tsBarGraph1String - 245820000]), # tsBarGraph2String + 245820000, # tsBarGraph2String + 245950000, # tsD1ChamberValueString + 246090000]), # tsD2ChamberValueString ] def wagner_titanus_topsense_scan(oid): @@ -212,3 +214,37 @@ check_info["wagner_titanus_topsense.smoke"] = { } #. +# .--chamber deviation---------------------------------------------------. +# | _ _ _ | +# | ___| |__ __ _ _ __ ___ | |__ ___ _ __ __| | _____ __ | +# | / __| '_ \ / _` | '_ ` _ \| '_ \ / _ \ '__| / _` |/ _ \ \ / / | +# | | (__| | | | (_| | | | | | | |_) | __/ | | (_| | __/\ V / | +# | \___|_| |_|\__,_|_| |_| |_|_.__/ \___|_| \__,_|\___| \_/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_wagner_titanus_topsense_chamber_deviation(info): + return [ ("1", None), ("2", None) ] + +def check_wagner_titanus_topsense_chamber_deviation(item, _no_params, info): + if item == "1": + chamber_deviation = float(info[2][0][3]) + elif item == "2": + chamber_deviation = float(info[2][0][4]) + else: + return 3, "Chamber Deviation Detector %s not found in SNMP" % item + + perfdata = [("chamber_deviation", chamber_deviation)] + + return 0, "%0.6f%% Chamber Deviation" % chamber_deviation, perfdata + +check_info["wagner_titanus_topsense.chamber_deviation"] = { + "check_function" : check_wagner_titanus_topsense_chamber_deviation, + "inventory_function" : inventory_wagner_titanus_topsense_chamber_deviation, + "service_description" : "Chamber Deviation Detector %s", + "has_perfdata" : True, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php b/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php new file mode 100644 index 0000000..f9009e4 --- /dev/null +++ b/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php @@ -0,0 +1,34 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$opt[1] = "--vertical-label \"%\" -l 0 --title \"$hostname / $servicedesc\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#000080:\"Chamber Deviation\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%0.6lf%%\" "; +$def[1] .= "LINE1:var1#000080:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %0.6lf%%,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %0.6lf%%)\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 63d1258..9b9984e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -937,3 +937,9 @@ def perfometer_smoke_percent(row, command, perf): return "%0.6f%%" % used_perc, perfometer_linear(used_perc, "#404040") perfometers['check_mk-wagner_titanus_topsense.smoke'] = perfometer_smoke_percent + +def perfometer_chamber_deviation(row, command, perf): + chamber_dev = float(perf[0][1]) + return "%0.6f%%" % chamber_dev, perfometer_linear(chamber_dev, "#000080") + +perfometers['check_mk-wagner_titanus_topsense.chamber_deviation'] = perfometer_chamber_deviation

10 years, 4 months

Check_MK Git: check_mk: wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 881778a271971196f5495bc17f4ac0fe3be4b32f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=881778a2719711… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 16:19:36 2014 +0200 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices --- .werks/896 | 8 +++ ChangeLog | 1 + checkman/wagner_titanus_topsense.airflow_deviation | 53 ++++++++++++++++++++ checks/wagner_titanus_topsense | 49 +++++++++++++++++- ...k-wagner_titanus_topsense.airflow_deviation.php | 36 +++++++++++++ web/plugins/perfometer/check_mk.py | 7 +++ web/plugins/wato/check_parameters.py | 19 +++++++ 7 files changed, 172 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=881778a271…

10 years, 4 months

Check_MK Git: check_mk: manually resolved merge conflicts in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8d71d364e5111e48e08292e10f3d2f1ca82ee287 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d71d364e5111e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 16:20:21 2014 +0200 manually resolved merge conflicts in ChangeLog ---

10 years, 4 months

Check_MK Git: check_mk: FIX availability: fixed bug causing the availability feature not considering timeperiod transitions

by Andreas Boesl

Module: check_mk Branch: master Commit: d10db8b3830dbbe46986dfd4308034b04a6bcbd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d10db8b3830dbb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 14:56:35 2014 +0200 FIX availability: fixed bug causing the availability feature not considering timeperiod transitions Conflicts: .werks/903 ChangeLog --- .werks/903 | 1 - 1 file changed, 1 deletion(-) diff --git a/.werks/903 b/.werks/903 index ab0f5cc..9b23d98 100644 --- a/.werks/903 +++ b/.werks/903 @@ -6,4 +6,3 @@ State: unknown Version: 1.2.5i3 Date: 1398171132 -

10 years, 4 months

Check_MK Git: check_mk: FIX availability: fixed bug causing the availability feature not considering timeperiod transitions

by Andreas Boesl

Module: check_mk Branch: master Commit: 170070ed0879ea46eb441d1392ecdd1341c68599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=170070ed0879ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 14:53:32 2014 +0200 FIX availability: fixed bug causing the availability feature not considering timeperiod transitions --- .werks/903 | 9 +++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/903 b/.werks/903 new file mode 100644 index 0000000..ab0f5cc --- /dev/null +++ b/.werks/903 @@ -0,0 +1,9 @@ +Title: availability: fixed bug causing the availability feature not considering timeperiod transitions +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398171132 + + diff --git a/ChangeLog b/ChangeLog index 417c308..581bb2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0884 New options --oid and --extraoid for cmk --snmpwalk... * 0785 FIX: Availability: fixed memory leak in table statehist... + * 0903 FIX: availability: fixed bug causing the availability feature not considering timeperiod transitions Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 5d4ac39..b2fc7dc 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -609,7 +609,6 @@ void TableStateHistory::answerQuery(Query *query) char *save_ptr; char *buffer = strdup(entry->_options); char *tp_name = strtok_r(buffer, ";", &save_ptr); - strtok_r(NULL, ";", &save_ptr); char *tp_state = strtok_r(NULL, ";", &save_ptr); if (tp_state) tp_state = strtok_r(NULL, ";", &save_ptr);

10 years, 4 months

Check_MK Git: check_mk: Revert "mem.win: now able to configure swap file levels"

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f5c4b24fd2ac0530406a87c5779d05cf32984f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5c4b24fd2ac0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 13:52:54 2014 +0200 Revert "mem.win: now able to configure swap file levels" This reverts commit 207481c5d6449981e9ab307835a392bdc498304e. Conflicts: ChangeLog --- .werks/735 | 8 -------- ChangeLog | 5 ++--- checkman/mem.win | 4 ---- checks/mem | 4 +--- web/plugins/wato/check_parameters.py | 33 +++------------------------------ 5 files changed, 6 insertions(+), 48 deletions(-) diff --git a/.werks/735 b/.werks/735 deleted file mode 100644 index 6a0a5f4..0000000 --- a/.werks/735 +++ /dev/null @@ -1,8 +0,0 @@ -Title: mem.win: now able to configure swap file levels -Level: 1 -Component: checks -Version: 1.2.5i1 -Date: 1395416329 -Class: feature - - diff --git a/ChangeLog b/ChangeLog index a634b46..417c308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -229,11 +229,8 @@ * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers - * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... - * 0760 The windows agent contains meta information about version, manufacturer etc.... * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... NOTE: Please refer to the migration notes! - * 0735 mem.win: now able to configure swap file levels * 0146 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports * 0707 ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to * 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack @@ -244,6 +241,8 @@ * 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers * 0772 added special agent for IBM SVC / V7000 storage systems... * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes + * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... + * 0760 The windows agent contains meta information about version, manufacturer etc.... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/mem.win b/checkman/mem.win index 6aa124a..296e52c 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -21,7 +21,6 @@ examples: memory_win_default_levels = { "memory" : (80.0, 90.0), # alert at 80%/90% usage "pagefile" : (2048, 1024), # alert, if less then 2/1 GB free - "swap" : (2048, 1024), # alert, if less then 2/1 GB free "average" : 60, # apply levels on 60-min average } @@ -46,9 +45,6 @@ parameters (dict): This check uses a dictionary as parameter. The following {"pagefile"} Warning and critical levels for page file usage. The same rules apply as for {memory}. - {"swap"} Warning and critical levels for swap usage. The same - rules apply as for {memory}. - {"average"} This optional parameters sets a value in minutes for averaging. In that case all warn/crit levels are applied to the averaged values. diff --git a/checks/mem b/checks/mem index a086ea0..2e26709 100644 --- a/checks/mem +++ b/checks/mem @@ -81,7 +81,6 @@ check_info['mem.used'] = { factory_settings["memory_win_default_levels"] = { "memory" : ( 80.0, 90.0 ), "pagefile" : ( 50.0, 70.0 ), - "swap" : ( 70.0, 80.0 ), } def inventory_mem_win(info): @@ -102,8 +101,7 @@ def check_mem_windows(item, params, info): for title, what, paramname in [ ( "Memory", "Mem", "memory" ), - ( "Page file", "Page", "pagefile" ), - ( "Swap", "Swap", "swap" )]: + ( "Page file", "Page", "pagefile" )]: total_kb = meminfo[what + "Total"] free_kb = meminfo[what + "Free"] used_kb = total_kb - free_kb diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 15918e0..8f2ef51 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1115,7 +1115,7 @@ register_check_parameters( register_check_parameters( subgroup_os, "memory_pagefile_win", - _("Memory, pagefile and swap levels for Windows"), + _("Memory and pagefile levels for Windows"), Dictionary( elements = [ ( "memory", @@ -1137,7 +1137,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Memory values lesser 1MB will not work + # Note: Filesize values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1163,7 +1163,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Memory values lesser 1MB will not work + # Note: Filesize values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1171,33 +1171,6 @@ register_check_parameters( ], default_value = (50.0, 70.0)) ), - ( "swap", - Alternative( - title = _("Swap Levels"), - elements = [ - Tuple( - title = _("Swap usage in percent"), - elements = [ - Percentage(title = _("Warning if above")), - Percentage(title = _("Critical if above")), - ] - ), - Transform( - Tuple( - title = _("Absolute free swap"), - elements = [ - Filesize(title = _("Warning if less than")), - Filesize(title = _("Critical if less than")), - ] - ), - # Note: Memory values lesser 1MB will not work - # -> need hide option in filesize valuespec - back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), - forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) - ) - ], - default_value = (70.0, 80.0)) - ), ("average", Integer ( title = _("Averaging"),

10 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014