Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: FIX Table checkboxes: Fixed bug where selected checkboxes got ignored

by Andreas Boesl

Module: check_mk Branch: master Commit: 64e29ea9d67cb0beef5404837181e36a72322aeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e29ea9d67cb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 16:30:11 2014 +0200 FIX Table checkboxes: Fixed bug where selected checkboxes got ignored Sometimes not all selected lines of a multisite table where actually processed. This happened especially often when the monitoring server had a high disk I/O. --- .werks/909 | 9 +++++++++ ChangeLog | 1 + web/htdocs/weblib.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/909 b/.werks/909 new file mode 100644 index 0000000..fdb2036 --- /dev/null +++ b/.werks/909 @@ -0,0 +1,9 @@ +Title: Table checkboxes: Fixed bug where selected checkboxes got ignored +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398694950 +Class: fix + +Sometimes not all selected lines of a multisite table where actually processed. +This happened especially often when the monitoring server had a high disk I/O. diff --git a/ChangeLog b/ChangeLog index e4b6a1e..8061e53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 0887 Add new column painter "Host Notifications Enabled"... * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... * 0906 FIX: Improved transaction handling in Web GUI... + * 0909 FIX: Table checkboxes: Fixed bug where selected checkboxes got ignored... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 0123f58..f3c6022 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -85,7 +85,7 @@ def get_rowselection(ident): return vo.get(ident, []) def set_rowselection(ident, rows, action): - vo = config.load_user_file("rowselection/%s" % selection_id(), {}) + vo = config.load_user_file("rowselection/%s" % selection_id(), {}, True) if action == 'set': vo[ident] = rows @@ -102,7 +102,7 @@ def set_rowselection(ident, rows, action): if not os.path.exists(config.user_confdir + '/rowselection'): make_nagios_directory(config.user_confdir + '/rowselection') - config.save_user_file("rowselection/%s" % selection_id(), vo) + config.save_user_file("rowselection/%s" % selection_id(), vo, True) def ajax_set_rowselection(): ident = html.var('id')

10 years, 5 months

Check_MK Git: check_mk: Check event state: New option "Less Verbose Output"

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f9c3ac06729226b9bf6b9c2805650a94378a2b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f9c3ac0672922… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 15:18:16 2014 +0200 Check event state: New option "Less Verbose Output" If enabled the check reports less information in its output. You will see no information regarding the worst state or unacknowledged events. For example a default output without this option <tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> Output with less verbosity <tt>WARN - 1 events (Worst line: Incomplete Content)</tt> --- .werks/908 | 14 ++++++++++++++ ChangeLog | 1 + mkeventd/checks/check_mkevents | 4 ++++ mkeventd/lib/check_mkevents | 24 ++++++++++++++++++------ mkeventd/web/plugins/wato/mkeventd.py | 15 ++++++++++++++- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/.werks/908 b/.werks/908 new file mode 100644 index 0000000..357662c --- /dev/null +++ b/.werks/908 @@ -0,0 +1,14 @@ +Title: Check event state: New option "Less Verbose Output" +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1398690971 +Class: feature + +If enabled the check reports less information in its output. +You will see no information regarding the worst state or unacknowledged events. + For example a default output without this option +<tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> +Output with less verbosity +<tt>WARN - 1 events (Worst line: Incomplete Content)</tt> + diff --git a/ChangeLog b/ChangeLog index 40d3f51..e4b6a1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 0784 Improved security of WATO bulk inventory by using transaction ids * 0880 Added support for 389 Directory Server to LDAP connector * 0607 online help text for host creation in WATO now also explains hostname caching + * 0908 Check event state: New option "Less Verbose Output"... * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... * 0904 FIX: Fixed exception in host parameter overview... diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents index aa9a3f3..b8575b2 100644 --- a/mkeventd/checks/check_mkevents +++ b/mkeventd/checks/check_mkevents @@ -11,6 +11,10 @@ def check_mkevents_arguments(params): args += "-H %s " % quote_shell_string(remote) if params.get("ignore_acknowledged"): args += "-a " + + if params.get("less_verbose"): + args += "-l " + args += params.get("hostspec", "$HOSTADDRESS$") if "application" in params: args += " " + quote_shell_string(params["application"]) diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 563b779..8d745d9 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -56,6 +56,12 @@ try: except: opt_ignore_acknowledged = False + try: + del sys.argv[sys.argv.index('-l')] + opt_less_verbose = True + except: + opt_less_verbose = False + if sys.argv[1] == '-H': remote_host = sys.argv[2] del sys.argv[1:3] @@ -65,8 +71,9 @@ try: else: application = None except: - sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] HOST [APPLICATION]\n") + sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] [-l] HOST [APPLICATION]\n") sys.stdout.write("\n -a do not take into account acknowledged events.\n") + sys.stdout.write("\n -l less verbose output.\n") sys.stdout.write("\n") sys.exit(3) @@ -112,11 +119,16 @@ if count == 0 and application: elif count == 0: sys.stdout.write("OK - no events for %s\n" % host_name) else: - sys.stdout.write(nagios_state_names[worst_state] + \ - " - %d events (%d unacknowledged)" % (count, unhandled)) - if worst_row: - sys.stdout.write(", worst state is %s (Last line: %s)" % \ - (nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) + if opt_less_verbose: + sys.stdout.write(nagios_state_names[worst_state] + " - %d events" % (count)) + if worst_row: + sys.stdout.write(" (Worst line: %s)" % (worst_row['event_text'].encode('utf-8'))) + else: + sys.stdout.write(nagios_state_names[worst_state] + \ + " - %d events (%d unacknowledged)" % (count, unhandled)) + if worst_row: + sys.stdout.write(", worst state is %s (Last line: %s)" % \ + (nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) sys.stdout.write("\n") sys.exit(worst_state) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 0366a9e..b8ca802 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1938,6 +1938,19 @@ register_rule( totext = _("acknowledged events will not be honored"), ) ), + ( "less_verbose", + FixedValue( + True, + title = _("Less Verbose Output"), + help = _("If enabled the check reports less information in its output. " + "You will see no information regarding the worst state or unacknowledged events. " + " For example a default output without this option " + "<tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt> " + "Output with less verbosity " + "<tt>WARN - 1 events (Worst line: Incomplete Content)</tt> " + ), + ) + ), ( "remote", Alternative( title = _("Access to the Event Console"), @@ -1976,7 +1989,7 @@ register_rule( ) ), ], - optional_keys = [ "application", "remote", "ignore_acknowledged", "item" ], + optional_keys = [ "application", "remote", "ignore_acknowledged", "less_verbose", "item" ], ), match = 'all', )

10 years, 5 months

Check_MK Git: check_mk: FIX windows agent: register_service:

by Andreas Boesl

fixed ImagePath registry entry Message-ID: <535e2a60.nd1s0/8vMinFypx2%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7dbb31ce42a0ecc6e4184e602f7e9f150f45d390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dbb31ce42a0ec… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 28 12:15:51 2014 +0200 FIX windows agent: register_service: fixed ImagePath registry entry The registry key ImagePath in <tt>HKEY_LOCAL_MACHINE\System\CurentControlSet\Services\Check_MK_Agent</tt> was not quoted correctly. This could trigger a warning on some vulnerability scanners. --- .werks/907 | 11 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 204800 -> 204800 bytes agents/windows/check_mk_agent.cc | 4 +++- agents/windows/check_mk_agent.exe | Bin 175104 -> 175104 bytes agents/windows/install_agent-64.exe | Bin 158157 -> 158175 bytes agents/windows/install_agent.exe | Bin 151408 -> 155326 bytes 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/907 b/.werks/907 new file mode 100644 index 0000000..2f2ac15 --- /dev/null +++ b/.werks/907 @@ -0,0 +1,11 @@ +Title: windows agent: register_service: fixed ImagePath registry entry +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398679973 +Class: fix + + +The registry key ImagePath in <tt>HKEY_LOCAL_MACHINE\System\CurentControlSet\Services\Check_MK_Agent</tt> +was not quoted correctly. This could trigger a warning on some vulnerability scanners. + diff --git a/ChangeLog b/ChangeLog index c88bed1..40d3f51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore * 0154 FIX: zfsget: Fixed inventory of filesystems * 0155 FIX: mssql_counters: harded check agains odd agent output + * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b5313de..f54c406 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 204b993..615a546 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3152,10 +3152,12 @@ void InstallService() char path[ _MAX_PATH + 1 ]; if ( GetModuleFileName( 0, path, sizeof(path)/sizeof(path[0]) ) > 0 ) { + char quoted_path[1024]; + snprintf(quoted_path, sizeof(quoted_path), "\"%s\"", path); SC_HANDLE service = CreateService( serviceControlManager, gszServiceName, gszServiceName, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, - SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path, 0, 0, 0, 0, 0 ); if ( service ) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b5cc3f8..75ecbc5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e5ca176..783a9a1 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6dda9ec..a0acc6c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 5 months

Check_MK Git: check_mk: akcp_daisy_temp: Added missing perfdata gadgets

by Bastian Kuhn

Module: check_mk Branch: master Commit: 157602c45357ab3b3dffb4bf123ee6ea9dba2a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=157602c45357ab… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Apr 25 13:12:38 2014 +0200 akcp_daisy_temp: Added missing perfdata gadgets --- pnp-templates/check_mk-akcp_daisy_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pnp-templates/check_mk-akcp_daisy_temp.php b/pnp-templates/check_mk-akcp_daisy_temp.php new file mode 120000 index 0000000..99402f6 --- /dev/null +++ b/pnp-templates/check_mk-akcp_daisy_temp.php @@ -0,0 +1 @@ +check_mk-akcp_sensor_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 186cf9c..6efb53a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -277,6 +277,7 @@ perfometers["check_mk-smart.temp"] = perfometer_temperature perfometers["check_mk-f5_bigip_temp"] = perfometer_temperature perfometers["check_mk-hp_proliant_temp"] = perfometer_temperature perfometers["check_mk-akcp_sensor_temp"] = perfometer_temperature +perfometers["check_mk-akcp_daisy_temp"] = perfometer_temperature perfometers["check_mk-fsc_temp"] = perfometer_temperature perfometers["check_mk-viprinet_temp"] = perfometer_temperature perfometers["check_mk-hwg_temp"] = perfometer_temperature

10 years, 5 months

Check_MK Git: check_mk: enterasys_temp: New Check for temperature sensor in Enterasys Switches

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b5667445e15ee2faee64ce849a8a5a40fd26ae93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5667445e15ee2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Apr 25 12:29:31 2014 +0200 enterasys_temp: New Check for temperature sensor in Enterasys Switches --- .werks/899 | 8 ++++ ChangeLog | 1 + checkman/enterasys_temp | 27 ++++++++++++ checks/enterasys_temp | 65 +++++++++++++++++++++++++++++ pnp-templates/check_mk-enterasys_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 103 insertions(+) diff --git a/.werks/899 b/.werks/899 new file mode 100644 index 0000000..6848a3f --- /dev/null +++ b/.werks/899 @@ -0,0 +1,8 @@ +Title: enterasys_temp: New Check for temperature sensor in Enterasys Switches +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1398421742 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 497efe2..c88bed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 0897 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... + * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches * 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/enterasys_temp b/checkman/enterasys_temp new file mode 100644 index 0000000..1dc26aa --- /dev/null +++ b/checkman/enterasys_temp @@ -0,0 +1,27 @@ +title: Enterasys Switch: Temperature +agents: snmp +catalog: hw/network/enterasys +license: GPL +distribution: check_mk +description: + Checks the temperature measured by the temperature sensor in Enterasys + Switches. + + Returns {WARN} or {CRIT} if reaching or exceeding given levels and {OK} + otherwise. + +inventory: + Creates one service on every Enterasys Switch in which a temperature + sensor is found to be active. + +perfdata: + One value: The temperature in degree celsius, together with it's warn and + crit levels. + +[parameters] +warning (int): The temperature in degree celsius that triggers a WARNING state. +critical (int): The temperature in degree celsius that triggers a CRITICAL state. + +[configuration] +enterasys_temp_default_levels(int, int): The default levels for WARNING and + CRITICAL state, preset to (30, 35) diff --git a/checks/enterasys_temp b/checks/enterasys_temp new file mode 100644 index 0000000..aa1c206 --- /dev/null +++ b/checks/enterasys_temp @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +enterasys_temp_default_levels = (30, 35) + +def inventory_enterasys_temp(info): + if info[0][0] == "0": + return [] + else: + return [ (None, "enterasys_temp_default_levels") ] + +def check_enterasys_temp(item, params, info): + warn, crit = params + + # info for MIB: The ambient temperature of the room in which the chassis + # is located. If this sensor is broken or not supported, then + # this object will be set to zero. The value of this object + # is the actual temperature in degrees Fahrenheit * 10. + temp_value_snmp = int(info[0][0]) + temp_c = (temp_value_snmp / 10 - 32) / 1.8 + temp_c = float("%0.1f" % temp_c) + + perfdata = [ ("temp", str(temp_c) + "C", warn, crit) ] + infotext = "Temperature is %0.1f C (warn/crit at %0.1f/%0.1f C)" % (temp_c, warn, crit) + status = 0 + if temp_c >= crit: + status = 2 + elif temp_c >= warn: + status = 1 + + return status, infotext, perfdata + +check_info["enterasys_temp"] = { + "check_function" : check_enterasys_temp, + "inventory_function" : inventory_enterasys_temp, + "service_description" : "Temperature", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.52.4.1.1.8.1", [ 1 ]), # chEnvAmbientTemp + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "group" : "hw_single_temperature", +} + diff --git a/pnp-templates/check_mk-enterasys_temp.php b/pnp-templates/check_mk-enterasys_temp.php new file mode 120000 index 0000000..ee5de5e --- /dev/null +++ b/pnp-templates/check_mk-enterasys_temp.php @@ -0,0 +1 @@ +check_mk-brocade_mlx_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 9e77b8c..186cf9c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -289,6 +289,7 @@ 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 +perfometers["check_mk-enterasys_temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

10 years, 5 months

Check_MK Git: check_mk: akcp_daisy_temp: New Check for akcp daisyTemp sensor chains

by Bastian Kuhn

Module: check_mk Branch: master Commit: 971cd2c67e75e67c6361b7526bb344312b6772a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=971cd2c67e75e6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Apr 25 10:07:16 2014 +0200 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains Further information about the sensor type can be found here: http://www.akcp.com/wp-content/uploads/2010/03/daisyTemp-sensor.pdf --- .werks/156 | 8 +++++ ChangeLog | 1 + checkman/akcp_daisy_temp | 30 ++++++++++++++++++ checks/akcp_daisy_temp | 74 +++++++++++++++++++++++++++++++++++++++++++ checks/akcp_sensor_humidity | 21 ++++++------ 5 files changed, 122 insertions(+), 12 deletions(-) diff --git a/.werks/156 b/.werks/156 new file mode 100644 index 0000000..8053af7 --- /dev/null +++ b/.werks/156 @@ -0,0 +1,8 @@ +Title: akcp_daisy_temp: New Check for akcp daisyTemp sensor chains +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398413136 +Class: feature + +Further information about the sensor type can be found here: http://www.akcp.com/wp-content/uploads/2010/03/daisyTemp-sensor.pdf diff --git a/ChangeLog b/ChangeLog index 406284d..497efe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 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 * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices + * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 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/akcp_daisy_temp b/checkman/akcp_daisy_temp new file mode 100644 index 0000000..8e5d782 --- /dev/null +++ b/checkman/akcp_daisy_temp @@ -0,0 +1,30 @@ +title: AKCP daisyTemp Sensor +agents: snmp +catalog: hw/environment/akcp +license: GPL +distribution: +description: + This check monitors the temperature of sensors attached + to AKCP daisyTemp sensor chain. The first attached sensor will be irgnored, + because this sensor is already represented by the the check akc_sensor_temp. + +item: + The item is the sensor description of the sensor as string. + +perfdata: + the current temperature in degree celsius + +inventory: + All available (without the first, see description) temperature sensors are automatically inventorized. + +examples: + # set default levels for all akcp temperature sensors + akcp_daisy_temp_defaultlevels = (28, 34) + +[parameters] +warning (int): temperature in degrees at which the check goes warning +critical (int): level for critical temperature + +[configuration] +akcp_daisy_temp_defaultlevels (int, int): Default levels. This is + preset to {(28, 32)}. diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp new file mode 100644 index 0000000..9f5c54b --- /dev/null +++ b/checks/akcp_daisy_temp @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. +akcp_daisy_temp_defaultlevels = (28, 32) + +def inventory_akcp_daisy_temp(info): + inventory = [] + pass_first = True + for port, subport, name, temp in info: + if subport != '-1': + # We have to ignore the first item, because it will be also reported + # by akcp_sensor_temp on the port were this sensor chain are connected + if pass_first: + pass_first = False + continue + inventory.append((name, 'akcp_daisy_temp_defaultlevels' )) + return inventory + +def check_akcp_daisy_temp(item, params, info): + for port, subport, name, temp in info: + if name == item: + warn, crit = params + temp = savefloat(temp) / 10 + infotext = "%.1f °C " % temp + levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) + perfdata = [ ( "temperature", temp, warn, crit ) ] + if temp > crit: + return 2, infotext + levels, perfdata + if temp > warn: + return 1, infotext + levels, perfdata + return 0, infotext + return 3, "Sensor not found" + +check_info["akcp_daisy_temp"] = { + 'check_function': check_akcp_daisy_temp, + 'inventory_function': inventory_akcp_daisy_temp, + 'service_description': 'Temperature %s', + 'has_perfdata': True, + 'snmp_info': ( + ".1.3.6.1.4.1.3854.1.2.2.1.19.33", + [ 1, 2, 3, 4, 5, 6, 7 ], + [ + OID_END, # Port/Subport + "2.1.1", # subport + "2.1.2", # Sensor Name + "2.1.14", # Degree Celsius + ] + ), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], + 'group' : 'room_temperature', +} diff --git a/checks/akcp_sensor_humidity b/checks/akcp_sensor_humidity index 085805e..dd817b9 100644 --- a/checks/akcp_sensor_humidity +++ b/checks/akcp_sensor_humidity @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # +------------------------------------------------------------------+ -# | This file has been contributed by: | +# | The initial version of this file has been contributed by: | # | | # | Michael Nieporte <Michael.Nieporte(a)uk-essen.de> | # +------------------------------------------------------------------+ @@ -36,7 +36,7 @@ def inventory_akcp_sensor_humidity(info): inventory = [] for desc, humidity, status, online in info: if online == "1": - inventory.append( (desc, "", "akcp_sensor_humidity_defaultlevels") ) + inventory.append( (desc, "akcp_sensor_humidity_defaultlevels") ) return inventory def check_akcp_sensor_humidity(item, params, info): @@ -52,14 +52,14 @@ def check_akcp_sensor_humidity(item, params, info): ( humidity, warnlow, critlow, warnhigh, crithigh) perfdata = [ ( "humidity", humidity, critlow, warnlow, warnhigh, crithigh ) ] if inthumidity <= critlow or inthumidity >= crithigh: - return (2, "Humidity is: " + infotext, perfdata ) + return 2, "Humidity is: " + infotext, perfdata elif inthumidity <= warnlow or inthumidity >= warnhigh: - return (1, "Humidity is: " + infotext, perfdata ) + return 1, "Humidity is: " + infotext, perfdata else: - return (0, "Humidity is: " + infotext, perfdata ) + return 0, "Humidity is: " + infotext, perfdata else: - return (3, "Sensor is offline") - return (3, "Sensor not found") + return 3, "Sensor is offline" + return 3, "Sensor not found" @@ -68,9 +68,6 @@ def check_akcp_sensor_humidity(item, params, info): # noStatus(1), normal(2), highWarning(3), highCritical(4), # lowWarning(5), lowCritical(6), sensorError(7) - - - check_info["akcp_sensor_humidity"] = { 'check_function': check_akcp_sensor_humidity, 'inventory_function': inventory_akcp_sensor_humidity, @@ -84,7 +81,7 @@ check_info["akcp_sensor_humidity"] = { 5, #sensorProbeHumidityOnline - online(1), offline(2) ], ), - 'snmp_scan_function': \ - lambda oid: "AKCP" in oid(".1.3.6.1.4.1.3854.1.1.6.0") and "sensorProbe" in oid(".1.3.6.1.4.1.3854.1.1.8.0"), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], 'group': 'humidity', }

10 years, 5 months

Check_MK Git: check_mk: brocade_mlx_temp: BigIron RX devices have problems when queried by SNMPv2c bulk walk and do not deliver values

by Bernd Stroessenreuther

. So in this case we do not inventorize them to avoid the check to break Message-ID: <53593c79.R75gwvJ1TjBy5Rne%bs(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 541c74f7c85e9c8224589eaebecc12c1a5cd546e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=541c74f7c85e9c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 24 18:31:04 2014 +0200 brocade_mlx_temp: BigIron RX devices have problems when queried by SNMPv2c bulk walk and do not deliver values. So in this case we do not inventorize them to avoid the check to break --- checks/brocade_mlx_temp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index 306dff5..406f6c4 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -37,7 +37,11 @@ def inventory_brocade_mlx_temp(info): inventory = [] for temp_descr, temp_id, temp_value in info: temp_descr = compose_item(temp_id, temp_descr) - if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory): + # BigIron RX devices have problems when queried by SNMPv2c bulk walk and + # do not deliver values. So in this case we do not inventorize them to + # avoid the check to break + if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory and \ + temp_value != ""): inventory.append( (temp_descr, "brocade_mlx_temperature_default_levels") ) return inventory

10 years, 5 months

Check_MK Git: check_mk: FIX Improved transaction handling in Web GUI

by Andreas Boesl

Module: check_mk Branch: master Commit: b00183ec0c54437d56000c716e4209aa9166ca38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b00183ec0c5443… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 15:39:05 2014 +0200 FIX Improved transaction handling in Web GUI All transactions within the GUI are handled via transaction ids. In some instances these transaction ids were not stored correctly. This could lead to odd results, e.g. that entered data within formulars got discarded. --- .werks/906 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 12 ++++++++++-- web/htdocs/html_mod_python.py | 8 ++++---- web/htdocs/htmllib.py | 10 ++++------ 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/906 b/.werks/906 new file mode 100644 index 0000000..b075194 --- /dev/null +++ b/.werks/906 @@ -0,0 +1,10 @@ +Title: Improved transaction handling in Web GUI +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398346478 +Class: fix + +All transactions within the GUI are handled via transaction ids. +In some instances these transaction ids were not stored correctly. +This could lead to odd results, e.g. that entered data within formulars got discarded. diff --git a/ChangeLog b/ChangeLog index eeb39e7..406284d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... + * 0906 FIX: Improved transaction handling in Web GUI... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/config.py b/web/htdocs/config.py index bb8ea35..dadcffe 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -373,18 +373,26 @@ def get_role_permissions(): return role_permissions # Helper functions -def load_user_file(name, deflt): +def load_user_file(name, deflt, lock = False): path = user_confdir + "/" + name + ".mk" try: + if lock: + aquire_lock(path) + return eval(file(path).read()) except: return deflt -def save_user_file(name, content): +def save_user_file(name, content, unlock = False): path = user_confdir + "/" + name + ".mk" try: write_settings_file(path, content) + + if unlock: + release_lock(path) except Exception, e: + # Error while writing file -> release lock + release_lock(path) raise MKConfigError(_("Cannot save %s options for user %s into %s: %s") % \ (name, user_id, path, e)) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index b164ad4..9b659bb 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -147,12 +147,12 @@ class html_mod_python(htmllib.html): return True - def load_transids(self): - return config.load_user_file("transids", []) + def load_transids(self, lock = False): + return config.load_user_file("transids", [], lock) - def save_transids(self, used_ids): + def save_transids(self, used_ids, unlock = False): if config.user_id: - config.save_user_file("transids", used_ids) + config.save_user_file("transids", used_ids, unlock) def save_tree_states(self): config.save_user_file("treestates", self.treestates) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8957a97..8e02348 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -969,25 +969,23 @@ class html: # than one week. def store_new_transids(self): if self.new_transids: - valid_ids = self.load_transids() - + valid_ids = self.load_transids(lock = True) cleared_ids = [] now = time.time() for valid_id in valid_ids: timestamp, rand = valid_id.split("/") if now - int(timestamp) < 604800: # 7 * 24 hours cleared_ids.append(valid_id) - - self.save_transids(cleared_ids + self.new_transids) + self.save_transids(cleared_ids + self.new_transids, unlock = True) # Remove the used transid from the list of valid ones def invalidate_transid(self, used_id): - valid_ids = self.load_transids() + valid_ids = self.load_transids(lock = True) try: valid_ids.remove(used_id) except ValueError: return - self.save_transids(valid_ids) + self.save_transids(valid_ids, unlock = True) # Checks, if the current transaction is valid, i.e. in case of # browser reload a browser reload, the form submit should not

10 years, 5 months

Check_MK Git: check_mk: FIX Multisite context buttons: links in context buttons are no longer called twice

by Andreas Boesl

Module: check_mk Branch: master Commit: dde31d9ee70e08e5426988a4b6f940ac4305b675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dde31d9ee70e08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 14:52:19 2014 +0200 FIX Multisite context buttons: links in context buttons are no longer called twice The "onclick" attribute in the context button (buttons at the top of a page) additionally called the href link, which was already specified in the "href" attribute. This could lead to raise conditions where transactions (saving a formular) were not handled correctly. --- .werks/905 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/905 b/.werks/905 new file mode 100644 index 0000000..0e0d7e0 --- /dev/null +++ b/.werks/905 @@ -0,0 +1,10 @@ +Title: Multisite context buttons: links in context buttons are no longer called twice +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398343626 +Class: fix + +The "onclick" attribute in the context button (buttons at the top of a page) additionally +called the href link, which was already specified in the "href" attribute. +This could lead to raise conditions where transactions (saving a formular) were not handled correctly. diff --git a/ChangeLog b/ChangeLog index 61b25d0..eeb39e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... + * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 488852f..8957a97 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -382,7 +382,7 @@ class html: if hover_title: self.write(' title="%s"' % self.attrencode(hover_title)) if bestof: - self.write(' onclick="count_context_button(this); document.location=this.href; " ') + self.write(' onclick="count_context_button(this); " ') if fkey and self.keybindings_enabled: title += '<div class=keysym>F%d</div>' % fkey self.add_keybinding([html.F1 + (fkey - 1)], "document.location='%s';" % self.attrencode(url))

10 years, 5 months

Check_MK Git: check_mk: fixed exception when using the table search function

by Andreas Boesl

Module: check_mk Branch: master Commit: 12e870f9aaa178521b3f18cb81bcdacc83763afa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12e870f9aaa178… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 13:15:20 2014 +0200 fixed exception when using the table search function --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 2bb03c4..7a4cef0 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -177,7 +177,7 @@ def end(): for row, css, state in rows: if state == "header": continue - for cell_content, css_classes in row: + for cell_content, css_classes, colspan in row: if search_term in cell_content.lower(): filtered_rows.append((row, css, state)) break # skip other cells when matched

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits