Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: FIX WATO BI editor now supports percentages for count_ok

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d3e0726d1fb43aa916dd1a15d24d897a4148519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d3e0726d1fb43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 15:19:28 2013 +0100 FIX WATO BI editor now supports percentages for count_ok The WATO module for BI aggregates now can correctly show and edit aggregation functions of the type <tt>count_ok</tt> that are using percentages instead of explicit numbers, e.g. <tt>count_ok!60%!30%</tt>. --- .werks/400 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 2 -- web/htdocs/lib.py | 6 ++++++ web/htdocs/wato.py | 2 +- web/plugins/wato/bi.py | 34 ++++++++++++++++++++++++++-------- 6 files changed, 46 insertions(+), 11 deletions(-) diff --git a/.werks/400 b/.werks/400 new file mode 100644 index 0000000..76da29c --- /dev/null +++ b/.werks/400 @@ -0,0 +1,12 @@ +Title: WATO BI editor now supports percentages for count_ok +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387376299 +Targetversion: future + +The WATO module for BI aggregates now can correctly show and edit aggregation +functions of the type <tt>count_ok</tt> that are using percentages instead +of explicit numbers, e.g. <tt>count_ok!60%!30%</tt>. diff --git a/ChangeLog b/ChangeLog index f56a379..567a1aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 0346 FIX: Fix folder visibility in WATO for unpriviledged users... * 0385 FIX: Better error handling for invalid service regex in rule conditions... * 0389 FIX: Showing LDAP settings on site specific global settings page now... + * 0400 FIX: WATO BI editor now supports percentages for count_ok... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 85a841c..a463750 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1245,8 +1245,6 @@ def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): # counts can be specified as integer (e.g. '2') or # as percentages (e.g. '70%'). - - if num_ok >= aggr_countok_convert(needed_for_ok, len(states)): return { "state" : 0, "output" : "" } elif num_ok >= aggr_countok_convert(needed_for_warn, len(states)): diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 7b8d205..7b53b2a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -289,6 +289,12 @@ def saveint(x): except: return 0 +def tryint(x): + try: + return int(x) + except: + return x + def set_is_disjoint(a, b): for elem in a: if elem in b: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b4fc2e2..bb10448 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13347,7 +13347,7 @@ def convert_rule_from_bi(rule, ruleid): crule.update(rule) crule["nodes"] = map(convert_node_from_bi, rule["nodes"]) parts = rule["aggregation"].split("!") - crule["aggregation"] = (parts[0], tuple(map(saveint, parts[1:]))) + crule["aggregation"] = (parts[0], tuple(map(tryint, parts[1:]))) crule["id"] = ruleid return crule diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index c8662a1..1b45ff5 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -68,18 +68,36 @@ bi_aggregation_functions["best"] = { ]), } +def vs_count_ok_count(title, defval, defvalperc): + return Alternative( + title = title, + style = "dropdown", + match = lambda x: str(x).endswith("%") and 1 or 0, + elements = [ + Integer( + title = _("Explicit number"), + label=_("Number of OK-nodes"), + min_value = 0, + default_value = defval + ), + Transform( + Percentage( + label=_("Percent of OK-nodes"), + display_format = "%.0f", + default_value = defvalperc), + title = _("Percentage"), + forth = lambda x: float(x[:-1]), + back = lambda x: "%d%%" % x, + ), + ] + ) + bi_aggregation_functions["count_ok"] = { "title" : _("Count the number of nodes in state OK"), "valuespec" : Tuple( elements = [ - Integer( - label = _("Required number of OK-nodes for a total state of OK:"), - default_value = 2, - min_value = 0), - Integer( - label = _("Required number of OK-nodes for a total state of WARN:"), - default_value = 1, - min_value = 0), + vs_count_ok_count(_("Required number of OK-nodes for a total state of OK:"), 2, 50), + vs_count_ok_count(_("Required number of OK-nodes for a total state of WARN:"), 1, 25), ]), }

10 years, 9 months

Check_MK Git: check_mk: FIX check_ftp: cleanup configuration via WATO, remove Hostname field

by Mathias Kettner

Module: check_mk Branch: master Commit: 99d6fb648b8d5ea759cbaf14537a1105dfcf52ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99d6fb648b8d5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 14:47:54 2013 +0100 FIX check_ftp: cleanup configuration via WATO, remove Hostname field The <tt>check_ftp</tt> active check does not longer need nor allow to specify a host name. The host name is always present: the host the check is mapped onto. Also the specification of an alternative host name would not be consistent with any of the other networking checks. If you need an FTP check on a specific host then please add that host to the monitoring. Exceptions can alsway be done via <tt>custom_checks</tt>. --- .werks/399 | 16 ++++++++++++++++ ChangeLog | 1 + checks/check_ftp | 9 +++++++-- web/plugins/wato/active_checks.py | 15 +++++---------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/399 b/.werks/399 new file mode 100644 index 0000000..f2c11d9 --- /dev/null +++ b/.werks/399 @@ -0,0 +1,16 @@ +Title: check_ftp: cleanup configuration via WATO, remove Hostname field +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387374334 +Targetversion: future + +The <tt>check_ftp</tt> active check does not longer need nor allow to +specify a host name. The host name is always present: the host the check is +mapped onto. Also the specification of an alternative host name would not +be consistent with any of the other networking checks. + +If you need an FTP check on a specific host then please add that host to +the monitoring. Exceptions can alsway be done via <tt>custom_checks</tt>. diff --git a/ChangeLog b/ChangeLog index 9758651..f56a379 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 0387 FIX: df*: Negative filesystem space levels get a more clear text in check output... * 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)... * 0397 FIX: mrpe: tolerate performance variable names with spaces... + * 0399 FIX: check_ftp: cleanup configuration via WATO, remove Hostname field... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/check_ftp b/checks/check_ftp index 7200786..99cb288 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -25,7 +25,12 @@ # Boston, MA 02110-1301 USA. def check_ftp_arguments(params): - host, settings = params + if type(params) == tuple: + host, settings = params + else: + host = "$HOSTNAME$" + settings = params + args = ' -H %s' % quote_shell_string(host) if "response_time" in settings: @@ -60,7 +65,7 @@ def check_ftp_arguments(params): active_check_info['ftp'] = { "command_line" : '$USER1$/check_ftp $ARG1$', "argument_function" : check_ftp_arguments, - "service_description" : lambda args: "FTP %s" % args[0], + "service_description" : lambda args: type(args) == tuple and ("FTP %s" % args[0]) or "FTP", "has_perfdata" : True, } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 7285211..4372fbd 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -94,14 +94,8 @@ register_rule(group, register_rule(group, "active_checks:ftp", - Tuple( - title = _("Check FTP Services"), - elements = [ - TextAscii ( title = _("Hostname"), allow_empty = False, - help = _("The hostname of the FTP server you want to check. " - "It is possible to use $HOSTNAME$.") - ), - Dictionary( + Transform( + Dictionary( elements = [ ( "response_time", Tuple( @@ -161,8 +155,9 @@ register_rule(group, default_value = 30) ), ]), - ] - ) + forth = lambda x: type(x) == tuple and x[1] or x, + title = _("Check FTP Service"), + ) )

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0894

by Lars Michelsen

Module: check_mk Branch: master Commit: b3052b14b585705902fb15997e05394e8f33ba93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3052b14b58570… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 14:47:25 2013 +0100 Updated bug entries #0894 --- .bugs/894 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/894 b/.bugs/894 index ec9bede..6ea4a5a 100644 --- a/.bugs/894 +++ b/.bugs/894 @@ -1,9 +1,13 @@ Title: never read automation_secret.mk from Multisite Component: multisite -State: open +Class: nastiness +State: wontfix Date: 2013-06-20 16:12:17 Targetversion: future -Class: nastiness That file should be "write only" from the point of view of Multisite and only be read by external skripts. + +2013-12-18 14:47:04: changed state open -> wontfix +We need to use the single files to prevent loading the whole user-db during regular +page processing. This saves a lot of time.

10 years, 9 months

Check_MK Git: check_mk: Cleanup a few texts in WATO rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 931a4ee501146ef8ff55eb98934532f8fe7f2e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931a4ee501146e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 14:44:04 2013 +0100 Cleanup a few texts in WATO rules --- web/plugins/wato/check_parameters.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6f6bee9..af20c22 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1577,11 +1577,14 @@ filesystem_elements = [ ] ) ), + # Beware: this is a nasty hack that helps us to detect new-style paramters. + # Something hat has todo with float/int conversion and has not been documented + # by the one who implemented this. ( "flex_levels", FixedValue( None, totext = "", - title = _("Hidden identifier key for flexible level usage") + title = "", )), ( "magic", Float( @@ -2054,7 +2057,7 @@ register_check_parameters( ( "heartbeat_ok", MonitoringState( title = _("Heartbeat OK"), - help = _(" Guest operating system is responding normally."), + help = _("Guest operating system is responding normally."), default_value = 0, ) ),

10 years, 9 months

Check_MK Git: check_mk: Added sorter / filter for host/ service service levels

by Lars Michelsen

Module: check_mk Branch: master Commit: 04413ddc938ca19b31fd0d9261e110bdbab13829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04413ddc938ca1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 14:41:36 2013 +0100 Added sorter / filter for host/service service levels The service level attribute of hosts and services can now be shown in multisite views. It has been added to the detail page of hosts and services. --- .bugs/2122 | 9 ++++++++ .bugs/837 | 6 +++++ .bugs/921 | 2 +- .werks/391 | 13 +++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 34 --------------------------- web/htdocs/views.py | 10 ++++++++ web/plugins/views/builtin.py | 2 ++ web/plugins/views/painters.py | 31 +++++++++++++++++++------ web/plugins/views/sorters.py | 8 +++++++ web/plugins/wato/globals_notification.py | 37 ++++++++++++++++++++++++++++++ 11 files changed, 111 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=04413ddc93…

10 years, 9 months

Check_MK Git: check_mk: Added some exchange checks to treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: c2871e0ac46eca957b76accf77fa85e442533974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2871e0ac46eca… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 18 14:35:51 2013 +0100 Added some exchange checks to treasures --- doc/treasures/msexchange/README | 26 ++++++ doc/treasures/msexchange/winperf_msx_activesync | 50 ++++++++++ .../msexchange/winperf_msx_db_reads_avg_latency | 83 +++++++++++++++++ doc/treasures/msexchange/winperf_msx_dc_access | 96 ++++++++++++++++++++ doc/treasures/msexchange/winperf_msx_dumpster | 78 ++++++++++++++++ .../msexchange/winperf_msx_queued_mailbox | 63 +++++++++++++ .../msexchange/winperf_msx_rpc_clientaccess | 77 ++++++++++++++++ 7 files changed, 473 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2871e0ac4…

10 years, 9 months

Check_MK Git: check_mk: kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer

by Bastian Kuhn

Module: check_mk Branch: master Commit: c28caa271ae1d4d0369c5c45aa2977e3200b1f51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c28caa271ae1d4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 18 14:31:33 2013 +0100 kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer --- .werks/111 | 10 ++++++ ChangeLog | 1 + checkman/kemp_loadmaster_ha | 8 +++++ checkman/kemp_loadmaster_realserver | 13 ++++++++ checkman/kemp_loadmaster_services | 12 +++++++ checks/kemp_loadmaster_ha | 46 +++++++++++++++++++++++++ checks/kemp_loadmaster_realserver | 61 +++++++++++++++++++++++++++++++++ checks/kemp_loadmaster_services | 63 +++++++++++++++++++++++++++++++++++ 8 files changed, 214 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c28caa271a…

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 940f5e6611dc40aad0236659c133c8af3e322d24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940f5e6611dc40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 13:51:16 2013 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index ea2d7fd..ec42e6d 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2122 +2142

10 years, 9 months

Check_MK Git: check_mk: Added an icon selector to the view editor

by Lars Michelsen

Module: check_mk Branch: master Commit: baa5b885ae158f693a7b245962f550c71f44e7a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baa5b885ae158f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 13:39:54 2013 +0100 Added an icon selector to the view editor Each view can have a small icon which is used, for example, in context buttons linking to these views. The icons had to be configured by putting the icon name to a text field. This was not user friendly. This change adds an icon chooser to the view editor. --- .bugs/706 | 7 ++- .werks/390 | 14 ++++++ ChangeLog | 1 + web/htdocs/check_mk.css | 30 ++++++++++++ web/htdocs/images/icon_empty.png | Bin 0 -> 204 bytes web/htdocs/js/checkmk.js | 50 +++++++++++++++++++ web/htdocs/valuespec.py | 100 ++++++++++++++++++++++++++++++++++++++ web/htdocs/views.py | 33 ++++++------- web/htdocs/wato.css | 22 +-------- web/htdocs/wato.py | 2 +- 10 files changed, 219 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=baa5b885ae…

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0948

by Mathias Kettner

Module: check_mk Branch: master Commit: 6bbb1c78956b1c526c524a2b6ef136dafa005f8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bbb1c78956b1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 13:29:42 2013 +0100 Updated bug entries #0948 --- .bugs/948 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/948 b/.bugs/948 index 7c99e1a..dd1b07e 100644 --- a/.bugs/948 +++ b/.bugs/948 @@ -1,9 +1,9 @@ Title: auth.serials not synchronized between sites Component: multisite -State: open +Class: nastiness +State: closed Date: 2013-07-12 15:52:33 Targetversion: future -Class: nastiness In a distributed setup a password change on one site is not being distributed to the others. Also the file @@ -12,3 +12,6 @@ change the user cannot use his cookie for the authentication on remote sites anymore. Solution: unclear. Currently no good idea. + +2013-12-18 13:29:40: changed state open -> closed +Will be done soon upon a customer request.

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits