Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4531 FIX oracle_tablespaces: Added missing info for better analysis

by Simon Betz

Module: check_mk Branch: master Commit: e2ec69890f112d272e1aa8e0d35ef62c3fb10dce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ec69890f112d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 28 13:12:45 2017 +0200 4531 FIX oracle_tablespaces: Added missing info for better analysis Change-Id: I05336539580bd80ab5c8ff036d0461ecb37eeb8d --- .werks/4531 | 11 +++++++++++ checks/oracle_tablespaces | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4531 b/.werks/4531 new file mode 100644 index 0000000..6ed15b6 --- /dev/null +++ b/.werks/4531 @@ -0,0 +1,11 @@ +Title: oracle_tablespaces: Added missing info for better analysis +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490699441 + + diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index c0ee1b5..93ab8d4 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -299,11 +299,12 @@ def check_oracle_tablespaces(item, params, parsed): max_size += df_size free_space += df_free_space - infotexts = ["%s (%s), Size: %s, %s used (%s of max. %s)" % \ + infotexts = ["%s (%s), Size: %s, %s used (%s of max. %s), Free: %s" % \ (ts_status, ts_type, get_bytes_human_readable(current_size), get_percent_human_readable(100.0 * used_size / max_size), get_bytes_human_readable(used_size), - get_bytes_human_readable(max_size))] + get_bytes_human_readable(max_size), + get_bytes_human_readable(free_space))] if num_extensible > 0 and db_version <= 10: # only display the number of remaining extents in Databases <= 10g @@ -361,6 +362,8 @@ def check_oracle_tablespaces(item, params, parsed): this_state = attrs["state"] yield this_state, "Datafiles %s: %s" % (file_online_state, ", ".join(attrs["sids"])) + yield 0, "DB Version: %s" % db_version + # If something changes adapt calculations in related inventory plugin check_info['oracle_tablespaces'] = {

7 years, 3 months

Upgrade Werk #3971

by Mathias Kettner

Module: check_mk Branch: master Commit: 5be32edc5c08f244ee848111cfa874185250f6cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be32edc5c08f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 28 12:41:39 2017 +0200 Upgrade Werk #3971 Change-Id: I593fa72ee39721ae787de5e847da0518bfda0351 --- .werks/3971 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3971 b/.werks/3971 index 35ecb18..001994b 100644 --- a/.werks/3971 +++ b/.werks/3971 @@ -1,5 +1,5 @@ Title: Event numbers are now also displayed in tactical overview snapin -Level: 1 +Level: 2 Component: ec Compatible: compat Version: 1.4.0i2

7 years, 3 months

Removed yet another global variable.

by Sven Panne

Module: check_mk Branch: master Commit: e546de6c050374f1c9c45a2de5f2cfd86f374270 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e546de6c050374… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 28 11:39:02 2017 +0200 Removed yet another global variable. Change-Id: Ib9318bfd5dae6ab3659c18550625c57909eec208 --- livestatus/src/Logfile.cc | 9 +++------ livestatus/src/MonitoringCore.h | 1 + livestatus/src/module.cc | 10 +++++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f100180..7fa549c 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -51,8 +51,6 @@ using std::make_unique; using std::string; using std::vector; -extern unsigned long g_max_lines_per_logfile; - Logfile::Logfile(MonitoringCore *mc, fs::path path, bool watch) : _mc(mc) , _path(std::move(path)) @@ -159,10 +157,9 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { vector<char> linebuffer(65536); while (fgets(&linebuffer[0], linebuffer.size(), file) != nullptr) { - if (_lineno >= g_max_lines_per_logfile) { - Error(logger()) << "more than " << g_max_lines_per_logfile - << " lines in " << this->_path - << ", ignoring the rest!"; + if (_lineno >= _mc->maxLinesPerLogFile()) { + Error(logger()) << "more than " << _mc->maxLinesPerLogFile() + << " lines in " << _path << ", ignoring the rest!"; return; } _lineno++; diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 1f4210e..1c2bdbc 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -68,6 +68,7 @@ public: Contact *contact) = 0; virtual std::chrono::system_clock::time_point last_logfile_rotation() = 0; + virtual uint32_t maxLinesPerLogFile() const = 0; virtual Command find_command(std::string name) const = 0; virtual std::vector<Command> commands() const = 0; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 8f2af50..26292b5 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -120,7 +120,7 @@ static vector<ThreadInfo> fl_thread_info; static thread_local ThreadInfo *tl_info; unsigned long g_max_cached_messages = 500000; // do never read more than that number of lines from a logfile -unsigned long g_max_lines_per_logfile = 1000000; +static uint32_t fl_max_lines_per_logfile = 1000000; unsigned long g_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB int g_thread_running = 0; AuthorizationKind g_service_authorization = AuthorizationKind::loose; @@ -610,6 +610,10 @@ public: return {"", ""}; } + uint32_t maxLinesPerLogFile() const override { + return fl_max_lines_per_logfile; + } + vector<Command> commands() const override { extern command *command_list; vector<Command> commands; @@ -906,10 +910,10 @@ void livestatus_parse_arguments(const char *args_orig) { << "setting max number of cached log messages to " << g_max_cached_messages; } else if (strcmp(left, "max_lines_per_logfile") == 0) { - g_max_lines_per_logfile = strtoul(right, nullptr, 10); + fl_max_lines_per_logfile = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting max number lines per logfile to " - << g_max_lines_per_logfile; + << fl_max_lines_per_logfile; } else if (strcmp(left, "thread_stack_size") == 0) { g_thread_stack_size = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting size of thread stacks to "

7 years, 3 months

Removed debug message in availability.

by Roland Halbig

Module: check_mk Branch: master Commit: fac982ec97a316598bc03a8b391612e1108dfb4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fac982ec97a316… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Mar 28 09:58:05 2017 +0200 Removed debug message in availability. Change-Id: Icd5abf3c3214e13bc0074eca124a4fe24006621d --- web/plugins/views/availability.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 31ae65f..b41934a 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -609,8 +609,6 @@ def render_bi_availability(title, aggr_rows): timewarpcode = html.drain() - html.write_text("LOL%sLOL" % type(htmlcode)) - # Note: 'spans_by_object' returns two arguments which are used by # all availability views but not by BI. There we have to take # only complete aggregations

7 years, 3 months

4530 FIX lnx_distro: Fixed missing distribution if eg. Oracle and Redhat release files are available

by Simon Betz

Module: check_mk Branch: master Commit: 6c41dd0f6935b81443a90648f4df0742241d6b0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c41dd0f6935b8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 28 09:12:09 2017 +0200 4530 FIX lnx_distro: Fixed missing distribution if eg. Oracle and Redhat release files are available Change-Id: Ibfd639a1004e1f72df68a09d31446db103b30e83 --- .werks/4530 | 11 +++++++++++ agents/plugins/mk_inventory.linux | 3 ++- inventory/lnx_distro | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/4530 b/.werks/4530 new file mode 100644 index 0000000..feb73e3 --- /dev/null +++ b/.werks/4530 @@ -0,0 +1,11 @@ +Title: lnx_distro: Fixed missing distribution if eg. Oracle and Redhat release files are available +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490684986 + + diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 6c22dde..1dca0c8 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -52,9 +52,10 @@ then # Information about distribution echo "<<<lnx_distro:sep(124):persist($UNTIL)>>>" - for f in {/etc/{debian_version,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do + for f in {/etc/{oracle-release,debian_version,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do if [ -e $f ] ; then echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo + break fi done diff --git a/inventory/lnx_distro b/inventory/lnx_distro index 0a683d5..df5e7d6 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -40,6 +40,9 @@ # <<<lnx_distro:sep(124):persist(1399310551)>>> # /etc/SuSE-release|SUSE Linux Enterprise Server 11 (x86_64)|VERSION = 11|PATCHLEVEL = 2 +# <<<lnx_distro:sep(124):persist(1490598851)>>> +# /etc/oracle-release|Oracle LinuxServer release 7.1 + def inv_lnx_distro(info): node = inv_tree("software.os.") @@ -57,6 +60,8 @@ def inv_lnx_distro(info): inv_lnx_parse_suse_release(node, line[1:]) elif line[0] == '/usr/share/cma/version': inv_lnx_parse_cma(node, line[1]) + elif line[0] == '/etc/oracle-release': + inv_lnx_parse_oracle_vm_server_release(node, line[1]) def inv_lnx_parse_suse_release(node, line):

7 years, 3 months

4547 FIX check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS

by Marcel Arentz

Module: check_mk Branch: master Commit: f46f1d73e0b68ab3bfc466705cf0b6ead88712d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f46f1d73e0b68a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 22 17:24:16 2017 +0100 4547 FIX check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS The section postfix_mailq_status was writing into utmp everytime the agent run. With the new version we are able to avoid this behaviour and still get informations about multiple instances of postfix. Change-Id: I31961f6879cb2f04a7760bc7ccb209342f4e6b96 --- .werks/4547 | 15 +++++++++++++++ agents/check_mk_agent.linux | 26 +++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.werks/4547 b/.werks/4547 new file mode 100644 index 0000000..094c9bb --- /dev/null +++ b/.werks/4547 @@ -0,0 +1,15 @@ +Title: check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490199589 +Class: fix + +The section postfix_mailq_status was writing into utmp everytime the agent +run. With the new version we are able to avoid this behaviour and still get +informations about multiple instances of postfix. + +This fix needs an updated agent AND an updated checkplugin but a rediscovery +is not neccessary. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4e1ec35..80c5413 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -684,28 +684,24 @@ elif [ -x /usr/sbin/ssmtp ] ; then fi -# postfix would write to stderr but only if it's a tty -# Another quirk: output would be strayed if not stored -# in extra variable +# Postfix status monitoring. Can handle multiple instances. if type postfix >/dev/null ; then echo "<<<postfix_mailq_status:sep(58)>>>" - multi_instances_dirs=$(postconf -c /etc/postfix 2>/dev/null | grep ^multi_instance_directories | sed 's/.*=[[:space:]]*//g') - if [ ! -z "$multi_instances_dirs" ]; then - for queue_dir in $multi_instances_dirs + for i in $(ls -d /var/spool/postfix*) do - if [ -n "$queue_dir" ]; then - postfix_out=$(script -qfc "postfix -c $queue_dir status" /dev/null) - echo $postfix_out + if [ -e "$i/pid/master.pid" ]; then + postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output + if [[ $(readlink -- /proc/$postfix_pid/exe) == *"postfix/master"* ]]; then + echo "$i:is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' + else + echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g' + fi + else + echo "$i:not running" | sed 's/\/var\/spool\///g' fi done - - else - postfix_out=$(script -qfc 'postfix status' /dev/null) - echo $postfix_out - fi fi - # Check status of qmail mailqueue if type qmail-qstat >/dev/null then

7 years, 3 months

Remove duplicate code

by Konstantin Büttner

Module: check_mk Branch: master Commit: c153b1001982003c2d03715a29c651dd147f7eca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c153b100198200… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 17:12:11 2017 +0200 Remove duplicate code Change-Id: I489a9a40358a30ca6ef33bb2da246f7073297e31 --- web/plugins/wato/check_parameters.py | 138 ----------------------------------- 1 file changed, 138 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 611d5fd..bd08bf8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4746,88 +4746,6 @@ register_check_parameters( match_type = "first", ) -def windows_printer_queues_forth(old): - default = { - "levels" : (None, None), - "warn_states" : [ 8, 11 ], - "crit_states" : [ 9, 10 ], - } - if type(old) == tuple: - default['levels'] = old - if type(old) == dict: - return old - return default - -register_check_parameters( - subgroup_printing, - "windows_printer_queues", - _("Number of open jobs of a printer on windows" ), - Transform( - Dictionary( - title = _("Windows Printer Configuration"), - elements = [ - ( "levels", - Tuple( - title = _("Levels for the number of print jobs"), - help = _("This rule is applied to the number of print jobs " - "currently waiting in windows printer queue."), - elements = [ - Integer(title = _("Warning at"), unit = _("jobs"), default_value = 40), - Integer(title = _("Critical at"), unit = _("jobs"), default_value = 60), - ] - ), - ), - ("crit_states", - ListChoice( - title = _("States who should lead to critical"), - choices = [ - ( 0, "Unkown"), - ( 1, "Other"), - ( 2, "No Error"), - ( 3, "Low Paper"), - ( 4, "No Paper"), - ( 5, "Low Toner"), - ( 6, "No Toner"), - ( 7, "Door Open"), - ( 8, "Jammed"), - ( 9, "Offline"), - ( 10, "Service Requested"), - ( 11, "Output Bin Full"), - ], - default_value = [9, 10], - ) - ), - ("warn_states", - ListChoice( - title = _("States who should lead to warning"), - choices = [ - ( 0, "Unkown"), - ( 1, "Other"), - ( 2, "No Error"), - ( 3, "Low Paper"), - ( 4, "No Paper"), - ( 5, "Low Toner"), - ( 6, "No Toner"), - ( 7, "Door Open"), - ( 8, "Jammed"), - ( 9, "Offline"), - ( 10, "Service Requested"), - ( 11, "Output Bin Full"), - ], - default_value = [8, 11], - ) - ), - ] - ), - forth = windows_printer_queues_forth, - ), - TextAscii( - title = _("Printer Name"), - allow_empty = True - ), - match_type = "first", -) - register_check_parameters( subgroup_printing, "printer_input", @@ -7944,62 +7862,6 @@ register_check_parameters( "dict", ) -register_check_parameters( - subgroup_printing, - "printer_supply", - _("Printer cartridge levels"), - Transform( - Dictionary( - elements = [ - ( "levels", - Tuple( - title = _("Levels for remaining supply"), - elements = [ - Percentage( - title = _("Warning level for remaining"), - allow_int = True, - default_value = 20.0, - help = _("For consumable supplies, this is configured as the percentage of " - "remaining capacity. For supplies that fill up, this is configured " - "as remaining space."), - ), - Percentage( - title = _("Critical level for remaining"), - allow_int = True, - default_value = 10.0, - help = _("For consumable supplies, this is configured as the percentage of " - "remaining capacity. For supplies that fill up, this is configured " - "as remaining space."), - ), - ] - )), - ( "some_remaining", - MonitoringState( - title = _("State for some remaining"), - help = _("Some printers do not report a precise percentage but " - "just some remaining at a low fill state. Here you " - "can set the monitoring state for that situation"), - default_value = 1, - )), - ( "upturn_toner", - Checkbox( - title = _("Upturn toner levels"), - label = _("Printer sends used material instead of remaining"), - help = _("Some Printers (eg. Konica for Drum Cartdiges) returning the available" - " fuel instead of what is left. In this case it's possible" - " to upturn the levels to handle this behavior"), - )), - ] - ), - forth = transform_printer_supply, - ), - TextAscii( - title = _("cartridge specification"), - allow_empty = True - ), - match_type = "first", -) - def windows_printer_queues_forth(old): default = { "warn_states" : [ 8, 11 ],

7 years, 3 months

Remove duplicate code

by Konstantin Büttner

Module: check_mk Branch: master Commit: 062817485c2b6a9065716b4344d90541db08aaa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=062817485c2b6a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 16:48:03 2017 +0200 Remove duplicate code Change-Id: Ia675bcae6a1a333b98289550af57a35b03c5f535 --- web/plugins/wato/check_parameters.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fdcc960..611d5fd 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7944,18 +7944,6 @@ register_check_parameters( "dict", ) -def transform_printer_supply(l): - if type(l) == tuple: - if len(l) == 2: - return { "levels" : l } - else: - return { - "levels" : l[:2], - "upturn_toner" : l[2], - } - else: - return l - register_check_parameters( subgroup_printing, "printer_supply",

7 years, 3 months

4551 FIX zfs_arc_cache: Fixed metrics in html5 graphing

by Marcel Arentz

Module: check_mk Branch: master Commit: 81af9ced3bb8ace764d14ee6cbe5327e50c676f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81af9ced3bb8ac… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 27 16:25:56 2017 +0200 4551 FIX zfs_arc_cache: Fixed metrics in html5 graphing Change-Id: I4c1b4043df15ed611245689c380166e8bc4f2e87 --- .werks/4551 | 10 ++++++++++ checks/zfs_arc_cache | 8 ++++---- web/plugins/metrics/check_mk.py | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.werks/4551 b/.werks/4551 new file mode 100644 index 0000000..876dbf0 --- /dev/null +++ b/.werks/4551 @@ -0,0 +1,10 @@ +Title: zfs_arc_cache: Fixed metrics in html5 graphing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490624706 +Class: fix + + diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index bec57d0..004ffb4 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -234,7 +234,7 @@ def check_zfs_arc_cache(_no_item, _no_params, parsed): # size if "size" in parsed.keys(): - size_bytes = parsed["size"] * 1024.0 * 1024.0 + size_bytes = parsed["size"] size_readable = get_bytes_human_readable(size_bytes) yield 0, "Cache size: %s" % size_readable, \ [("size", size_bytes, '', '', 0)] @@ -246,9 +246,9 @@ def check_zfs_arc_cache(_no_item, _no_params, parsed): "arc_meta_max" in parsed.keys(): yield 0, "Arc Meta %d MB used, Limit %d MB, Max %d MB" % \ (parsed["arc_meta_used"], parsed["arc_meta_limit"], parsed["arc_meta_max"]), \ - [("arc_meta_used", parsed["arc_meta_used"] * 1024 * 1024, '', '', 0), - ("arc_meta_limit", parsed["arc_meta_limit"] * 1024 * 1024, '', '', 0), - ("arc_meta_max", parsed["arc_meta_max"] * 1024 * 1024, '', '', 0)] + [("arc_meta_used", parsed["arc_meta_used"], '', '', 0), + ("arc_meta_limit", parsed["arc_meta_limit"], '', '', 0), + ("arc_meta_max", parsed["arc_meta_max"], '', '', 0)] check_info["zfs_arc_cache"] = { diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7e62e8d..0600ec6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4549,10 +4549,10 @@ check_metrics["check_mk-docsis_channels_downstream"] = { check_metrics["check_mk-zfs_arc_cache"] = { "hit_ratio" : { "name": "cache_hit_ratio", }, - "size" : { "name": "caches", "scale" : MB }, - "arc_meta_used" : { "name": "zfs_metadata_used", "scale" : MB }, - "arc_meta_limit": { "name": "zfs_metadata_limit", "scale" : MB }, - "arc_meta_max" : { "name": "zfs_metadata_max", "scale" : MB }, + "size" : { "name": "caches", }, + "arc_meta_used" : { "name": "zfs_metadata_used",}, + "arc_meta_limit": { "name": "zfs_metadata_limit", }, + "arc_meta_max" : { "name": "zfs_metadata_max",}, } check_metrics["check_mk-zfs_arc_cache.l2"] = {

7 years, 3 months

8629 FIX win_printers: Fix broken default parameters

by Konstantin Büttner

Module: check_mk Branch: master Commit: a9b08e17be4d32205c222597468aa07240ce27fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9b08e17be4d32… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 15:50:50 2017 +0200 8629 FIX win_printers: Fix broken default parameters Change-Id: I2b59c1730712a19de76490a9476efc18131d7a12 --- .werks/8629 | 11 ++ checks/win_printers | 3 +- web/plugins/wato/check_parameters.py | 196 +++++++++++++++++++++++++++++++++++ 3 files changed, 208 insertions(+), 2 deletions(-) diff --git a/.werks/8629 b/.werks/8629 new file mode 100644 index 0000000..ba1d530 --- /dev/null +++ b/.werks/8629 @@ -0,0 +1,11 @@ +Title: win_printers: Fix broken default parameters +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490622508 + + diff --git a/checks/win_printers b/checks/win_printers index 53e0013..021005e 100644 --- a/checks/win_printers +++ b/checks/win_printers @@ -32,7 +32,6 @@ factory_settings['win_printer_default_levels'] = { - "levels" : (None, None), "warn_states" : [ 8, 11 ], "crit_states" : [ 9, 10 ], } @@ -77,7 +76,7 @@ def check_win_printers(item, params, info): params['crit_states'] = [9,10] params['warn_states'] = [8,11] else: - warn, crit = params['levels'] + warn, crit = params.get('levels', (None, None)) for line in info: name = " ".join(line[:-3]) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 40c4f59..fdcc960 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7943,6 +7943,202 @@ register_check_parameters( ), "dict", ) + +def transform_printer_supply(l): + if type(l) == tuple: + if len(l) == 2: + return { "levels" : l } + else: + return { + "levels" : l[:2], + "upturn_toner" : l[2], + } + else: + return l + +register_check_parameters( + subgroup_printing, + "printer_supply", + _("Printer cartridge levels"), + Transform( + Dictionary( + elements = [ + ( "levels", + Tuple( + title = _("Levels for remaining supply"), + elements = [ + Percentage( + title = _("Warning level for remaining"), + allow_int = True, + default_value = 20.0, + help = _("For consumable supplies, this is configured as the percentage of " + "remaining capacity. For supplies that fill up, this is configured " + "as remaining space."), + ), + Percentage( + title = _("Critical level for remaining"), + allow_int = True, + default_value = 10.0, + help = _("For consumable supplies, this is configured as the percentage of " + "remaining capacity. For supplies that fill up, this is configured " + "as remaining space."), + ), + ] + )), + ( "some_remaining", + MonitoringState( + title = _("State for some remaining"), + help = _("Some printers do not report a precise percentage but " + "just some remaining at a low fill state. Here you " + "can set the monitoring state for that situation"), + default_value = 1, + )), + ( "upturn_toner", + Checkbox( + title = _("Upturn toner levels"), + label = _("Printer sends used material instead of remaining"), + help = _("Some Printers (eg. Konica for Drum Cartdiges) returning the available" + " fuel instead of what is left. In this case it's possible" + " to upturn the levels to handle this behavior"), + )), + ] + ), + forth = transform_printer_supply, + ), + TextAscii( + title = _("cartridge specification"), + allow_empty = True + ), + match_type = "first", +) + +def windows_printer_queues_forth(old): + default = { + "warn_states" : [ 8, 11 ], + "crit_states" : [ 9, 10 ], + } + if type(old) == tuple: + default['levels'] = old + if type(old) == dict: + return old + return default + +register_check_parameters( + subgroup_printing, + "windows_printer_queues", + _("Number of open jobs of a printer on windows" ), + Transform( + Dictionary( + title = _("Windows Printer Configuration"), + elements = [ + ( "levels", + Tuple( + title = _("Levels for the number of print jobs"), + help = _("This rule is applied to the number of print jobs " + "currently waiting in windows printer queue."), + elements = [ + Integer(title = _("Warning at"), unit = _("jobs"), default_value = 40), + Integer(title = _("Critical at"), unit = _("jobs"), default_value = 60), + ] + ), + ), + ("crit_states", + ListChoice( + title = _("States who should lead to critical"), + choices = [ + ( 0, "Unkown"), + ( 1, "Other"), + ( 2, "No Error"), + ( 3, "Low Paper"), + ( 4, "No Paper"), + ( 5, "Low Toner"), + ( 6, "No Toner"), + ( 7, "Door Open"), + ( 8, "Jammed"), + ( 9, "Offline"), + ( 10, "Service Requested"), + ( 11, "Output Bin Full"), + ], + default_value = [9, 10], + ) + ), + ("warn_states", + ListChoice( + title = _("States who should lead to warning"), + choices = [ + ( 0, "Unkown"), + ( 1, "Other"), + ( 2, "No Error"), + ( 3, "Low Paper"), + ( 4, "No Paper"), + ( 5, "Low Toner"), + ( 6, "No Toner"), + ( 7, "Door Open"), + ( 8, "Jammed"), + ( 9, "Offline"), + ( 10, "Service Requested"), + ( 11, "Output Bin Full"), + ], + default_value = [8, 11], + ) + ), + ] + ), + forth = windows_printer_queues_forth, + ), + TextAscii( + title = _("Printer Name"), + allow_empty = True + ), + match_type = "first", +) + +register_check_parameters( + subgroup_printing, + "printer_input", + _("Printer Input Units"), + Dictionary( + elements = [ + ('capacity_levels', Tuple( + title = _('Capacity remaining'), + elements = [ + Percentage(title = _("Warning at"), default_value = 0.0), + Percentage(title = _("Critical at"), default_value = 0.0), + ], + )), + ], + default_keys = ['capacity_levels'], + ), + TextAscii( + title = _('Unit Name'), + allow_empty = True + ), + match_type = "dict", +) + +register_check_parameters( + subgroup_printing, + "printer_output", + _("Printer Output Units"), + Dictionary( + elements = [ + ('capacity_levels', Tuple( + title = _('Capacity filled'), + elements = [ + Percentage(title = _("Warning at"), default_value = 0.0), + Percentage(title = _("Critical at"), default_value = 0.0), + ], + )), + ], + default_keys = ['capacity_levels'], + ), + TextAscii( + title = _('Unit Name'), + allow_empty = True + ), + match_type = "dict", +) + register_check_parameters( subgroup_os, "cpu_load",

7 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017