Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64361 discussions

Check_MK Git: check_mk: FIX: Fixed bug in alert statistics view ( only last 1000 lines were

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53b59e0f1d773b1825976c5d03745309774ce73b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53b59e0f1d773b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 11:37:37 2012 +0200 FIX: Fixed bug in alert statistics view (only last 1000 lines were processed for calculating the statistics) --- ChangeLog | 2 ++ web/htdocs/views.py | 12 ++++++++++-- web/plugins/views/datasources.py | 18 +++++++++++------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2be65c2..ac516c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,8 @@ * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) * FIX: Dashboard: If original request showed no "max rows"-message, the page rendered during reload does not show the message anymore + * FIX: Fixed bug in alert statistics view (only last 1000 lines were + processed for calculating the statistics) Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/views.py b/web/htdocs/views.py index efddf44..502866f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1228,6 +1228,14 @@ def show_view(view, show_heading = False, show_buttons = True, colset.remove("site") columns = list(colset) + # We had a problem with stats queries on the logtable where + # the limit was not applied on the resulting rows but on the + # lines of the log processed. This resulted in wrong stats. + # For these datasources we ignore the query limits. + limit = None + if not datasource.get('ignore_limit', False): + limit = get_limit() + # Get list of painter options we need to display (such as PNP time range # or the format being used for timestamp display) painter_options = [] @@ -1246,9 +1254,9 @@ def show_view(view, show_heading = False, show_buttons = True, # In that case that function is used to compute the result. if type(tablename) == type(lambda x:None): - rows = tablename(columns, query, only_sites, get_limit(), all_active_filters) + rows = tablename(columns, query, only_sites, limit, all_active_filters) else: - rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) + rows = query_data(datasource, columns, add_columns, query, only_sites, limit) # Now add join information, if there are join columns if len(join_painters) > 0: diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 1357c39..8755312 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -35,6 +35,9 @@ # idkeys: these are used to generate a key which is uniq for each data row +# ignore_limit: Ignore the soft/hard query limits in view.py/query_data(). This +# fixes stats queries on e.g. the log table. + multisite_datasources["hosts"] = { "title" : _("All hosts"), "table" : "hosts", @@ -155,11 +158,12 @@ multisite_datasources["log_host_events"] = { } multisite_datasources["alert_stats"] = { - "title" : _("Alert Statistics"), - "table" : "log", - "add_headers" : "Filter: class = 1\nStats: state = 0\nStats: state = 1\nStats: state = 2\nStats: state = 3\nStats: state != 0\n", - "add_columns" : [ "alerts_ok", "alerts_warn", "alerts_crit", "alerts_unknown", "alerts_problem" ], - "infos" : [ "log", "host", "service", "contact", "command" ], - "keys" : [], - "idkeys" : [ 'host_name', 'service_description' ], + "title" : _("Alert Statistics"), + "table" : "log", + "add_headers" : "Filter: class = 1\nStats: state = 0\nStats: state = 1\nStats: state = 2\nStats: state = 3\nStats: state != 0\n", + "add_columns" : [ "alerts_ok", "alerts_warn", "alerts_crit", "alerts_unknown", "alerts_problem" ], + "infos" : [ "log", "host", "service", "contact", "command" ], + "keys" : [], + "idkeys" : [ 'host_name', 'service_description' ], + "ignore_limit" : True, }

12 years

Check_MK Git: check_mk: Removed (hopefully) debug text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63badc919f93d29e6ac4ffaaa1fb313327c42853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63badc919f93d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:00:14 2012 +0200 Removed (hopefully) debug text --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8fce87b..0ed7ab5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -614,7 +614,7 @@ class ListOf(ValueSpec): "down" : _("down"), } html.empty_icon_button() # needed as placeholder - html.icon_button("#", _("Move this entry %s %s") % (where_name[where],self._movable), + html.icon_button("#", _("Move this entry %s") % (where_name[where]), where, onclick=js, style = (not self._movable) and "display: none" or "") # Implementation idea: we render our element-valuespec

12 years

Check_MK Git: check_mk: FIX: Added missing downtime icon for comment view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: deb41f17b72efd674ac32796b522f63e8fd7d6bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb41f17b72efd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 12:19:34 2012 +0200 FIX: Added missing downtime icon for comment view --- ChangeLog | 1 + web/htdocs/images/icon_downtime.gif | Bin 0 -> 1750 bytes 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb05d56..f33ad6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ page rendered during reload does not show the message anymore * FIX: Fixed bug in alert statistics view (only last 1000 lines were processed for calculating the statistics) + * FIX: Added missing downtime icon for comment view Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/images/icon_downtime.gif b/web/htdocs/images/icon_downtime.gif new file mode 100644 index 0000000..d024475 Binary files /dev/null and b/web/htdocs/images/icon_downtime.gif differ

12 years

Check_MK Git: check_mk: Extended snmp scan function of hp_prolaint

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1b71f2dbebaf66d261736835988bef2e9b2e7f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1b71f2dbebaf6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 20 12:15:26 2012 +0200 Extended snmp scan function of hp_prolaint --- checks/hp_proliant | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/hp_proliant b/checks/hp_proliant index 241d2df..9e7b7ea 100644 --- a/checks/hp_proliant +++ b/checks/hp_proliant @@ -39,8 +39,8 @@ def inventory_proliant_general(info): return [ (None, None) ] def check_proliant_general(item, no_params, info): - snmp_state = hp_proliant_status_map[int(info[0][0])] - status = hp_proliant_status2nagios_map[snmp_state] + snmp_state = hp_proliant_generel_status_map[int(info[0][0])] + status = hp_proliant_generel_status2nagios_map[snmp_state] return (status, "%s - General Status is %s (Firmware: %s, S/N: %s)" % (nagios_state_names[status], snmp_state, info[0][1], info[0][2])) @@ -48,4 +48,5 @@ def check_proliant_general(item, no_params, info): check_info['hp_proliant'] = (check_proliant_general, "General Status", 0, inventory_proliant_general) snmp_info['hp_proliant'] = ( ".1.3.6.1.4.1.232", [ "11.1.3.0", "11.2.14.1.1.5.0", "2.2.2.1.0" ] ) snmp_scan_functions['hp_proliant'] = \ - lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0") + lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0") or \ + (".1.3.6.1.4.1.311.1.1.3.1.2" in oid(".1.3.6.1.2.1.1.2.0") and oid(".1.3.6.1.4.1.232.11.1.3.0"))

12 years

Check_MK Git: check_mk: Added new Wato config field

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9cc4703fe7bb214425216ab59b182d737e137768 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc4703fe7bb21… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 20 11:18:27 2012 +0200 Added new Wato config field --- .bugs/741 | 9 +++++++++ web/plugins/wato/check_mk_configuration.py | 9 +++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/741 b/.bugs/741 new file mode 100644 index 0000000..0213421 --- /dev/null +++ b/.bugs/741 @@ -0,0 +1,9 @@ +Title: Refreshing autochecks in wato +Component: wato +State: open +Date: 2012-09-19 11:58:31 +Targetversion: 1.2.0 +Class: nastiness + +If for example mount options of a services changes, there is no way in the wato service section to refresh +the autochecks to use the new options diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 65fc14a..7a7b1e8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -851,6 +851,15 @@ 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",

12 years

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: ff8e4b0112412dd182301756644e33c01011c976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff8e4b0112412d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 20 11:18:39 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Check manpage for jolokia_metrics.bea_requests

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 922f57c90eb919a0e99f1b659d3e446e06906196 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922f57c90eb919… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 20:22:36 2012 +0200 Check manpage for jolokia_metrics.bea_requests --- checkman/jolokia_metrics.bea_requests | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_metrics.bea_requests b/checkman/jolokia_metrics.bea_requests new file mode 100644 index 0000000..cb8add4 --- /dev/null +++ b/checkman/jolokia_metrics.bea_requests @@ -0,0 +1,26 @@ +title: Requests to JVM sessions on BEA Weblogic +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows to track the number and rate of incoming requests to + a JVM application server on BEA weblogic. + + To use this plugin, Jolokia and the agent plugin need to be deployed + on the monitored server in each application container. + + The check can alert if the {WARN}/{CRIT} thresholds for a configurable total + is exceeded. + +item: + The name of the application server instance as configured by the agent + followed by the name of the application. + I.e. webservices webservices + +perfdata: + The number of requests served. + +inventory: + One check is created for each selvet running inside a weblogic + instance sent by the agent.

12 years

Check_MK Git: check_mk: Check Man Page for jolokia_metrics.bea_sess

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b9e82c5c6ff1068067aa3be10ff9c7979fce8cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b9e82c5c6ff10… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 20:12:53 2012 +0200 Check Man Page for jolokia_metrics.bea_sess --- checkman/jolokia_metrics.bea_sess | 41 +++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_metrics.bea_sess b/checkman/jolokia_metrics.bea_sess new file mode 100644 index 0000000..66b3ecf --- /dev/null +++ b/checkman/jolokia_metrics.bea_sess @@ -0,0 +1,41 @@ +title: Number of JVM sessions on BEA Weblogic +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows to monitor the number of current connections to + a JVM application on the servlet level) + + To use this plugin, Jolokia and the agent plugin need to be deployed + on the monitored server in each application container. + + The check can alert if the {WARN}/{CRIT} thresholds for a configurable total + is exceeded. + +item: + The name of the application server instance as configured by the agent + followed by the name of the application and the servlet inside it. + I.e. webservices webservices jolokia + This name is probably dependant on running a loadbalanced install or not. + +perfdata: + The number of sessions along with the upper (high) alert levels. + +inventory: + One check is created for each selvet running inside a weblogic + instance sent by the agent. + + +[parameters] +low_crit (int): If the number of sessions falls to this level, + a CRITICAL state is triggered +low_warn (int): If the number of sessions falls to this level, + a WARNING state is triggered +high_warn (int): If the number of sessions climbs to this level, + a WARNING state is triggered +high_crit (int): If the number of sessions climbs to this level, + a CRITICAL state is triggered + +[configuration] +jolokia_metrics_app_sess_default_levels (int, int, int, int): Default levels warning and critical

12 years

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fc8edb176fb53aa474dcc8d046afd2e7ee539b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fc8edb176fb53… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 16:42:34 2012 +0200 Add new bug entry --- .bugs/801 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/801 b/.bugs/801 new file mode 100644 index 0000000..c887ca0 --- /dev/null +++ b/.bugs/801 @@ -0,0 +1,9 @@ +Title: Documentation should no longer mention checkname +Component: docu +State: open +Date: 2012-09-19 16:41:43 +Targetversion: 1.2.0 +Class: cleanup + +checkname is no longer supported. +very few checks still use it but it also confuses new authors of checks.

12 years

Check_MK Git: check_mk: checks/jolokia_metrics add some tomcat checks, rewrite to deal with BEA and add a few comments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa06009890e12cb39cac111d628a266535468fbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa06009890e12c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 16:10:07 2012 +0200 checks/jolokia_metrics add some tomcat checks, rewrite to deal with BEA and add a few comments --- checks/jolokia_metrics | 78 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 11 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 3237750..9b718fb 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -66,6 +66,7 @@ def jolokia_metrics_parse(info): return parsed +# This bisects the app server and its values def jolokia_metrics_app(info, (inst, app)): parsed = jolokia_metrics_parse(info) if not inst in parsed \ @@ -74,6 +75,7 @@ def jolokia_metrics_app(info, (inst, app)): return parsed[inst]['apps'][app] +# This bisects info from BEA and passes on to jolokia_metrics_app def jolokia_metrics_serv(info, (inst, app, serv)): app = jolokia_metrics_app(info, (inst, app)) if not app or not serv in app.get('servlets', {}): @@ -94,21 +96,42 @@ def inventory_jolokia_metrics(info, what): def inventory_jolokia_metrics_apps(info, what): inv = [] parsed = jolokia_metrics_parse(info) + if what == 'app_sess': levels = 'jolokia_metrics_app_sess_default_levels' needed_key = [ "Sessions", "activeSessions" ] + elif what == 'bea_app_sess': + levels = 'jolokia_metrics_app_sess_default_levels' + needed_key = [ "OpenSessionsCurrentCount" ] elif what == 'queue': needed_key = [ "QueueLength" ] levels = "jolokia_metrics_queue_default_levels" - elif what == 'requests': + # Only works on BEA + elif what == 'bea_requests': needed_key = [ "CompletedRequestCount" ] levels = None + elif what == 'requests': + needed_key = [ "requestCount" ] + levels = None elif what == 'threads': needed_key = [ "StandbyThreadCount" ] levels = None else: needed_key = [ "Running", "stateName" ] levels = None + + # this handles information from BEA, they stack one level + # higher than the rest. + if what == 'bea_app_sess': + for inst, vals in parsed.iteritems(): + for app, appstate in vals.get('apps', {}).items(): + if 'servlets' in appstate: + for nk in needed_key: + for servlet in appstate['servlets']: + if nk in appstate['servlets'][servlet]: + inv.append(('%s %s %s' % (inst, app, servlet), levels)) + continue + # This does the same for tomcat for inst, vals in parsed.iteritems(): for app, appstate in vals.get('apps', {}).items(): for nk in needed_key: @@ -208,8 +231,10 @@ def check_jolokia_metrics_uptime(item, _unused, info): def check_jolokia_metrics_app_state(item, _unused, info): - app = jolokia_metrics_app(info, item.split()) app_state=3 + app = jolokia_metrics_app(info, item.split()) + + #print app # FIXME: this could be nicer. if app and "Running" in app: if app['Running'] == '1': @@ -230,16 +255,23 @@ def check_jolokia_metrics_app_state(item, _unused, info): return (2, 'CRIT - application is not running (Running: %s)') + return (3, 'UNKNOWN - error in agent output') + + + def check_jolokia_metrics_app_sess(item, params, info): lo_crit, lo_warn, hi_warn, hi_crit = params - app = jolokia_metrics_app(info, item.split()) + if len(item.split()) == 3: + app = jolokia_metrics_serv(info, item.split()) + elif len (item.split()) == 2: + app = jolokia_metrics_app(info, item.split()) if not app: return (3, "UNKNOWN - application not found") - sessions = app.get('Sessions', app.get('activeSessions')) + sessions = app.get('Sessions', app.get('activeSessions', app.get('OpenSessionsCurrentCount'))) if sessions == None: return (3, "UNKNOWN - data not found in agent output") sess = saveint(sessions) - maxActive = saveint(app.get('Sessions', app.get('maxActiveSessions'))) + maxActive = saveint(app.get('Sessions', app.get('maxActiveSessions', app.get('OpenSessionsCurrentCount')))) status = 0 status_txt = '' @@ -319,15 +351,23 @@ def check_jolokia_metrics_bea_queue(item, params, info): return (status, nagios_state_names[status] + ' - queue length is %d' % queuelength, [("length", queuelength, warn, crit)]) + +# FIXME: This check could work with any JVM +# It has no levels +# A candidate for 1.2.1 overhaul def check_jolokia_metrics_bea_requests(item, _no_params, info): app = jolokia_metrics_app(info, item.split()) if not app: return (3, "UNKNOWN - application not found") - if "CompletedRequestCount" not in app: - return (3, "UNKNOWN - data not found in agent output") - requests = int(app['CompletedRequestCount']) - timedif, rate = get_counter("j4p.bea.requests.%s" % item, time.time(), requests) - return (0, "OK - %.2f requests/sec" % rate, [("rate", rate)]) + + for nk in [ "CompletedRequestCount", "requestCount" ]: + if nk in app: + requests = int(app[nk]) + timedif, rate = get_counter("j4p.bea.requests.%s" % item, time.time(), requests) + return (0, "OK - %.2f requests/sec" % rate, [("rate", rate)]) + + return (3, "UNKNOWN - data not found in agent output") + def check_jolokia_metrics_bea_threads(item, _no_params, info): app = jolokia_metrics_app(info, item.split()) @@ -372,6 +412,8 @@ check_info["jolokia_metrics.uptime"] = { } # Application specific checks +# Note: we could simply pass in "nk" as "what". +# Not changing since there might be something smarter. check_info["jolokia_metrics.app_state"] = { "service_description" : "JVM %s State", "check_function" : check_jolokia_metrics_app_state, @@ -386,6 +428,13 @@ check_info["jolokia_metrics.app_sess"] = { "has_perfdata" : True, } +check_info["jolokia_metrics.requests"] = { + "service_description" : "JVM %s Requests", + "check_function" : check_jolokia_metrics_bea_requests, + "inventory_function" : lambda i: inventory_jolokia_metrics_apps(i, "requests"), + "has_perfdata" : True, +} + # Servlet specific checks check_info["jolokia_metrics.serv_req"] = { "service_description" : "JVM %s Requests", @@ -405,7 +454,7 @@ check_info["jolokia_metrics.bea_queue"] = { check_info["jolokia_metrics.bea_requests"] = { "service_description" : "JVM %s Requests", "check_function" : check_jolokia_metrics_bea_requests, - "inventory_function" : lambda i: inventory_jolokia_metrics_apps(i, "requests"), + "inventory_function" : lambda i: inventory_jolokia_metrics_apps(i, "bea_requests"), "has_perfdata" : True, } @@ -416,3 +465,10 @@ check_info["jolokia_metrics.bea_threads"] = { "has_perfdata" : True, } +check_info["jolokia_metrics.bea_sess"] = { + "service_description" : "JVM %s Sessions", + "check_function" : check_jolokia_metrics_app_sess, + "inventory_function" : lambda i: inventory_jolokia_metrics_apps(i, "bea_app_sess"), + "has_perfdata" : True, +} +

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits