Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 11bfb5115ac9e443000a8b3b38aa24d536547669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11bfb5115ac9e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 15:49:37 2015 +0100 New automation for releasing packages --- modules/automation.py | 11 ++++++++--- modules/packaging.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index dad86be..4cca757 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -55,7 +55,9 @@ def do_automation(cmd, args): elif cmd == "install-package": result = automation_install_package(args) elif cmd == "remove-package": - result = automation_remove_package(args) + result = automation_remove_or_release_package(args, "remove") + elif cmd == "release-package": + result = automation_remove_or_release_package(args, "release") elif cmd == "notification-get-bulks": result = automation_get_bulks(args) else: @@ -1349,10 +1351,13 @@ def automation_install_package(args): raise MKAutomationError("Cannot install package: %s" % e) -def automation_remove_package(args): +def automation_remove_or_release_package(args, mode): load_module("packaging") package_name = args[0] package = read_package_info(package_name) if not package: raise MKAutomationError("Package not installed or corrupt") - remove_package(package) + if mode == "remove": + remove_package(package) + else: + remove_package_info(package_name) diff --git a/modules/packaging.py b/modules/packaging.py index 1e4ec3c..6f6f962 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -248,7 +248,6 @@ def package_release(args): if package_exists(pacname): raise PackageException("No such package %s." % pacname) package = read_package_info(pacname) - os.unlink(pacpath) verbose("Releasing files of package %s into freedom...\n" % pacname) if opt_verbose: for part, title, perm, dir in package_parts: @@ -257,6 +256,7 @@ def package_release(args): verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) for f in filenames: verbose(" %s\n" % f) + remove_package_info(pacname) def package_exists(pacname):

8 years, 8 months

#2819 FIX netapp_api_if: now able to detect even more interfaces

by Andreas Boesl

Module: check_mk Branch: master Commit: 12fe695f11c33b32ae9c264f2745746bbc8b489f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12fe695f11c33b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 17 15:42:13 2015 +0100 #2819 FIX netapp_api_if: now able to detect even more interfaces The check was unable to detect interfaces with no link-status information. Some interfaces (especially virtual ones) often simply report an operational-status. The check now uses the operational-status information in case the link-status is missing. --- .werks/2819 | 11 +++++++++++ ChangeLog | 1 + checks/netapp_api_if | 12 +++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.werks/2819 b/.werks/2819 new file mode 100644 index 0000000..ca60395 --- /dev/null +++ b/.werks/2819 @@ -0,0 +1,11 @@ +Title: netapp_api_if: now able to detect even more interfaces +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450363196 +Class: fix + +The check was unable to detect interfaces with no link-status information. +Some interfaces (especially virtual ones) often simply report an operational-status. +The check now uses the operational-status information in case the link-status is missing. diff --git a/ChangeLog b/ChangeLog index aa75dc6..63824c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -161,6 +161,7 @@ * 1317 FIX: fileinfo.groups: Fixed handling of $DATE pattern... * 2813 FIX: agent_netapp: fixed missing environmental sensor information and exception with snapshot volumes... * 2818 FIX: check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern... + * 2819 FIX: netapp_api_if: now able to detect even more interfaces... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netapp_api_if b/checks/netapp_api_if index 715e3bb..e327fd4 100644 --- a/checks/netapp_api_if +++ b/checks/netapp_api_if @@ -59,11 +59,13 @@ def netapp_convert_to_if64(info): vif_list.append(name) # Reported by Clustermode - if "link-status" in values: - if values["link-status"] == "up": - values["state"] = "1" - else: - values["state"] = "2" + for status_key in [ "link-status", "operational-status" ]: + if status_key in values: + if values[status_key] == "up": + values["state"] = "1" + else: + values["state"] = "2" + break # Reported by Clustermode if "operational-speed" in values:

8 years, 8 months

removed useless line

by Andreas Boesl

Module: check_mk Branch: master Commit: 7b0f373a558b56c8fc2b2e00909c417115fc7b52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b0f373a558b56… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 17 15:35:30 2015 +0100 removed useless line --- checks/netapp_api_fan | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/netapp_api_fan b/checks/netapp_api_fan index cebb47c..04c4e80 100644 --- a/checks/netapp_api_fan +++ b/checks/netapp_api_fan @@ -36,8 +36,6 @@ def inventory_netapp_api_fan(parsed): yield item_name, None def check_netapp_api_fan(item, _no_params, parsed): - tokens = item.split("/") - fan = parsed.get("%s.%s" % tuple(item.split("/"))) if not fan: return

8 years, 8 months

removed obsolete function

by Andreas Boesl

Module: check_mk Branch: master Commit: 0303cf184afe0c9c8d819913f730145535ce58a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0303cf184afe0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 17 15:24:02 2015 +0100 removed obsolete function --- checks/netapp_api.include | 78 --------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/checks/netapp_api.include b/checks/netapp_api.include index bbc28a3..cf8ea5b 100644 --- a/checks/netapp_api.include +++ b/checks/netapp_api.include @@ -51,81 +51,3 @@ def netapp_api_parse_lines(info, custom_keys = [], as_dict_list = False): return instances -# Converts the given info into -# - A config dictionary with config_key as identifier. If the counter_key of the -# counter section matches the config_key the counter information is merged into -# the config. -# - With counter_as_key you can specify whether the counter_key entries -# should used as main keys in the returned dictionary -def netapp_api_convert_info(info, configs = {}, counter_key = None, counter_as_key = False): - lines = iter(info) - try: - is_config = False - current_instance = None - current_config = None - - current_counter = {} - objects = {} - last_config_name = [""] - - def add_config(): - if current_config == None: - return - key = current_config.get(configs.get(current_instance, {}).get("key")) - if key: - objects.setdefault(current_instance, {}) - objects[current_instance][key] = current_config - last_config_name[0] = key - - def add_counter(): - if not current_counter: - return - counter_name = current_counter.get(counter_key) - if not counter_name: - return - - if counter_as_key: - objects[counter_name] = current_counter - elif counter_name in objects[current_instance]: - objects[current_instance][counter_name]["counters"] = current_counter - - while True: - line = lines.next() - if line[0] == "[config_instance]": - add_config() - add_counter() - current_counter = {} - is_config = True - current_instance = line[-1] - continue - elif line[0] == "[counter_instance]": - add_config() - add_counter() - current_config = {} - is_config = False - continue - - if is_config: - if line[-1] == configs.get(current_instance, {}).get("block-name"): - add_config() - current_config = {} - elif current_config != None and len(line) >= 2: - key = line[0] - if current_config.get(key): - continue - else: - current_config[key] = line[1] - else: # is counter - if line[-1] == "---new_counter---": - add_counter() - current_counter = {} - elif len(line) == 2: - current_counter[line[0]] = line[1] - - except StopIteration: - add_config() - add_counter() - pass - - return objects -

8 years, 8 months

#1318 cisco_asa_svcsessions: New Check to monitor VPN Connections on Cisco ASA devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 96f30104fbfe787445e8be507d3e7107201cf17a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96f30104fbfe78… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 17 15:02:44 2015 +0100 #1318 cisco_asa_svcsessions: New Check to monitor VPN Connections on Cisco ASA devices --- .werks/1318 | 9 ++++++ ChangeLog | 1 + checkman/cisco_asa_svcsessions | 13 ++++++++ checks/cisco_asa_svcsessions | 58 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 15 +++++++++ 5 files changed, 96 insertions(+) diff --git a/.werks/1318 b/.werks/1318 new file mode 100644 index 0000000..7176583 --- /dev/null +++ b/.werks/1318 @@ -0,0 +1,9 @@ +Title: cisco_asa_svcsessions: New Check to monitor VPN Connections on Cisco ASA devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450360935 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e779401..aa75dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 2816 check_mail_loop: now supports STARTTLS for IMAP authentification * 2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB * 1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM Mainframes) + * 1318 cisco_asa_svcsessions: New Check to monitor VPN Connections on Cisco ASA devices * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/cisco_asa_svcsessions b/checkman/cisco_asa_svcsessions new file mode 100644 index 0000000..4cae9c4 --- /dev/null +++ b/checkman/cisco_asa_svcsessions @@ -0,0 +1,13 @@ +title: Citrix ASA SVC Sessions (SSL VPN Client) +agents: snmp +catalog: hw/network/cisco +distribution: check_mk +license: GPLv3 +description: + This check monitors the number of active Sessions VPN Sessions (e.g. Anyconnect) on a citrix server. + +inventory: + One service will be created. + +perfdata: + One graph will be created diff --git a/checks/cisco_asa_svcsessions b/checks/cisco_asa_svcsessions new file mode 100644 index 0000000..55fa6b3 --- /dev/null +++ b/checks/cisco_asa_svcsessions @@ -0,0 +1,58 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +# 1.3.6.1.4.1.9.9.392.1.3.35.0 crasSVCNumSessions +# The number of currently active SVC sessions. + +cisco_asa_svc_default_levels = ( 20, 25 ) + +def inventory_cisco_asa_svcsessions(info): + return [ (None, "cisco_asa_svc_default_levels") ] + + +def check_cisco_asa_svcsessions(_no_item, params, info): + num_sessions = int(info[0][0]) + warn, crit = params + perfdata = [("active", num_sessions, warn, crit )] + message = "Currently %d Sessions" % num_sessions + levels = " (Warn/ Crit at %d/%d)" % ( warn, crit) + if num_sessions >= crit: + return 2, message + levels, perfdata + elif num_sessions >= warn: + return 1, message + levels, perfdata + else: + return 0, message, perfdata + +check_info["cisco_asa_svcsessions"] = { + "check_function" : check_cisco_asa_svcsessions, + "inventory_function" : inventory_cisco_asa_svcsessions, + "service_description": "SVC Sessions", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ + or "cisco pix security" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_info" : (".1.3.6.1.4.1.9.9.392.1.3", [ 35 ]), + "group" : "asa_svc_sessions", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1c7898b..ca6d71b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5858,6 +5858,21 @@ register_check_parameters( match_type = "dict", ) +register_check_parameters( + subgroup_applications, + "asa_svc_sessions", + _("Cisco SSl VPN Client Sessions"), + Tuple( + title = _("Number of active sessions"), + help = _("This check monitors the current number of active sessions"), + elements = [ + Integer(title = _("Warning at"), unit = _("sessions"), default_value = 100), + Integer(title = _("Critical at"), unit = _("sessions"), default_value = 200), + ], + ), + None, + match_type = "first", +) register_check_parameters( subgroup_applications,

8 years, 8 months

ValueSpec DualListChoice: fix hilighting of input errors

by Mathias Kettner

Module: check_mk Branch: master Commit: 500837c54e43b059d21c1b1739a4841f28eebdd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=500837c54e43b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 14:41:27 2015 +0100 ValueSpec DualListChoice: fix hilighting of input errors --- modules/automation.py | 15 +++++++++++ modules/packaging.py | 69 ++++++++++++++++++++++++++++++++++++++++++----- web/htdocs/htmllib.py | 5 ++++ web/htdocs/pages.css | 2 +- web/htdocs/valuespec.py | 10 +++++++ 5 files changed, 94 insertions(+), 7 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 5e588a5..dad86be 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -48,6 +48,10 @@ def do_automation(cmd, args): result = automation_get_package_info(args) elif cmd == "get-package": result = automation_get_package(args) + elif cmd == "create-package": + result = automation_create_or_edit_package(args, "create") + elif cmd == "edit-package": + result = automation_create_or_edit_package(args, "edit") elif cmd == "install-package": result = automation_install_package(args) elif cmd == "remove-package": @@ -118,6 +122,7 @@ def do_automation(cmd, args): output_profile() sys.exit(0) + # Does discovery for a list of hosts. Possible values for how: # "new" - find only new services (like -I) # "remove" - remove exceeding services @@ -1322,6 +1327,16 @@ def automation_get_package(args): return package, output_file.content() +def automation_create_or_edit_package(args, mode): + load_module("packaging") + package_name = args[0] + new_package_info = eval(sys.stdin.read()) + if mode == "create": + create_package(new_package_info) + else: + edit_package(package_name, new_package_info) + + def automation_install_package(args): load_module("packaging") file_content = sys.stdin.read() diff --git a/modules/packaging.py b/modules/packaging.py index a219bc1..1e4ec3c 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -216,7 +216,7 @@ def package_create(args): verbose(" %s\n" % f) - write_package_info(pacname, package) + write_package_info(package) verbose("New package %s created with %d files.\n" % (pacname, num_files)) verbose("Please edit package details in %s%s%s\n" % (tty_bold, pac_dir + pacname, tty_normal)) @@ -245,7 +245,7 @@ def package_release(args): pacname = args[0] pacpath = pac_dir + pacname - if not os.path.exists(pacpath): + if package_exists(pacname): raise PackageException("No such package %s." % pacname) package = read_package_info(pacname) os.unlink(pacpath) @@ -259,6 +259,11 @@ def package_release(args): verbose(" %s\n" % f) +def package_exists(pacname): + pacpath = pac_dir + pacname + return os.path.exists(pacpath) + + def package_pack(args): if len(args) != 1: raise PackageException("Usage: check_mk -P pack NAME") @@ -346,6 +351,55 @@ def remove_package(package): os.remove(pac_dir + package["name"]) +def create_package(package_info): + pacname = package_info["name"] + if package_exists(pacname): + raise PackageException("Packet already exists.") + + validate_package_files(pacname, package_info["files"]) + write_package_info(package_info) + + +def edit_package(pacname, new_package_info): + if not package_exists(pacname): + raise PackageException("No such package") + + # Renaming: check for collision + if pacname != new_package_info["name"]: + if package_exists(new_package_info["name"]): + raise PackageException("Cannot rename package: a package with that name already exists.") + + validate_package_files(pacname, new_package_info["files"]) + + remove_package_info(pacname) + write_package_info(new_package_info) + + + +# Packaged files must either be unpackaged or already +# belong to that package +def validate_package_files(pacname, files): + packages = {} + for package_name in all_package_names(): + packages[package_name] = read_package_info(package_name) + + for part, title, perm, dir in package_parts: + validate_package_files_part(packages, pacname, part, dir, files.get(part, [])) + + +def validate_package_files_part(packages, pacname, part, dir, rel_paths): + for rel_path in rel_paths: + path = dir + "/" + rel_path + if not os.path.exists(path): + raise PackageException("File %s does not exist." % path) + + for other_pacname, other_package_info in packages.items(): + for other_rel_path in other_package_info["files"].get(part, []): + if other_rel_path == rel_path and other_pacname != pacname: + raise PackageException("File %s does already belong to package %s" % (path, other_pacname)) + + + def package_install(args): if len(args) != 1: raise PackageException("Usage: check_mk -P remove NAME") @@ -431,8 +485,7 @@ def install_package(file_name=None, file_object=None): sys.stderr.write("Error removing %s: %s\n" % (path, e)) # Last but not least install package file - file(pac_dir + pacname, "w").write(pprint.pformat(package)) - + write_package_info(package) return package @@ -507,8 +560,12 @@ def read_package_info(pacname): return None -def write_package_info(pacname, package): - file(pac_dir + pacname, "w").write(pprint.pformat(package) + "\n") +def write_package_info(package): + file(pac_dir + package["name"], "w").write(pprint.pformat(package) + "\n") + + +def remove_package_info(pacname): + os.remove(pac_dir + pacname) def all_package_names(): diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f5ac9a5..98618df 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -608,6 +608,9 @@ class html(GUITester): attrs.setdefault('size', 1) attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) + error = self.user_errors.get(varname) + if error: + self.write("<x class=\"inputerror\">") self.write("<select%s name=\"%s\" id=\"%s\"%s>\n" % (onchange_code, varname, varname, attributes)) for value, text in choices: @@ -617,6 +620,8 @@ class html(GUITester): self.write("<option value=\"%s\"%s>%s</option>\n" % (self.attrencode(value), sel, self.attrencode(text))) self.write("</select>\n") + if error: + self.write("<x class=\"inputerror\">") if varname: self.form_vars.append(varname) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 43245f0..1dfa38c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -654,7 +654,7 @@ input.date, input.time { font-family: monospace; } -.inputerror input, .inputerror textarea, .inputerror span.checkbox { +.inputerror input, .inputerror textarea, .inputerror span.checkbox, .inputerror > select { background-color: #f84; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0ec06bd..ff106c9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1676,6 +1676,7 @@ class DualListChoice(ListChoice): self._rows = 5 self._size = kwargs.get("size") # Total with in ex + def render_input(self, varprefix, value): self.load_elements() if not self._elements: @@ -1742,6 +1743,14 @@ class DualListChoice(ListChoice): html.write('</td></tr></table>') html.hidden_field(varprefix, '|'.join([k for k, v in selected]), id = varprefix, add_var = True) + + def validate_value(self, value, varprefix): + try: + ListChoice.validate_value(self, value, varprefix) + except MKUserError, e: + raise MKUserError(e.varname + "_selected", e.message) + + def from_html_vars(self, varprefix): self.load_elements() selected = html.var(varprefix, '').split('|') @@ -1758,6 +1767,7 @@ class DualListChoice(ListChoice): value.append(key) return value + # A type-save dropdown choice with one extra field that # opens a further value spec for entering an alternative # Value.

8 years, 8 months

#1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs ( zLinux on IBM Mainframes)

by Bastian Kuhn

Module: check_mk Branch: master Commit: 76c4238bf41fec448d87bb48d17e01a937b58121 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76c4238bf41fec… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 17 12:57:39 2015 +0100 #1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM Mainframes) --- .werks/1600 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1600 b/.werks/1600 new file mode 100644 index 0000000..deb10df --- /dev/null +++ b/.werks/1600 @@ -0,0 +1,9 @@ +Title: check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM Mainframes) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450353376 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 890a41f..e779401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync, msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa, msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange... * 2816 check_mail_loop: now supports STARTTLS for IMAP authentification * 2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB + * 1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM Mainframes) * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 20e0b86..b6f07e3 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -333,7 +333,7 @@ fi # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*) ' < /proc/diskstats if type dmsetup >/dev/null ; then echo '[dmsetup_info]' dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name

8 years, 8 months

DualList Valuespec: better styling

by Mathias Kettner

Module: check_mk Branch: master Commit: e3cc66d6bad1a1345979929d5c15476af939c5e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3cc66d6bad1a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 11:59:14 2015 +0100 DualList Valuespec: better styling --- web/htdocs/check_mk.css | 8 +++++++- web/htdocs/valuespec.py | 37 +++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9eb3b5f..98bf2be 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -463,7 +463,13 @@ table.valuespec_listof option[selected] { table.valuespec_listof .unused { display: none; } - +table.vs_duallist td { + width: 50%; +} +table.vs_duallist td select { + width: 100%; + height: 200px; +} table.vs_duallist td.head { text-align:center; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 91d7faf..0ec06bd 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1669,7 +1669,12 @@ class DualListChoice(ListChoice): self._custom_order = kwargs.get("custom_order", False) self._instant_add = kwargs.get("instant_add", False) self._enlarge_active = kwargs.get("enlarge_active", False) - self._rows = kwargs.get("rows", 5) + if "rows" in kwargs: + self._rows = kwargs.get("rows", 5) + self._autoheight = False + else: + self._rows = 5 + self._size = kwargs.get("size") # Total with in ex def render_input(self, varprefix, value): self.load_elements() @@ -1699,7 +1704,11 @@ class DualListChoice(ListChoice): select_func = 'vs_duallist_switch(\'unselected\', \'%s\', %d);' % (varprefix, self._custom_order and 1 or 0) unselect_func = 'vs_duallist_switch(\'selected\', \'%s\', 1);' % varprefix - html.write('<table class="vs_duallist"><tr><td class="head">') + if self._size: + style = ' style="width: %dpx"' % (self._size * 6.4) + else: + style = '' + html.write('<table class="vs_duallist"%s><tr><td class="head">' % style) html.write(_('Available')) if not self._instant_add: html.write('<a href="javascript:%s" class="control add">></a>' % select_func) @@ -1721,23 +1730,15 @@ class DualListChoice(ListChoice): onchange_unselected += ';vs_duallist_enlarge(\'unselected\', \'%s\')' % varprefix func = self._custom_order and html.select or html.sorted_select - func(varprefix + '_unselected', unselected, - attrs = { - 'size' : self._rows, - 'multiple' : 'multiple', - 'style' : self._autoheight and 'height:auto' or '', - 'ondblclick' : not self._instant_add and select_func or '', - }, - onchange = onchange_unselected) + attrs = { + 'foo' : "bar", + 'multiple' : 'multiple', + 'style' : self._autoheight and 'height:auto' or "height: %dpx" % (self._rows * 16), + 'ondblclick' : not self._instant_add and select_func or '', + } + func(varprefix + '_unselected', unselected, attrs = attrs, onchange = onchange_unselected) html.write('</td><td>') - func(varprefix + '_selected', selected, - attrs = { - 'size' : self._rows, - 'multiple' : 'multiple', - 'style' : self._autoheight and 'height:auto' or '', - 'ondblclick' : not self._instant_add and unselect_func or '', - }, - onchange = onchange_selected) + func(varprefix + '_selected', selected, attrs = attrs, onchange = onchange_selected) html.write('</td></tr></table>') html.hidden_field(varprefix, '|'.join([k for k, v in selected]), id = varprefix, add_var = True)

8 years, 8 months

wmi.include: fixed bug where lines in multi-table wmi output were ignored

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1b42fc267faae2dfc335c3b75c49f7e888a41393 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b42fc267faae2… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 11:37:01 2015 +0100 wmi.include: fixed bug where lines in multi-table wmi output were ignored --- checks/wmi.include | 3 --- 1 file changed, 3 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index 5be619d..45aca3d 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -101,9 +101,6 @@ def parse_wmi_table(info, key="Name"): current.add_row(line) line = info_iter.next() - if line[0].startswith("["): - line = info_iter.next() - except StopIteration: # regular end of block pass

8 years, 8 months

windows agent: removed the unnecessary limit on how much data is buffered before flushing

by Sebastian Herbord

Module: check_mk Branch: master Commit: 48ba338779009f658271154b8c489c5d273107fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48ba338779009f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 11:26:19 2015 +0100 windows agent: removed the unnecessary limit on how much data is buffered before flushing Instead, there is now the configuration parameter (defaults to on) to flush after every completed section, which helps debugging agent slowness --- agents/windows/Configuration.cc | 14 +++++++------ agents/windows/Configuration.h | 4 +++- agents/windows/OutputProxy.cc | 17 +++------------ agents/windows/OutputProxy.h | 9 +++----- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 24 ++++++++++++++++++++++ agents/windows/check_mk_agent-64.exe | Bin 886784 -> 886784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 886784 -> 886784 bytes agents/windows/check_mk_agent.cc | 13 ++++-------- agents/windows/check_mk_agent.exe | Bin 807936 -> 807936 bytes agents/windows/check_mk_agent.msi | Bin 1953792 -> 1954816 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 807936 -> 807936 bytes agents/windows/install_agent-64.exe | Bin 406134 -> 406594 bytes agents/windows/install_agent.exe | Bin 396856 -> 397231 bytes 14 files changed, 46 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=48ba338779…

8 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015