Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64575 discussions

Check_MK Git: check_mk: hitachi_hnas_volume: New check for Usage and Status of Volumes in Hitachi HNAS storage systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8e4a71bbe7cb2e021ad9776c19e4b3de2f54ad20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e4a71bbe7cb2e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 16 16:01:34 2014 +0100 hitachi_hnas_volume: New check for Usage and Status of Volumes in Hitachi HNAS storage systems --- .werks/457 | 8 ++++ ChangeLog | 1 + checkman/hitachi_hnas_volume | 39 +++++++++++++++++ checks/hitachi_hnas_volume | 82 ++++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 131 insertions(+) diff --git a/.werks/457 b/.werks/457 new file mode 100644 index 0000000..c4a08c4 --- /dev/null +++ b/.werks/457 @@ -0,0 +1,8 @@ +Title: hitachi_hnas_volume: New check for Usage and Status of Volumes in Hitachi HNAS storage systems +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1389884457 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a1353bd..199368b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 0566 services.summary: new check to monitor stopped services of mode autostart in windows * 0568 f5_big_ip_conns: check now supports predictive monitoring and both connections types are merged in one check * 0257 windows_agent: now reports extended process information (obsoletes psperf.bat plugin)... + * 0457 hitachi_hnas_volume: New check for Usage and Status of Volumes in Hitachi HNAS storage systems * 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/hitachi_hnas_volume b/checkman/hitachi_hnas_volume new file mode 100644 index 0000000..1475129 --- /dev/null +++ b/checkman/hitachi_hnas_volume @@ -0,0 +1,39 @@ +title: Hitachi HNAS: Usage and Status of Volumes +agents: snmp +catalog: hw/storagehw/hitachi +license: GPL +distribution: check_mk +description: + Checks the Usage and Status of Volumes in Hitachi HNAS storage systems. + + For usage it uses the check logic of the {df} check, so for configuration + parameters and examples please refer to the man page of {df}. + + If the status of a volume is reported to be "mounted", the check may + return {OK}, on status "unformatted" or "formatted", the check returns + at least {WARN}, on "needsChecking" it returns {CRIT} and {UNKN} on + every other status. + + The worst status of both (usage levels and status) is returned by the check. + +item: + The ID of a Volume plus it's label, separated by a space, e. g. 1025 data + +perfdata: + Three values: The first value is the used space of the volume + in MB. Also the minimum (0 MB), maximum (size of the volume) and the + warning and critical levels in MB are provided. + The second is the change of the usage in MB per range since the last check + (e.g. in MB per 24 hours) and the 3rd is the averaged change (so called + trend), also in MB per range. Please note, that performance data for + trends is enabled per default. You can globally disable that in {main.mk} + with {filesystem_default_levels["trend_perfdata"] = False}. + +inventory: + Finds one item per Volume. + +[parameters] +parameters (dict): See man page of {df}. + +[configuration] +filesystem_default_levels: And other, see man page of {df}. diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume new file mode 100644 index 0000000..6eb9b7d --- /dev/null +++ b/checks/hitachi_hnas_volume @@ -0,0 +1,82 @@ +#!/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. + +check_includes["hitachi_hnas_volume"] = [ "df.include" ] + +def inventory_hitachi_hnas_volume(info): + mplist = [] + for id, label, volume_status, total, free, evs in info: + mplist.append(id + " " + label) + return df_inventory(mplist) + +def check_hitachi_hnas_volume(item, params, info): + # use checks from df.include + fslist = [] + for id, label, volume_status, total, free, evs in info: + if id + " " + label == item: + size_mb = int(total) / 1048576.0 + avail_mb = int(free) / 1048576.0 + fslist.append((item, size_mb, avail_mb)) + + status, message, perfdata = df_check_filesystem_list(item, params, fslist) + + # evaluate volumeStatus + statusmap = (("", 3), + ("unformatted", 1), + ("mounted", 0), + ("formatted", 1), + ("needsChecking", 2), + ) + + error_string = ( "", " (!)", " (!!)", "" ) + volume_status=int(volume_status) + + if volume_status == 0 or volume_status >= len(statusmap): + message += ", Volume reports unidentified status %s" % volume_status + status = max(status, 3) + else: + message += ", Status %s%s" % (statusmap[volume_status][0], error_string[statusmap[volume_status][1]]) + status = max(status, statusmap[volume_status][1]) + + # report evs + message += ", assigned to EVS %s" % evs + return status, message, perfdata + + return 3, "Volume %s not found" % item + + +check_info["hitachi_hnas_volume"] = { + "check_function" : check_hitachi_hnas_volume, + "inventory_function" : inventory_hitachi_hnas_volume, + "service_description" : "Volume %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.3.5.2.1", [1, 3, 4, 5, 6, 7]), + # volumeSysDriveIndex, volumeLabel, volumeStatus, volumeCapacity, + # volumeFreeCapacity, volumeEnterpriseVirtualServer + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), + "group" : "filesystem", + "default_levels_variable": "filesystem_default_levels", +} diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a6bf931..b3a9933 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -72,6 +72,7 @@ perfometers["check_mk-oracle_asm_diskgroup"] = perfometer_check_mk_df perfometers["check_mk-mysql_capacity"] = perfometer_check_mk_df perfometers["check_mk-esx_vsphere_counters.ramdisk"] = perfometer_check_mk_df perfometers["check_mk-hitachi_hnas_span"] = perfometer_check_mk_df +perfometers["check_mk-hitachi_hnas_volume"] = perfometer_check_mk_df def perfometer_esx_vsphere_datastores(row, check_command, perf_data): used_mb = perf_data[0][1]

10 years, 8 months

Check_MK Git: check_mk: fixed werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: baa1b066b3dff23086ebb89178e99755d8d4ef9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baa1b066b3dff2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 16 14:41:26 2014 +0100 fixed werk description --- .werks/257 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/257 b/.werks/257 index 84167e8..f8a9f7d 100644 --- a/.werks/257 +++ b/.werks/257 @@ -18,6 +18,6 @@ Additional fixes and features <ul> <li>The agent now also reports its build date, apart from its version</li> <li>Bugfix: The virtual and resident memory shown in the check output is now correct. -There were problems whenever there were multiple processes with the same name<li> +There were problems whenever there were multiple processes with the same name</li> </ul>

10 years, 8 months

Check_MK Git: check_mk: windows_agent: now reports extended process information (obsoletes psperf.bat plugin)

by Andreas Boesl

Module: check_mk Branch: master Commit: 253f77c5c794accd66bb0aaa509f3f85fb87e4b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=253f77c5c794ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 16 14:39:27 2014 +0100 windows_agent: now reports extended process information (obsoletes psperf.bat plugin) The ps section of the windows agent now provides additional information regarding processes. # (user, virtual_size, resident_size, %cpu, processID, pagefile_usage, usermodetime, kernelmodetime, openHandles, threadCount) processName #(\\KLAPPRECHNER\ab,29284,2948,0,3124,904,400576,901296,35,1) NOTEPAD.EXE Previously you had to use the windows agent plugin psperf.bat to achieve the same amount of data. Since this data is now reported by the agent itself, the psperf.bat plugin becomes obsolete. In fact any data from psperf.bat will now be ignored in the ps check whenever the windows agent reports extended process information. Additional fixes and features <ul> <li>The agent now also reports its build date, apart from its version</li> <li>Bugfix: The virtual and resident memory shown in the check output is now correct. There were problems whenever there were multiple processes with the same name<li> </ul> --- .werks/257 | 23 +++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 292 +++++++++++++++++++++++++++++++++---- agents/windows/check_mk_agent.exe | Bin 153088 -> 158208 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 147635 -> 150334 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes checks/ps | 50 +++++-- 8 files changed, 323 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=253f77c5c7…

10 years, 8 months

Check_MK Git: check_mk: Updated bug entries #1087

by Mathias Kettner

Module: check_mk Branch: master Commit: 8dab74ce289fd3ad78d3298f88446e050623dfeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dab74ce289fd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 16 11:29:58 2014 +0100 Updated bug entries #1087 --- .bugs/1087 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1087 b/.bugs/1087 new file mode 100644 index 0000000..6b4d2fb --- /dev/null +++ b/.bugs/1087 @@ -0,0 +1,10 @@ +Title: Omit the "Service " from column headers for service views +Component: multisite +State: open +Date: 2014-01-16 11:29:06 +Targetversion: future +Class: nastiness + +In a view that just show details of a service (like the "service" view), +we should simply remove the "Service " from the column title and upper +case the next character.

10 years, 8 months

Check_MK Git: check_mk: Show all custom variables of hosts and services in the detail views

by Mathias Kettner

Module: check_mk Branch: master Commit: 1608eba1014c020edf1226a925495b643784c32e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1608eba1014c02… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 16 11:41:29 2014 +0100 Show all custom variables of hosts and services in the detail views There is now a new column painter for showing all custom variables of a host or service. This painter has been added to the details views of host and service. --- .werks/449 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/status.css | 13 +++++++++++++ web/plugins/views/builtin.py | 17 +++++++---------- web/plugins/views/painters.py | 26 ++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/.werks/449 b/.werks/449 new file mode 100644 index 0000000..36cece1 --- /dev/null +++ b/.werks/449 @@ -0,0 +1,10 @@ +Title: Show all custom variables of hosts and services in the detail views +Level: 2 +Component: multisite +Version: 1.2.5i1 +Date: 1389868818 +Class: feature + +There is now a new column painter for showing all custom variables of a +host or service. This painter has been added to the details views of +host and service. diff --git a/ChangeLog b/ChangeLog index 88526b9..b853da9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 0247 New mkp package for web applications: iNag / nagstatus / nagios status.dat... * 0429 Implemented role permissions for dashboards... * 0430 It is now possible to define custom time ranges in PNP graph search... + * 0449 Show all custom variables of hosts and services in the detail views... * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... * 0307 FIX: Increased performance of multisite GUI with a large userbase... diff --git a/web/htdocs/status.css b/web/htdocs/status.css index fa5c0bb..bd3099a 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -382,3 +382,16 @@ img.siteicon { height: 24px; border: 1px solid #666; } + +table.customvars { + border-collapse: collapse; + padding: 0px; +} +table.data tr.data td table.customvars td { + /* border: 1px solid #ccc; */ + padding: 0px 5px 0px 0px; +} +table.data tr.data td table.customvars td:last-child { + border-left: 1px solid #bbb; + padding-left: 5px; +} diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index be54aaa..f21f2e4 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -146,20 +146,15 @@ multisite_builtin_views.update({ 'group_painters': [('sitealias', 'sitehosts'), ('host_with_state', 'host')], 'hard_filters': ['summary_host'], - 'hard_filtervars': [('is_service_in_notification_period', - '-1'), + 'hard_filtervars': [('is_service_in_notification_period', '-1'), ('optservicegroup', ''), - ('is_service_notifications_enabled', - '-1'), - ('is_host_in_notification_period', - '-1'), + ('is_service_notifications_enabled', '-1'), + ('is_host_in_notification_period', '-1'), ('is_in_downtime', '-1'), - ('is_service_scheduled_downtime_depth', - '-1'), + ('is_service_scheduled_downtime_depth', '-1'), ('is_service_acknowledged', '-1'), ('host', ''), - ('is_service_active_checks_enabled', - '-1'), + ('is_service_active_checks_enabled', '-1'), ('is_summary_host', '0'), ('service', ''), ('check_command', ''), @@ -1061,6 +1056,7 @@ multisite_builtin_views.update({ ('host_in_downtime', None), ('host_in_notifper', None), ('host_notifper', None), + ('host_custom_vars', None), ('num_services', None), ('num_services_ok', 'host_ok'), ('num_services_warn', 'host_warn'), @@ -1288,6 +1284,7 @@ multisite_builtin_views.update({ ('svc_in_notifper', None), ('svc_notifper', None), ('service_display_name', None), + ('svc_custom_vars', None), ('check_manpage', None), ('svc_custom_notes', None), ('svc_pnpgraph', None), diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 8c3dd07..873f27b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -848,6 +848,25 @@ multisite_painters["svc_servicelevel"] = { "sorter" : 'servicelevel', } +def paint_custom_vars(what, row, blacklist=[]): + items = row[what + "_custom_variables"].items() + items.sort() + code = '<table class=customvars>' + for varname, value in items: + if varname not in blacklist: + code += '<tr><td>%s</td><td>%s</td></tr>' % (varname, value) + code += '</table>' + return "", code + +multisite_painters["svc_custom_vars"] = { + "title" : _("Service custom variables"), + "columns" : [ "service_custom_variables" ], + "paint" : lambda row: paint_custom_vars('service', row), +} + + + + # _ _ _ # | | | | ___ ___| |_ ___ # | |_| |/ _ \/ __| __/ __| @@ -1299,6 +1318,13 @@ multisite_painters["host_servicelevel"] = { "sorter" : 'servicelevel', } +multisite_painters["host_custom_vars"] = { + "title" : _("Host custom variables"), + "columns" : [ "host_custom_variables" ], + "paint" : lambda row: paint_custom_vars('host', row, [ 'FILENAME', 'TAGS']), +} + + # _ _ _ # | | | | ___ ___| |_ __ _ _ __ ___ _ _ _ __ ___ # | |_| |/ _ \/ __| __/ _` | '__/ _ \| | | | '_ \/ __|

10 years, 8 months

Check_MK Git: check_mk: New command "werk url"

by Mathias Kettner

Module: check_mk Branch: master Commit: 01e24ea59fe8e602a7d1f6ecdba2a2a30e760f99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e24ea59fe8e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 16 11:10:47 2014 +0100 New command "werk url" --- werk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/werk b/werk index f71463a..c002b9e 100755 --- a/werk +++ b/werk @@ -279,7 +279,7 @@ def add_comment(werk, title, comment): werk["description"] += """ %s: %s %s""" % (time.strftime("%F %T"), title, comment) - + def usage(): @@ -298,6 +298,7 @@ where COMMAND is one of: edit [#] - open werk # in editor (or newest werk) blame [#] - show who worked on a werk rewrite - rewrite changelog + url # - show the online URL of werk # """) sys.exit(1) @@ -529,7 +530,7 @@ def main_new(args): sys.stdout.write("Werk saved with id %d.\n" % werk["id"]) -def main_blame(args): +def get_werk_arg(args): if len(args) == 0: if g_last_werk == None: bail_out("No last werk, please specify id.") @@ -543,9 +544,19 @@ def main_blame(args): if not werk: bail_out("No such werk.\n") save_last_werkid(id) + return id + +def main_blame(args): + id = get_werk_arg(args) os.system("git blame %d" % id) + +def main_url(args): + id = get_werk_arg(args) + sys.stdout.write("http://mathias-kettner.de/check_mk_werks.php?werk_id=%d\n" % id) + + def main_resolve(args): if len(args) == 0: if g_last_werk == None: @@ -821,6 +832,7 @@ commands = { "rewrite" : rewrite_changelog, "pick" : main_pick, "cherry-pick" : main_pick, + "url" : main_url, } hits = []

10 years, 8 months

Check_MK Git: check_mk: WATO: show check parameter icon even if param column visiable

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d053f09d1fb3229f76f54e93afaeaed6a34a40e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d053f09d1fb32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 16 10:57:47 2014 +0100 WATO: show check parameter icon even if param column visiable --- web/htdocs/wato.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 77c8f69..37e16bd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2601,13 +2601,14 @@ def show_service_table(host, firsttime): table.cell(_("Plugin output"), html.attrencode(output)) # Icon for Rule editor, Check parameters - table.cell(parameter_column and _("Check Parameters") or "") varname = None if checkgroup: varname = "checkgroup_parameters:" + checkgroup elif state_type == "active": varname = "active_checks:" + ct + if parameter_column: + table.cell(_("Check Parameters")) if varname and varname in g_rulespecs: rulespec = g_rulespecs[varname] url = make_link([("mode", "edit_ruleset"), @@ -2624,15 +2625,22 @@ def show_service_table(host, firsttime): if parameter_column: html.write(paramtext) - else: - # Strip all HTML code from the paramtext - paramtext = paramtext.replace('</td>', '\t') - paramtext = paramtext.replace('</tr>', '\n') - paramtext = html.strip_tags(paramtext) + # Strip all HTML code from the paramtext + table.cell("") + paramtext = paramtext.replace('</td>', '\t') + paramtext = paramtext.replace('</tr>', '\n') + paramtext = html.strip_tags(paramtext) + + if parameter_column: + title = _("Edit the parameters of this check") + else: title = _("Check parameters for this service") + ": \n" + paramtext - html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % - (url, title)) + html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % + (url, title)) + + else: + table.cell("", "") # Permanently disable icon

10 years, 8 months

Check_MK Git: check_mk: New button in WATO service list for displaying check parameters

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e7f4cceb66db14025cff9eb1abfaa7faea6a939 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e7f4cceb66db1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 16 10:53:20 2014 +0100 New button in WATO service list for displaying check parameters In WATO the service list of a host has now a new button Show Check Parameters. That button adds a new column to the list that shows the check parameters of that service directly in the table - not just as a tooltip to the triangle icon. --- .werks/448 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 21 ++++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.werks/448 b/.werks/448 new file mode 100644 index 0000000..bc83c34 --- /dev/null +++ b/.werks/448 @@ -0,0 +1,10 @@ +Title: New button in WATO service list for displaying check parameters +Level: 2 +Component: wato +Version: 1.2.5i1 +Date: 1389865905 +Class: feature + +In WATO the service list of a host has now a new button Show Check Parameters. That button +adds a new column to the list that shows the check parameters of that service directly in the +table - not just as a tooltip to the triangle icon. diff --git a/ChangeLog b/ChangeLog index ee4c4d2..88526b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,6 +150,7 @@ * 0437 Convert WATO rule for debug_log into simple Checkbox... * 0428 Changed user profiles (e.g. pw changes) are now replicated in distributed setups... * 0114 User Custom Attributes can now be exported to the core... + * 0448 New button in WATO service list for displaying check parameters... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index db695c7..77c8f69 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2445,6 +2445,17 @@ def mode_inventory(phase, firsttime): config.need_permission("wato.services") check_host_permissions(hostname) if html.check_transaction(): + + # Settings for showing parameters + if html.var("_show_parameters"): + parameter_column = True + config.save_user_file("parameter_column", True) + return + elif html.var("_hide_parameters"): + parameter_column = False + config.save_user_file("parameter_column", False) + return + cache_options = html.var("_scan") and [ '@scan' ] or [ '@noscan' ] table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) table.sort() @@ -2498,6 +2509,7 @@ def show_service_table(host, firsttime): # Read current check configuration cache_options = html.var("_scan") and [ '@scan' ] or [ '@noscan' ] + parameter_column = config.load_user_file("parameter_column", False) # We first try using the Cache (if the user has not pressed Full Scan). # If we do not find any data, we omit the cache and immediately try @@ -2535,6 +2547,14 @@ def show_service_table(host, firsttime): if len(checktable) > 0: html.button("_save", _("Save manual check configuration")) + html.write("   ") + if parameter_column: + html.button("_hide_parameters", _("Hide Check Parameters")) + else: + html.button("_show_parameters", _("Show Check Parameters")) + + + html.hidden_fields() if html.var("_scan"): html.hidden_field("_scan", "on") @@ -2542,7 +2562,6 @@ def show_service_table(host, firsttime): table.begin(css ="data", searchable = False) # This option will later be switchable somehow - parameter_column = False for state_name, state_type, checkbox in [ ( _("Available (missing) services"), "new", firsttime ),

10 years, 8 months

Check_MK Git: check_mk: FIX stulz_humidity: Fixed syntax error

by Lars Michelsen

Module: check_mk Branch: master Commit: e617ced11d640e68428275ab0c7b850651a0c556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e617ced11d640e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 16 10:29:20 2014 +0100 FIX stulz_humidity: Fixed syntax error Fixed syntax error in check which broke whole Check_MK. --- .werks/432 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/432 b/.werks/432 new file mode 100644 index 0000000..0de6035 --- /dev/null +++ b/.werks/432 @@ -0,0 +1,9 @@ +Title: stulz_humidity: Fixed syntax error +Level: 3 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389864479 + +Fixed syntax error in check which broke whole Check_MK. diff --git a/ChangeLog b/ChangeLog index 719b639..ba65661 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * 0565 FIX: windows_updates: fix for some cases when forced_reboot is not set * 0255 FIX: windows_agent: now able to handle the removal of local/plugin scripts during runtime... * 0447 FIX: fortigate_memory: Fix inventory, do not add check if no info available... + * 0432 FIX: stulz_humidity: Fixed syntax error... Multisite: * 0371 Added log class filter to hostsvcevents view

10 years, 8 months

Check_MK Git: check_mk: Fixed copy and paste bug

by Bastian Kuhn

Module: check_mk Branch: master Commit: d7aa7e4766f9e1aeecaed05d2fab2b7e6ff58be5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7aa7e4766f9e1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 15 16:52:23 2014 +0100 Fixed copy and paste bug --- checks/apc_humidity | 4 ++-- checks/stulz_humidity | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/apc_humidity b/checks/apc_humidity index 0b9b4b3..9dc67be 100644 --- a/checks/apc_humidity +++ b/checks/apc_humidity @@ -36,8 +36,8 @@ def check_apc_humidity(item, params, info): if line[0] == item: humidity = saveint(line[1]) warnlow, critlow, warnhigh, crithigh = params - infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ - (critlow, warnlow, warnhigh, crithigh) + ")" + infotext = "%s%% (warn/crit below %.1f/%.1f or above %.1f/%.1f %%)" % \ + ( humidity, critlow, warnlow, warnhigh, crithigh) perfdata = [ ( "humidity", humidity, critlow, warnlow, warnhigh, crithigh ) ] if humidity <= critlow or humidity >= crithigh: return (2, "Humidity is: " + infotext, perfdata ) diff --git a/checks/stulz_humidity b/checks/stulz_humidity index 87e267c..53ce479 100644 --- a/checks/stulz_humidity +++ b/checks/stulz_humidity @@ -34,7 +34,8 @@ def check_stulz_humidity(item, params, info): if line[0] == item: warnlow, critlow, warnhigh, crithigh = params humidity = savefloat(line[1])/10 - infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ + infotext = "%s%% (warn/crit below %.1f/%.1f or above %.1f/%.1f %%)" % \ + ( humidity, critlow, warnlow, warnhigh, crithigh) perfdata = [ ('humidity', humidity, critlow, warnlow, warnhigh, crithigh ) ] if humidity <= critlow or humidity >= crithigh:

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits