Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1999 FIX raritan_pdu_inlet_summary,

by Mathias Kettner

raritan_pdu_inlet, ups_socomec_outphase: renamed services to be consistent Message-ID: <54e60875.Jomx55fKIwuGNY9L%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e2835ad6b5aa3d4845eca9a9115fcdc36b75f111 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2835ad6b5aa3d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 19 16:59:43 2015 +0100 #1999 FIX raritan_pdu_inlet_summary, raritan_pdu_inlet, ups_socomec_outphase: renamed services to be consistent These three checks have been converted to the new generic implementation for electrical phases. That way the service descriptions have been renamed to consistently begin with <tt>Input</tt> or <tt>Output</tt>. Also the word <tt>Phase</tt> has been moved into the item. And the name of the performance value <tt>load</tt> has been renamed to <tt>output_load</tt>. This means that you need to redo service discovery and new RRD databases will be created. --- .werks/1999 | 14 +++ ChangeLog | 2 + checks/elphase.include | 162 ++++++++-------------------------- checks/raritan_pdu_inlet | 5 +- checks/raritan_pdu_inlet.include | 8 +- checks/raritan_pdu_inlet_summary | 2 +- checks/ups_socomec_outphase | 14 +-- web/plugins/metrics/check_mk.py | 44 +++++++-- web/plugins/wato/check_parameters.py | 10 +-- 9 files changed, 113 insertions(+), 148 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2835ad6b5…

9 years, 4 months

Check_MK Git: check_mk: Fix scaling of values (lead to wrong Perf-O-Meters )

by Mathias Kettner

Module: check_mk Branch: master Commit: 5d879749e820fae88e7cafdb48082660ebc568f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d879749e820fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 19 13:36:39 2015 +0100 Fix scaling of values (lead to wrong Perf-O-Meters) --- web/htdocs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 3c0b52f..8f3134a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -147,7 +147,7 @@ def translate_metrics(perf_data, check_command): scale = translation_entry.get("scale", 1) new_entry = { - "value" : float_or_int(entry[1]), + "value" : float_or_int(entry[1]) * scale, "orig_name" : varname, "scalar" : {}, }

9 years, 4 months

Check_MK Git: check_mk: #1998 statgrab_net: New implementation of network interface monitoring via statgrab

by Mathias Kettner

Module: check_mk Branch: master Commit: d69c5b6808fbcb1e9a0de22bdb579185438735d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69c5b6808fbcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 19 13:33:39 2015 +0100 #1998 statgrab_net: New implementation of network interface monitoring via statgrab Previously when monitoring network interfaces on Solaris and HP-UX you would have tree checks per Interface: For state, counters, and speed. These three have now been replaced by one new check simply named {Interface}. This uses the same implementation as all other interface checks in Check_MK now. This means that you can do configuration via WATO, have all features like averaging and predictive monitoring, interface grouping and much more. Note: This is an incompatible change. You will have to redo service discovery on the machines using statgrab. The old services will then vanish. New ones will appear. As long as you do not do this, the existing checks will go to UNKNOWN. --- .werks/1998 | 18 +++ ChangeLog | 2 + checkman/statgrab_net | 22 ++++ checkman/statgrab_net.ctr | 24 ---- checkman/statgrab_net.link | 33 ----- checkman/statgrab_net.params | 33 ----- checks/if64 | 4 +- checks/statgrab_net | 199 +++++++------------------------ pnp-templates/check_mk-statgrab_net.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 10 files changed, 91 insertions(+), 246 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d69c5b6808…

9 years, 4 months

Check_MK Git: check_mk: added forgotten AKCP expansion dry contact check

by Lutz Helwing

Module: check_mk Branch: master Commit: 66e9fbc12372946001fb293859fb21302a79df45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66e9fbc1237294… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Thu Feb 19 12:21:04 2015 +0100 added forgotten AKCP expansion dry contact check --- checkman/akcp_exp_drycontact | 15 +++++++++++++++ checks/akcp_exp_drycontact | 43 ++++++++++++++++++++++++++++++++++++++++++ checks/akcp_sensor.include | 25 ++++++++++++++++++++++-- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/checkman/akcp_exp_drycontact b/checkman/akcp_exp_drycontact new file mode 100644 index 0000000..53a843c --- /dev/null +++ b/checkman/akcp_exp_drycontact @@ -0,0 +1,15 @@ +title: AKCP Expansion Dry Contact Sensor +agents: snmp +catalog: hw/environment/akcp +license: GPL +distribution: check_mk +description: + This check monitors the state of all online dry contact sensors on AKCP securityProbe environment monitoring boards which have expansion boards + daisy chained to them. + All states other than 'normal' result to CRIT. + +item: + The description of the sensor as string as specified by the user during board configuration. + +inventory: + All online dry contact sensors are automatically detected and inventorized. diff --git a/checks/akcp_exp_drycontact b/checks/akcp_exp_drycontact new file mode 100644 index 0000000..bf3a944 --- /dev/null +++ b/checks/akcp_exp_drycontact @@ -0,0 +1,43 @@ +#!/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. + + +# Example for contents of info +# description state online +# ["Diesel1 Generatorbetrieb", "2", "1"] + +check_info["akcp_exp_drycontact"] = { + "check_function" : check_akcp_sensor_drycontact, + "inventory_function" : lambda info: inventory_akcp_sensor(info), + "service_description" : "Dry Contact %s", + "snmp_scan_function" : snmp_scan_akcp_exp, + "snmp_info" : ( ".1.3.6.1.4.1.3854.2.3.4.1", [ + 2, # SPAGENT-MIB::sensorDryContactDescription + 6, # SPAGENT-MIB::sensorDryContactStatus + 8, # SPAGENT-MIB::sensorDryContactGoOffline + ] ), + "includes" : [ "akcp_sensor.include" ], +} diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index eee5fd4..073ae59 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -48,6 +48,16 @@ relay_states = { "9" : (0, "relay off" ), } +# States for dry contact sensors as they are defined in SPAGENT-MIB +drycontact_states = { + "1" : (2, "no status" ), + "2" : (0, "normal" ), + "4" : (2, "high critical" ), + "6" : (2, "low critical" ), + "7" : (2, "sensor error" ), + "8" : (2, "output low" ), + "9" : (2, "output high" ), +} # States for sensors with levels as they are defined in SPAGENT-MIB level_states = { @@ -78,14 +88,14 @@ def inventory_akcp_sensor(info, default_levels_name = None): yield line[0], default_levels_name -def check_akcp_sensor_relay(item, _no_params, info): +def check_akcp_sensor_drycontact(item, _no_params, info): for description, status, online in info: if description == item: # Online is set to "2" if sensor is offline if online != "1": return 2, "sensor is offline" - state, state_name = relay_states[status] + state, state_name = drycontact_states[status] return state, "State: %s" % state_name @@ -121,6 +131,17 @@ def check_akcp_sensor_humidity(item, params, info): return 0, infotext, perfdata +def check_akcp_sensor_relay(item, _no_params, info): + for description, status, online in info: + if description == item: + # Online is set to "2" if sensor is offline + if online != "1": + return 2, "sensor is offline" + + state, state_name = relay_states[status] + return state, "State: %s" % state_name + + def check_akcp_sensor_temperature(item, params, info): for description, degree, unit, status, \ low_crit, low_warn, high_warn, high_crit, \

9 years, 4 months

Check_MK Git: check_mk: fixed typo: mbg lantime_nb_state to mbg_lantime_ng_state

by Lutz Helwing

