Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Fix: pnp Template check_mk_active-http: Wrong label

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2567abf1334d85b3c17d14857377f8fa4ee44b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2567abf1334d85… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 15:05:19 2012 +0200 Fix: pnp Template check_mk_active-http: Wrong label --- pnp-templates/check_mk_active-http.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pnp-templates/check_mk_active-http.php b/pnp-templates/check_mk_active-http.php index 7e4048c..c214070 100644 --- a/pnp-templates/check_mk_active-http.php +++ b/pnp-templates/check_mk_active-http.php @@ -44,7 +44,7 @@ if ($WARN[2] != "") if ($CRIT[2] != "") $def[2] .= "HRULE:$CRIT[2]#FF0000 "; $def[2] .= "" - . "AREA:size#cc66ff:\"Response Time \" " + . "AREA:size#cc66ff:\"Size of response \" " . "LINE1:size#000000:\"\" " . "GPRINT:size:LAST:\"%3.0lf Bytes LAST \" " . "GPRINT:size:MAX:\"%3.0lf Bytes MAX \" "

11 years, 11 months

Check_MK Git: check_mk: fixed typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee90c15038d36915598ce9be8a06b11b2df70d90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee90c15038d369… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 14:46:28 2012 +0200 fixed typo --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 4cf93bf..a54857d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -575,7 +575,7 @@ register_configvar(group, register_configvar(group, "printer_supply_some_remaining_status", DropdownChoice( - title = _("Printer supply some ramaining status"), + title = _("Printer supply some remaining status"), help = _("Set the reported nagios state when the fill state " "is something between empty and small " "remaining capacity"),

11 years, 11 months

Check_MK Git: check_mk: FIX: printer_alerts, small improvment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5457fca3c986919ea478bf79bf28529a9b742898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5457fca3c98691… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 14:42:15 2012 +0200 FIX: printer_alerts, small improvment --- checks/printer_alerts | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/printer_alerts b/checks/printer_alerts index 07ece85..ae5a11c 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -93,8 +93,10 @@ def check_printer_alerts(_not_used, _not_used1, info): state = 3 # UNKNOWN if desc in printer_alerts_text_map: - sum_state = max(printer_alerts_text_map[desc], sum_state) - #sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) + state = printer_alerts_text_map[desc] + if state != 0: + sum_state = max(state, sum_state) + sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) continue code = saveint(code) @@ -123,7 +125,8 @@ def check_printer_alerts(_not_used, _not_used1, info): info_text += " (code: %d)" % code sum_txt.append(info_text) - + if len(sum_txt) == 0: + sum_txt.append("OK - No alerts found") return (sum_state, ', '.join(sum_txt)) check_info['printer_alerts'] = (check_printer_alerts, "Alerts", 0, inventory_printer_alerts)

11 years, 11 months

Check_MK Git: check_mk: FIX: printer_alerts, printer_alerts_text_map wasn' t clean integrated

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 029fd82394cca3c57ea14ee37baeccd10cc8295f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=029fd82394cca3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 14:33:33 2012 +0200 FIX: printer_alerts, printer_alerts_text_map wasn't clean integrated --- checks/printer_alerts | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/checks/printer_alerts b/checks/printer_alerts index 486eb05..07ece85 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -93,9 +93,10 @@ def check_printer_alerts(_not_used, _not_used1, info): state = 3 # UNKNOWN if desc in printer_alerts_text_map: - state = printer_alerts_text_map[desc] - sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) - break + sum_state = max(printer_alerts_text_map[desc], sum_state) + #sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) + continue + code = saveint(code) for s in [ 2, 1, 0 ]: if code in printer_alerts_state_map[s]: @@ -111,11 +112,11 @@ def check_printer_alerts(_not_used, _not_used1, info): group_txt += ' #%s' % group_index if state == 2: - sum_state = 2 + sum_state = max(2, sum_state) elif state == 3 and sum_state != 2: - sum_state = 3 + sum_state = max(3, sum_state) elif state > sum_state: - sum_state = state + sum_state = max(state, sum_state) info_text = '%s - %s - %s' % (nagios_state_names[state], group_txt, desc) if state == 3 and code != -1:

11 years, 11 months

Check_MK Git: check_mk: removed unused var in win_dhcp_pools

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b2f5864c79dafa4891257ee845ec1094360c408e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2f5864c79dafa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 13:08:23 2012 +0200 removed unused var in win_dhcp_pools --- checks/win_dhcp_pools | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index d85a45e..a956422 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -63,8 +63,6 @@ win_dhcp_pools_default_levels = (10, 5) win_dhcp_pools_inventorize_empty = False -check_config_variables += [ "win_dhcp_pools_inventorize_empty"] - win_dhcp_pools_stats_translate = { 'Entdeckungen': 'Discovers', 'Angebote': 'Offers',

11 years, 11 months

Check_MK Git: check_mk: Added option to win_dhcp_pool to prevent inventorization of empty pools

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7187a1738b9334b6314ec3bb99353a5bd21e59a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7187a1738b933… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 13:03:55 2012 +0200 Added option to win_dhcp_pool to prevent inventorization of empty pools --- checkman/win_dhcp_pools | 2 ++ checks/win_dhcp_pools | 24 +++++++++++++++++++++++- web/plugins/wato/check_mk_configuration.py | 10 ++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/checkman/win_dhcp_pools b/checkman/win_dhcp_pools index a0f4e83..f040ac1 100644 --- a/checkman/win_dhcp_pools +++ b/checkman/win_dhcp_pools @@ -36,3 +36,5 @@ critical (int): Percentage of free leases to be left in the pool to issue a crit win_dhcp_pools_default_levels (float, float): The global default levels for all checks of this type. This is preset to {(10, 5)} (which means that the check gets critical if the pool has less than 5 percent of free leases left). +win_dhcp_pools_inventorize_empty (bool): Set to {True} if you want to inventorize + pools without any IP Address in it. diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 1da4c77..d85a45e 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -61,6 +61,9 @@ # No. of pending offers = 0. win_dhcp_pools_default_levels = (10, 5) +win_dhcp_pools_inventorize_empty = False + +check_config_variables += [ "win_dhcp_pools_inventorize_empty"] win_dhcp_pools_stats_translate = { 'Entdeckungen': 'Discovers', @@ -82,9 +85,28 @@ def parse_win_dhcp_pools(info): def inventory_win_dhcp_pools(info): inventory = [] + if win_dhcp_pools_inventorize_empty == True: + for line in parse_win_dhcp_pools(info): + if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet': + inventory.append((line[1], 'win_dhcp_pools_default_levels')) + return inventory + + inBlock = False + last_pool = "" + poolStats = [] for line in parse_win_dhcp_pools(info): if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet': - inventory.append((line[1], 'win_dhcp_pools_default_levels')) + inBlock = True + last_pool = line[1] + continue + if inBlock: + poolStats.append(saveint(line[1])) + if len(poolStats) == 3: + inBlock = False + used, free, pending = poolStats + size = used + free + pending + if size > 0: + inventory.append((last_pool, 'win_dhcp_pools_default_levels')) return inventory def check_win_dhcp_pools(item, params, info): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 09bda23..4cf93bf 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -563,6 +563,16 @@ register_configvar(group, ) register_configvar(group, + "win_dhcp_pools_inventorize_empty", + Checkbox( + title = _("Invetorize empty windows dhcp pools"), + help = _("You can activate the inventorization of " + "dhcp pools, which have no ip addresses in it"), + ), + need_restart = True + ) + +register_configvar(group, "printer_supply_some_remaining_status", DropdownChoice( title = _("Printer supply some ramaining status"),

11 years, 11 months

Check_MK Git: check_mk: Fix: position of an host rule in wato

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6298d7b1119c65b530a694eb79d25ef37eade65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6298d7b1119c6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 12:33:21 2012 +0200 Fix: position of an host rule in wato --- web/plugins/wato/check_mk_configuration.py | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d3749d2..09bda23 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -773,6 +773,16 @@ register_rule(group, "the state of the host will stay at its last status.")), ) +register_rule(group, + "extra_host_conf:check_command", + TextAscii( + label = _("Command:"), + title = _("Check Command for Hosts Check"), + help = _("This parameter changes the default check_command for " + "a host check"), + ), + ) + group = "monconf/" + _("Notifications") register_rule(group, "extra_host_conf:notifications_enabled", @@ -910,15 +920,6 @@ register_rule(group, ), itemtype = "service") -register_rule(group, - "extra_host_conf:check_command", - TextAscii( - label = _("Command:"), - title = _("Check Command for Hosts Check"), - help = _("This parameter changes the default check_command for " - "a host check"), - ), - ) register_rule(group, "extra_service_conf:notes_url",

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1e681b6c5f940c90d18bd382c38eaf9f6647ade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e681b6c5f940… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 12:23:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Fix: new rule to change the output of logwatch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7cb2859a60b1e52a7a411160fe28303f52765505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb2859a60b1e5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 12:23:32 2012 +0200 Fix: new rule to change the output of logwatch --- checkman/logwatch | 5 +++-- web/plugins/wato/check_mk_configuration.py | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/checkman/logwatch b/checkman/logwatch index da4d90c..153c6bc 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -88,5 +88,6 @@ logwatch_dir (string): Directory where log messages are replaced by backslashes. logwatch_service_output (string): Change the output of the service to ony - print stats and not the last error message. Default is {default}, use {small} if - you only want to have the stats. + show the count of events whitout the last error message. Default is {default} which + shows the last error message and the count, use {count} if + you only want to see the count. diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f71b035..d3749d2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -549,15 +549,17 @@ register_configvar(group, register_configvar(group, "logwatch_service_output", DropdownChoice( - title = _("Service output of Logwatch"), - help = _("You can change the output of the logwatch service " - "between an view with oh"), + title = _("Service output for logwatch"), + help = _("You can change the plugin output of logwatch " + "to show only the count of messages or also " + "to show the last worst message"), choices = [ - ( 'default' , _("Output last log message in service output") ), - ( 'small', _("Only print stats in service output")), + ( 'default' , _("Show count and last message") ), + ( 'count', _("Show only count")), ], default_value = 'default', ), + need_restart = True ) register_configvar(group,

11 years, 11 months

Check_MK Git: check_mk: FIX: BI: Assuming "OK" for hosts is now possible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9ac411584132f5b87d89c58b2f2d4519884a1ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9ac411584132f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 1 11:29:35 2012 +0200 FIX: BI: Assuming "OK" for hosts is now possible --- .bugs/779 | 7 +++++-- ChangeLog | 1 + web/htdocs/js/bi.js | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.bugs/779 b/.bugs/779 index e6dd858..c37ddfb 100644 --- a/.bugs/779 +++ b/.bugs/779 @@ -1,9 +1,12 @@ Title: BI cannot assume UP host state Component: bi -State: open +Class: bug +State: done Date: 2012-06-26 17:54:41 Targetversion: 1.2.0 -Class: bug You can assume OK as service state but not UP as host state (just DOWN and UNREACH). + +2012-10-01 11:29:28: changed state open -> done +Has just been fixed. diff --git a/ChangeLog b/ChangeLog index db3f7e0..b879144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ 1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice + * FIX: BI: Assuming "OK" for hosts is now possible WATO * Added "profile" option to be configurable via browser diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 345001a..334de7e 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -87,14 +87,16 @@ function toggle_assumption(oImg, site, host, service) current = current.substr(7); current = current.substr(0, current.length - 4); if (current == 'none') + // Assume WARN when nothing assumed yet current = '1'; - else if (current == '3') + else if (current == '3' || (service == '' && current == '2')) + // Assume OK when unknown assumed (or when critical assumed for host) current = '0' else if (current == '0') - current = 'none' - else if (current == '2' && service == '') + // Disable assumption when ok assumed current = 'none' else + // In all other cases increas the assumption current = parseInt(current) + 1; var url = "bi_set_assumption.py?site=" + encodeURIComponent(site)

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012