Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Cleanup too verbose output about piggy data

by Mathias Kettner

Module: check_mk Branch: master Commit: 969f407d80a0df23a671a90b9de0f47ee765e69a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969f407d80a0df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 14:47:29 2015 +0100 Cleanup too verbose output about piggy data --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1459ce3..5883c98 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -525,7 +525,7 @@ def add_persisted_info(hostname, info): if now < persisted_until or opt_force: if section not in info: info[section] = persisted_section - verbose("Added persisted section %s.\n" % section) + vverbose("Added persisted section %s.\n" % section) else: verbose("Persisted section %s is outdated by %d seconds. Deleting it.\n" % ( section, now - persisted_until))

9 years, 7 months

Check_MK Git: check_mk: WATO rule for special agent ibm svc extended, plus allow 25 fields in agent output for ibm_svc_mdiskgrp

by Goetz Golla

Module: check_mk Branch: master Commit: e1580623ebce2d6e1f3731ec0f8317f46e2fcebc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1580623ebce2d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 23 14:21:59 2015 +0100 WATO rule for special agent ibm svc extended, plus allow 25 fields in agent output for ibm_svc_mdiskgrp --- checks/ibm_svc_mdiskgrp | 4 ++-- web/plugins/wato/datasource_programs.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 828f4ae..a40fa32 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -57,12 +57,12 @@ def ibm_svc_mdiskgrp_to_mb(size): def inventory_ibm_svc_mdiskgrp(info): for line in info: - if len(line) in (15, 19, 24): + if len(line) in (15, 19, 24, 25): yield line[1], {} def check_ibm_svc_mdiskgrp(item, params, info): for line in info: - if len(line) in (15, 19, 24) and item == line[1]: + if len(line) in (15, 19, 24, 25) and item == line[1]: mgrp_status = line[2] if mgrp_status != "online": diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 5e65414..482bd2e 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -328,6 +328,7 @@ register_rule(group, ( "lssystemstats", _("System Stats") ), ( "lseventlog", _("Event Log") ), ( "lsportfc", _("FC Ports") ), + ( "lsportsas", _("SAS Ports") ), ( "lsenclosure", _("Enclosures") ), ( "lsenclosurestats", _("Enclosure Stats") ), ( "lsarray", _("RAID Arrays") ),

9 years, 7 months

Check_MK Git: check_mk: cmk -I for yet un-discovered hosts forces SNMP scan

by Mathias Kettner

Module: check_mk Branch: master Commit: e63c4fafd64447c77e00f5bab365165fc4ee13e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e63c4fafd64447… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 12:32:21 2015 +0100 cmk -I for yet un-discovered hosts forces SNMP scan --- modules/discovery.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/discovery.py b/modules/discovery.py index 58fccfe..ffd5eb0 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -74,7 +74,11 @@ def do_discovery(hostnames, check_types, only_new): def do_discovery_for(hostname, check_types, only_new, use_caches): - new_items = discover_services(hostname, check_types, use_caches, not use_caches) + # Usually we disable SNMP scan if cmk -I is used without a list of + # explicity hosts. But for host that have never been service-discovered + # yet (do not have autochecks), we enable SNMP scan. + do_snmp_scan = not use_caches or not has_autochecks(hostname) + new_items = discover_services(hostname, check_types, use_caches, do_snmp_scan) if not check_types and not only_new: old_items = [] # do not even read old file else: @@ -811,6 +815,10 @@ def parse_autochecks_file(hostname): return table +def has_autochecks(hostname): + return os.path.exists(autochecksdir + "/" + hostname + ".mk") + + def save_autochecks_file(hostname, items): if not os.path.exists(autochecksdir): os.makedirs(autochecksdir)

9 years, 7 months

Check_MK Git: check_mk: WATO users: label of enforce pw change at next login checkbox is now clickable

by Lars Michelsen

Module: check_mk Branch: master Commit: 5afeacd91ca43f337779a29976a5cdb809249f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5afeacd91ca43f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 23 11:57:38 2015 +0100 WATO users: label of enforce pw change at next login checkbox is now clickable --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4848e4..efe0f1e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12112,8 +12112,8 @@ def mode_edit_user(phase): html.write("</td></tr><tr><td>%s:</td><td>" % _("Enforce change")) # Only make password enforcement selection possible when user is allowed to change the PW if new or config.user_may(userid, 'general.edit_profile') and config.user_may(userid, 'general.change_password'): - html.checkbox("enforce_pw_change", user.get("enforce_pw_change", False)) - html.write(_("Change password at next login or access")) + html.checkbox("enforce_pw_change", user.get("enforce_pw_change", False), + label=_("Change password at next login or access")) else: html.write(_("Not permitted to change the password. Change can not be enforced.")) else:

9 years, 7 months

Check_MK Git: check_mk: Fix missing SNMP scan on manual cmk -I HOSTNAME

by Mathias Kettner

Module: check_mk Branch: master Commit: 7fc5509f2b1197af6c514dc4b7b5aa267a02f2e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fc5509f2b1197… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 11:54:05 2015 +0100 Fix missing SNMP scan on manual cmk -I HOSTNAME --- modules/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/discovery.py b/modules/discovery.py index 5254f28..58fccfe 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -74,7 +74,7 @@ def do_discovery(hostnames, check_types, only_new): def do_discovery_for(hostname, check_types, only_new, use_caches): - new_items = discover_services(hostname, check_types, use_caches, use_caches) + new_items = discover_services(hostname, check_types, use_caches, not use_caches) if not check_types and not only_new: old_items = [] # do not even read old file else:

9 years, 7 months

Check_MK Git: check_mk: Fixed Werk title

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a0cd5608771ae282e32b6e0b25b7e68e27849eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a0cd5608771ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 11:01:24 2015 +0100 Fixed Werk title --- .werks/1877 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1877 b/.werks/1877 index f6e2e21..50993fb 100644 --- a/.werks/1877 +++ b/.werks/1877 @@ -1,4 +1,4 @@ -Title: printer_input/printer_output: Check can no handle non reported capacity unit +Title: printer_input/printer_output: Check can now handle non reported capacity unit Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index ee63f33..8921fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,7 @@ * 1875 FIX: Fixed possible exceptions of CMC Check_MK helpers when using some custom checks... * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm * 1847 FIX: oracle_logswitches: Fixed description of WATO rule for levels... - * 1877 FIX: printer_input/printer_output: Check can no handle non reported capacity unit + * 1877 FIX: printer_input/printer_output: Check can now handle non reported capacity unit Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 7 months

Check_MK Git: check_mk: Fix several descriptive texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 5307aed1c96ca35d3321a0a68e68b65fddd2316c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5307aed1c96ca3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 10:49:32 2015 +0100 Fix several descriptive texts --- web/htdocs/crashed_check.py | 2 +- web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 13 ++++++------- web/plugins/wato/datasource_programs.py | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py index 7639e72..f3bf423 100644 --- a/web/htdocs/crashed_check.py +++ b/web/htdocs/crashed_check.py @@ -39,7 +39,7 @@ def output_box(title, content): % html.attrencode(content).replace("\n", " ")) def page_crashed_check(): - html.header(_("Crash Check Report"), stylesheets=["status", "pages",]) + html.header(_("Crashed Check Report"), stylesheets=["status", "pages",]) site = html.var("site") host = html.var("host") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4848e4..9b06bc9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8903,7 +8903,7 @@ def mode_notifications(phase): if not current_settings.get("enable_rulebased_notifications"): url = 'wato.py?mode=edit_configvar&varname=enable_rulebased_notifications' html.show_warning( - _("Warning Rule based notifications are disabled in your global settings. " + _("Warning Rule based notifications are disabled in your global settings. " "The rules that you edit here will have affect only on notifications that are " "created by the Event Console. Normal monitoring alerts will not use the " "rule based notifications now." diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 62aec36..61a3774 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3697,8 +3697,7 @@ register_check_parameters( _("ORACLE Scheduler Job"), Dictionary( help = _("A scheduler job is an object in an ORACLE database which could be " - "compared to a cron job on unix. " - "This rule allows you to define the maximum run duration and state.."), + "compared to a cron job on Unix. "), elements = [ ( "run_duration", Tuple( @@ -3798,9 +3797,9 @@ register_check_parameters( choices = [ ( False, _("Disregard required mirror space as free space")), ( True, _("Regard required mirror space as free space")),], - help = _("ASM calculates the free space depending on free_mb or require mirror " - "free space. Enable this option to set the check against require " - "mirror free space. This only works for normal or high redundancy Disk Groups. ")) + help = _("ASM calculates the free space depending on free_mb or required mirror " + "free space. Enable this option to set the check against required " + "mirror free space. This only works for normal or high redundancy Disk Groups.")) ), ], hidden_keys = ["flex_levels"], @@ -4537,11 +4536,11 @@ register_check_parameters( elements = [ ( "always_ok", DropdownChoice( + title = _("Override Service State"), choices = [ - ( False, _("Check show Errors in Case of degraded or offline hosts")), + ( False, _("Check shows errors in case of degraded or offline hosts")), ( True, _("Check always is in a OK State") ) ], - title = _("Overwrite Service State"), ) ) ], diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 5e65414..9e074af 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -407,8 +407,8 @@ register_rule(group, register_rule(group, "special_agents:hivemanager", Tuple( - title = _("Hivemanager"), - help = _( "Connect to AeroHive HiveManger via a webcall to get a list of all devices"), + title = _("Aerohive HiveManager"), + help = _( "Activate monitoring of host via a HTTP connect to the HiveManager"), elements = [ TextAscii(title = _("Username")), Password( title = _("Password")),

9 years, 7 months

Check_MK Git: check_mk: Fixed type in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: b63739294169c795d52523398a336587274171b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b63739294169c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 10:52:57 2015 +0100 Fixed type in help text --- web/plugins/wato/active_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index af6f088..a96a529 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -141,7 +141,7 @@ mail_receiving_params = [ default_value = 110, ), title = _('TCP Port'), - help = _('By default the standard IMAP Port 110 is used.'), + help = _('By default the standard POP3 Port 110 is used.'), )), (False, _('Encrypt POP3 communication using SSL'), Optional(Integer(

9 years, 7 months

Check_MK Git: check_mk: #1877 FIX printer_input/printer_output: Check can no handle non reported capacity unit

by Lars Michelsen

Module: check_mk Branch: master Commit: de55c56907602fde0fe98c6a027694641c953b72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de55c56907602f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 23 10:30:17 2015 +0100 #1877 FIX printer_input/printer_output: Check can no handle non reported capacity unit --- .werks/1877 | 10 ++++++++++ ChangeLog | 1 + checks/printer_io.include | 15 ++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.werks/1877 b/.werks/1877 new file mode 100644 index 0000000..f6e2e21 --- /dev/null +++ b/.werks/1877 @@ -0,0 +1,10 @@ +Title: printer_input/printer_output: Check can no handle non reported capacity unit +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422005392 + + diff --git a/ChangeLog b/ChangeLog index ef85f2e..ee63f33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 1875 FIX: Fixed possible exceptions of CMC Check_MK helpers when using some custom checks... * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm * 1847 FIX: oracle_logswitches: Fixed description of WATO rule for levels... + * 1877 FIX: printer_input/printer_output: Check can no handle non reported capacity unit Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/printer_io.include b/checks/printer_io.include index 56cee5c..15ec0d1 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -30,6 +30,8 @@ printer_io_units = { '8': 'sheets', '16': 'feet', '17': 'meters', + '18': 'items', + '19': 'percent', } printer_io_states = { @@ -90,11 +92,14 @@ def inventory_printer_io(info): def check_printer_io(item, params, info, what): for line in info: - index, name, descr, snmp_status, capacity_unit, capacity_max, level = line - snmp_status, level, capacity_max = saveint(snmp_status), saveint(level), saveint(capacity_max) - capacity_unit = printer_io_units[capacity_unit] + index, name, descr = line[:3] if name == item or descr == item or index.split('.')[-1] == item: + snmp_status, capacity_unit, capacity_max, level = line[3:] + snmp_status, level, capacity_max = saveint(snmp_status), saveint(level), saveint(capacity_max) + if capacity_unit != '': + capacity_unit = ' ' + printer_io_units[capacity_unit] + state_txt = [] state_state = 0 @@ -116,7 +121,7 @@ def check_printer_io(item, params, info, what): elif capacity_max in [ -1, -2 ]: # -1: no restriction, -2: unknown - yield 0, 'Capacity: %s %s' % (level, capacity_unit) + yield 0, 'Capacity: %s%s' % (level, capacity_unit) else: state = 0 @@ -147,6 +152,6 @@ def check_printer_io(item, params, info, what): state = 1 levels_txt = ' (>= %0.2f%%)' % warn - yield state, 'Capacity: %s of %s %s %s%s' % \ + yield state, 'Capacity: %s of %s%s %s%s' % \ (level_txt, capacity_max, capacity_unit, how, levels_txt)

9 years, 7 months

Check_MK Git: check_mk: Cleaned up duplicate valuespec definition

by Lars Michelsen

Module: check_mk Branch: master Commit: d4c90eaea5571e238f80f258a530e7bb1cda9b4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4c90eaea5571e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 23 10:13:50 2015 +0100 Cleaned up duplicate valuespec definition --- web/plugins/wato/active_checks.py | 311 +++++++++++++------------------------ 1 file changed, 108 insertions(+), 203 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d4c90eaea5…

9 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015