Module: check_mk Branch: master Commit: 924957cf6a5410e2704abe5170665176e270e5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=924957cf6a5410… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Thu Feb 19 11:47:55 2015 +0100 fixed typo: mbg lantime_nb_state to mbg_lantime_ng_state --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index bc972ac..83c5085 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -397,7 +397,7 @@ check_metrics["check_mk-vms_cpu"] = { "wait" : { " check_metrics["check_mk-vms_sys.util"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec -check_metrics["check_mk-mbg_lantime_nb_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec +check_metrics["check_mk-mbg_lantime_ng_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec check_metrics["check_mk-systemtime"] = { "offset" : { "name" : "time_offset" }} check_metrics["check_mk-adva_fsp_if"] = { "output_power" : { "name" : "output_signal_power_dbm" },

9 years, 4 months

Check_MK Git: check_mk: Conflicts:

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a9c5c0d976f374e1da279e267e73a6d44076258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a9c5c0d976f37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 19 11:19:11 2015 +0100 Conflicts: ChangeLog checks/checkpoint_connections checks/checkpoint_packets --- .werks/1997 | 10 ++++++++++ ChangeLog | 1 + checks/checkpoint.include | 36 ++++++++++++++++++++++++++++++++++++ checks/checkpoint_connections | 7 ++----- checks/checkpoint_packets | 7 ++----- 5 files changed, 51 insertions(+), 10 deletions(-) diff --git a/.werks/1997 b/.werks/1997 new file mode 100644 index 0000000..4f5560b --- /dev/null +++ b/.werks/1997 @@ -0,0 +1,10 @@ +Title: checkpoint_connections, checkpoint_packets: Detect more recent devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424341014 + + diff --git a/ChangeLog b/ChangeLog index e9ec13e..1b0ab01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 1993 FIX: solaris_multipath: Fix detection of expected number of paths * 1944 FIX: hr_mem: no longer reports incorrect memory values when cached memory values are broken... * 1994 FIX: lparstat: Support new AIX version with two new columns nsp and utctc + * 1997 FIX: checkpoint_connections, checkpoint_packets: Detect more recent devices Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/checkpoint.include b/checks/checkpoint.include new file mode 100644 index 0000000..6fd1e6e --- /dev/null +++ b/checks/checkpoint.include @@ -0,0 +1,36 @@ +#!/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. + + +def scan_checkpoint(oid): + return ( + # Entry in sysDescr, varies a bit + oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or + oid(".1.3.6.1.2.1.1.1.0").startswith("IPSO ") or + (oid(".1.3.6.1.2.1.1.1.0").startswith("Linux") and "cpx" in + oid(".1.3.6.1.2.1.1.1.0"))) \ + and \ + oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall') diff --git a/checks/checkpoint_connections b/checks/checkpoint_connections index 3aa8ae1..a010013 100644 --- a/checks/checkpoint_connections +++ b/checks/checkpoint_connections @@ -54,11 +54,8 @@ check_info["checkpoint_connections"] = { "service_description" : "Connections", "has_perfdata" : True, "group" : "checkpoint_connections", - # detect a checkpoint kernel - "snmp_scan_function" : lambda oid: (oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or \ - "IPSO" in oid(".1.3.6.1.2.1.1.1.0")) \ - and oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall'), - # checkpoint.products.fw.fwPolicyStat.fwNumConn + "snmp_scan_function" : scan_checkpoint, "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1.25", [ 3 ]), + "includes" : [ "checkpoint.include" ], } diff --git a/checks/checkpoint_packets b/checks/checkpoint_packets index 1578ed6..73e9dad 100644 --- a/checks/checkpoint_packets +++ b/checks/checkpoint_packets @@ -70,17 +70,14 @@ check_info["checkpoint_packets"] = { "service_description" : "Packet Statistics", "has_perfdata" : True, "group" : "checkpoint_packets", + "snmp_scan_function" : scan_checkpoint, "default_levels_variable" : "checkpoint_packets_default_levels", - # detect a checkpoint kernel - "snmp_scan_function" : lambda oid: (oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or\ - "IPSO" in oid(".1.3.6.1.2.1.1.1.0")) \ - and oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall'), - # checkpoint.products.fw.fwPolicyStat.fwNumConn "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1", [ 4, # fwAccepted 5, # fwRejected 6, # fwDropped 7, # fwLogged ]), + "includes" : [ "checkpoint.include" ], }

9 years, 4 months

Check_MK Git: check_mk: #1945 FIX doc/treasures/downtime script: was no longer working because of latest changes in the GUI

by Andreas Boesl

Module: check_mk Branch: master Commit: 6dcae0f06a6de54a9f55ef9afe38609d1b9e2877 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dcae0f06a6de5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 19 10:33:19 2015 +0100 #1945 FIX doc/treasures/downtime script: was no longer working because of latest changes in the GUI --- .werks/1945 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/downtime | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1945 b/.werks/1945 new file mode 100644 index 0000000..278a1f7 --- /dev/null +++ b/.werks/1945 @@ -0,0 +1,10 @@ +Title: doc/treasures/downtime script: was no longer working because of latest changes in the GUI +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1424337912 +Class: fix + +This little helper script used the wrong multisite filter elements. +Some of them have been renamed, e.g. from host to host_regex. diff --git a/ChangeLog b/ChangeLog index 2502a5b..e9ec13e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -204,6 +204,7 @@ * 1983 FIX: Fixed special case in language configuration via user profile... * 1984 FIX: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload... * 1985 FIX: PNP graph dashlet handles graphs in distributed setups correctly... + * 1945 FIX: doc/treasures/downtime script: was no longer working because of latest changes in the GUI... WATO: * 1760 Added search form to manual checks page diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 8374419..262994d 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -154,19 +154,20 @@ variables = [ ( "_transid", "-1" ), ( "_do_confirm", "yes" ), ( "_do_actions", "yes" ), - ( "host", arg_host ), ] if opt_mode == 'remove': variables += [ ("view_name", "downtimes"), ("_remove_downtimes", "Remove"), + ("host_regex", arg_host + "$" ), ] else: variables += [ ( "_down_from_now", "yes" ), ( "_down_minutes", opt_duration ), ( "_down_comment", opt_comment ), + ("host", arg_host ), ] if arg_services: variables.append(("view_name", "service")) @@ -192,7 +193,10 @@ def set_downtime(variables, add_vars): if arg_services: for service in arg_services: - set_downtime(variables, [("service", service + "$")]) + if opt_mode == "remove": + set_downtime(variables, [("service_regex", service + "$")]) + else: + set_downtime(variables, [("service", service)]) else: set_downtime(variables, []) if opt_all:

9 years, 4 months

Check_MK Git: check_mk: Fixed some English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 8240bcf0c8ab4268dcf45116722ce0d8f05f5048 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8240bcf0c8ab42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 19 10:11:22 2015 +0100 Fixed some English texts Conflicts: web/plugins/wato/check_mk_configuration.py --- web/htdocs/dashboard.py | 2 +- web/htdocs/wato.py | 12 ++++++------ web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 ++++---- web/plugins/wato/check_parameters.py | 7 +++---- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2a0ba54..8a5aed9 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -933,7 +933,7 @@ def page_edit_dashlet(): html.end_context_buttons() vs_general = Dictionary( - title = _('General'), + title = _('General Settings'), render = 'form', optional_keys = ['title', 'title_url'], elements = [ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cc4bac1..d20c9ba 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3870,7 +3870,7 @@ def mode_bulk_inventory(phase): if not complete_folder: html.write(_("You have selected %d hosts for bulk discovery. ") % len(hostnames)) html.write(_("Check_MK service discovery will automatically find and configure " - "services to be checked on your hosts.")) + "services to be checked on your hosts.")) forms.header(_("Bulk discovery")) forms.section(_("Mode")) html.radiobutton("how", "new", True, _("Find only new services") + " ") @@ -6830,12 +6830,12 @@ def mode_snapshot(phase): status.get("broken_text")) elif not status.get("checksums") and not config.wato_upload_insecure_snapshots: if status["type"] == "legacy": - raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified. ' + raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified. ' 'You are restoring a legacy snapshot which can not be verified. The snapshot contains ' - 'files which contain code that will be executed during runtime of the monitoring. ' + 'files which contain code that will be executed during runtime of the monitoring. ' 'The upload of insecure snapshots is currently disabled in WATO. If you want to allow ' - 'the upload of insecure snapshots you can activate it in the Global Settings under ' - '<tt>Configuration GUI (WATO) -> Allow upload of insecure WATO snapshots</tt>')) + 'the upload of insecure snapshots you can activate it in the Global Settings under ' + 'Configuration GUI (WATO) -> Allow upload of insecure WATO snapshots')) else: raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified. ' 'If you restore a snapshot on the same site as where it was created, the checksum should ' @@ -6945,7 +6945,7 @@ def mode_snapshot(phase): html.write("<h3>" + _("Restore from uploaded file") + "</h3>") html.write(_("Only supports snapshots up to 100MB. If your snapshot is larger than 100MB please copy it into the sites " - "backup directory <tt>%s/wato/snapshots</tt>. It will then show up in the snapshots table. ") % defaults.var_dir) + "backup directory <tt>%s/wato/snapshots</tt>. It will then show up in the snapshots table.") % defaults.var_dir) html.begin_form("upload_form", method = "POST") html.upload_file("_upload_file") html.button("upload_button", _("Restore from file"), "submit") diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 213f2d2..dc126e6 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1668,7 +1668,7 @@ register_rule(group, )), ] + mail_receiving_params + [ ('mail_from', EmailAddress( - title = _('Sender email address'), + title = _('From: email address'), )), ('mail_to', EmailAddress( title = _('Destination email address'), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6ab4429..1e3f1c9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1315,7 +1315,7 @@ register_configvar(group, label = _("Automatically schedule service discovery check after service configuration changes"), help = _("When this option is enabled then after each change of the service " "configuration of a host via WATO - may it be via manual changes or a bulk " - "discovry - the service discovery check is automatically rescheduled in order " + "discovery - the service discovery check is automatically rescheduled in order " "to reflect the new service state correctly immediately."), default_value = True, )) @@ -2485,9 +2485,9 @@ register_rule(group, Transform( CascadingDropdown( title = _("Check for correct version of Check_MK agent"), - help = _("If you want to make sure all of your Check_MK agents are running" - " one specific version, you may set it by this rule. Agents running " - " some different version return a none ok state then"), + help = _("Here you can make sure that all of your Check_MK agents are running" + " one specific version. Agents running " + " a different version return a non-OK state."), choices = [ ("ignore", _("Ignore the version")), ("site", _("Same version as the monitoring site")), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0a6fc6b..3cf1574 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1586,7 +1586,7 @@ register_check_parameters( Dictionary( elements = [ ( "power", Tuple( - title = _("Power"), + title = _("Transmit Power"), help = _("The operational transmit power"), elements = [ Float(title = _("warning at or below"), unit = "dBmV", default_value = 5.0 ), @@ -1626,8 +1626,8 @@ register_check_parameters( default_value = [ 1, 2, 13 ], )), ( "tx_power", Tuple( - title = _("Power"), - help = _(" The operational transmit power"), + title = _("Transmit Power"), + help = _("The operational transmit power"), elements = [ Float(title = _("warning at"), unit = "dBmV", default_value = 20.0 ), Float(title = _("critical at"), unit = "dBmV", default_value = 10.0 ), @@ -2013,7 +2013,6 @@ register_check_parameters( ( 'levels', Tuple( title = _("Maximum Number of E-Mails in Queue"), - help = _("This rule applies to the number of e-mails in the various Exchange Message Queues"), elements = [ Integer(title = _("Warning at"), unit = _("E-Mails")), Integer(title = _("Critical at"), unit = _("E-Mails"))

9 years, 4 months

Check_MK Git: check_mk: Fixed small styling issue

by Lars Michelsen

Module: check_mk Branch: master Commit: b4765a260fa40286bf035502983fb71ca661f7b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4765a260fa402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 19 09:06:26 2015 +0100 Fixed small styling issue --- web/htdocs/status.css | 3 +++ web/htdocs/visuals.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 0db8c1a..08ce0db 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -310,6 +310,9 @@ table.data td.buttons { width: 1%; } +table.data td.buttons.visuals { + width: 75px; +} table.data td.count { text-align: right; font-weight: bold; diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 0d33ab8..6c8ea63 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -302,7 +302,7 @@ def page_list(what, title, visuals, custom_columns = [], table.row(css = 'data') # Actions - table.cell(_('Actions'), css = 'buttons') + table.cell(_('Actions'), css = 'buttons visuals') # Edit if owner == config.user_id:

9 years, 4 months

Check_MK Git: check_mk: #1996 kernel.util: Also output values for steal and guest (no PNP template yet)

by Mathias Kettner

Module: check_mk Branch: master Commit: c1da0948f2ee7a74853e13643959c1d166f270ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1da0948f2ee7a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 17:07:33 2015 +0100 #1996 kernel.util: Also output values for steal and guest (no PNP template yet) --- .werks/1996 | 9 +++++++++ ChangeLog | 1 + checks/cpu_util.include | 22 +++++++++++++++++++++- checks/kernel | 9 ++++++--- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/.werks/1996 b/.werks/1996 new file mode 100644 index 0000000..a417cd9 --- /dev/null +++ b/.werks/1996 @@ -0,0 +1,9 @@ +Title: kernel.util: Also output values for steal and guest (no PNP template yet) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424275634 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 89715af..2502a5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 1939 check_ftp: changed service description if the ftp port differs from 21... NOTE: Please refer to the migration notes! * 1992 df: Show usages near to zero with a higher precision - not simply as 0.00 + * 1996 kernel.util: Also output values for steal and guest (no PNP template yet) * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/cpu_util.include b/checks/cpu_util.include index f744897..5aa4f98 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -87,6 +87,8 @@ def check_cpu_util(util, params, this_time = None): # - 5 - irq: servicing interrupts # - 6 - softirq: servicing softirqs # - 7 - steal: involuntary wait +# - 8 - guest: time spent in guest OK +# - 9 - guest_nice: time spent in niced guest OK def check_cpu_util_unix(values, params): this_time = int(time.time()) # Compute jiffi-differences of all relevant counters @@ -127,8 +129,26 @@ def check_cpu_util_unix(values, params): state = 1 yield state, "wait: %.1f%%" % (wait_perc) + # Compute values used in virtualized environments (Xen, etc.) + # Only do this for counters that have counted at least one tick + # since the system boot. This avoids silly output in systems + # where these counters are not being used + if len(values) >= 8: # and values[7]: + steal = diff_values[7] + steal_perc = 100.0 * float(steal) / float(sum_jiffies) + yield 0, "steal: %.1f%%" % steal_perc, [ ("steal", steal_perc) ] + else: + steal_perc = 0 + + if len(values) >= 10: # and (values[8] or values[9]): + guest = diff_values[8] + diff_values[9] + guest_perc = 100.0 * float(guest) / float(sum_jiffies) + yield 0, "guest: %.1f%%" % guest_perc, [ ("guest", guest_perc) ] + else: + guest_perc = 0 + # Total utilization - util_total_perc = user_perc + system_perc + wait_perc + util_total_perc = user_perc + system_perc + wait_perc + steal_perc + guest_perc state = 0 levelstext = "" if "util" in params: diff --git a/checks/kernel b/checks/kernel index a160409..9305bc9 100644 --- a/checks/kernel +++ b/checks/kernel @@ -120,9 +120,12 @@ def inventory_cpu_utilization(info): # - iowait: waiting for I/O to complete # - irq: servicing interrupts # - softirq: servicing softirqs -# - steal: involuntary wait -def kernel_check_cpu_utilization(item, params, info): +# - steal: Stolen time, which is the time spent in other operating systems +# when running in a virtualized environment (since Linux 2.6.11) +# - guest: Time spent running a virtual CPU for guest operating systems (since Linux 2.6.24) +# - guest_nice: Time spent running a niced guest (since Linux 2.6.33) +def kernel_check_cpu_utilization(item, params, info): # Convert old style tuple-parameter to new dict if type(params) != dict: params = { "iowait": params } @@ -139,7 +142,7 @@ def kernel_check_cpu_utilization(item, params, info): # line contains now the following columns: # 'cpu' user nice system idle wait hw-int sw-int (steal ...) # convert number to int - values = [ int(x) for x in line[1:8] ] + values = [ int(x) for x in line[1:] ] return check_cpu_util_unix(values, params) check_info["kernel.util"] = {

9 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015