Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

by Goetz Golla

Module: check_mk Branch: master Commit: 653a74e95dafee4b115c09419d1175f456028338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=653a74e95dafee… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 30 17:03:17 2015 +0200 syntax fix --- checks/netapp_api_aggr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/netapp_api_aggr b/checks/netapp_api_aggr index d9f6a02..a430700 100644 --- a/checks/netapp_api_aggr +++ b/checks/netapp_api_aggr @@ -55,7 +55,7 @@ check_info["netapp_api_aggr"] = { 'service_description' : 'Aggregation %s', 'group' : 'filesystem', 'has_perfdata' : True, - 'includes' : [ "df.include", "netapp_api.include" ] + 'includes' : [ "df.include", "netapp_api.include" ], 'default_levels_variable' : 'filesystem_default_levels', }

9 years, 6 months

Check_MK Git: check_mk: #2110 FIX netapp_api_aggr: check did not take configured levels when using Nagios

by Goetz Golla

Module: check_mk Branch: master Commit: 13f7d2c791ab64bc4f7ac2348cf3f3ac99e66e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f7d2c791ab64… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 30 17:01:07 2015 +0200 #2110 FIX netapp_api_aggr: check did not take configured levels when using Nagios --- .werks/2110 | 10 ++++++++++ ChangeLog | 1 + checks/netapp_api_aggr | 16 +++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/2110 b/.werks/2110 new file mode 100644 index 0000000..c0f040b --- /dev/null +++ b/.werks/2110 @@ -0,0 +1,10 @@ +Title: netapp_api_aggr: check did not take configured levels when using Nagios +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427727624 + + diff --git a/ChangeLog b/ChangeLog index 22e50d8..bb712c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -292,6 +292,7 @@ * 2109 FIX: netapp_api_volumes: now using the defined levels when using the Nagios core * 1241 FIX: hp_prolaint: Unkown state is not longer handled as OK... * 2171 FIX: netapp_api_vf_status: Handling "DR backup" as normal (OK) state now + * 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/netapp_api_aggr b/checks/netapp_api_aggr index 22ee9e2..d9f6a02 100644 --- a/checks/netapp_api_aggr +++ b/checks/netapp_api_aggr @@ -48,12 +48,14 @@ def check_netapp_api_aggr(item, params, parsed): return df_check_filesystem_list(item, params, [(item, size_total, size_avail, 0)]) check_info["netapp_api_aggr"] = { - 'check_function' : check_netapp_api_aggr, - 'parse_function' : lambda info: netapp_api_convert_info(info, + 'check_function' : check_netapp_api_aggr, + 'parse_function' : lambda info: netapp_api_convert_info(info, configs = {"aggr-list-info": {"block-name": "aggr-info", "key": "name"}}), - 'inventory_function' : inventory_netapp_api_aggr, - 'service_description' : 'Aggregation %s', - 'group' : 'filesystem', - 'has_perfdata' : True, - 'includes' : [ "df.include", "netapp_api.include" ] + 'inventory_function' : inventory_netapp_api_aggr, + 'service_description' : 'Aggregation %s', + 'group' : 'filesystem', + 'has_perfdata' : True, + 'includes' : [ "df.include", "netapp_api.include" ] + 'default_levels_variable' : 'filesystem_default_levels', + }

9 years, 6 months

Check_MK Git: check_mk: check_cpu_peaks: improvements from goetz

by Bastian Kuhn

Module: check_mk Branch: master Commit: fcc8fceb0e9c98ed0f074ac6850d3b659573757a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcc8fceb0e9c98… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 30 13:33:48 2015 +0200 check_cpu_peaks: improvements from goetz --- doc/treasures/active_checks/check_cpu_peaks | 67 ++++++++++++++++----------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/doc/treasures/active_checks/check_cpu_peaks b/doc/treasures/active_checks/check_cpu_peaks index 6e123b0..f2930d8 100755 --- a/doc/treasures/active_checks/check_cpu_peaks +++ b/doc/treasures/active_checks/check_cpu_peaks @@ -110,7 +110,8 @@ try: data = get_rrd_data(host, "CPU utilization", "util", "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0] - util_total = [ x for x in datasets[0] if x != None ] + #util_total = [ x for x in datasets[0] if x != None ] + util_total = [ x for x in datasets[0] ] except Exception, e: if opt_debug: raise @@ -120,40 +121,52 @@ try: data = get_rrd_data(host, "CPU utilization", key, "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0] - util_total = map(lambda x: int(sum([y for y in x if y != None])), - zip(datasets[0], datasets[1], datasets[2])) - cpu_peak = max(util_total) + def sumsum(x): + if None in x: + return None + return int(sum([y for y in x])) + + #util_total = map(lambda x: int(sum([y for y in x if y != None])), + util_total = map(sumsum, zip(datasets[0], datasets[1], datasets[2])) + cpu_peak = max(util_total) peak_time = time.localtime(fromtime + step_secs * util_total.index(cpu_peak)) if opt_verbose: - for idx, x in enumerate(datasets[0]): - sys.stdout.write("idx: %d " % idx) - sys.stdout.write("%s\t" % int(datasets[0][idx] or -1)) - sys.stdout.write("%s\t" % int(datasets[1][idx] or -1)) - sys.stdout.write("%s" % int(datasets[2][idx] or -1)) - print "" + for idx, x in enumerate(datasets[0]): + sys.stdout.write("idx: %d " % idx) + sys.stdout.write("%s\t" % int(datasets[0][idx] or -1)) + sys.stdout.write("%s\t" % int(datasets[1][idx] or -1)) + sys.stdout.write("%s" % int(datasets[2][idx] or -1)) + print "" if is_windows: - info = [ "CPU utilization from %s until %s" %\ - (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), - time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] + info = [ "CPU utilization from %s until %s" %\ + (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), + time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] + else: + info = [ "CPU utilization (user, system, wait) from %s until %s" %\ + (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), + time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] + + if cpu_peak: + info.append("Highest Peak of %d%% at %s" % (cpu_peak, time.strftime("%b %d %H:%M:%S", peak_time))) + state = 0 + if crit_level and cpu_peak <= crit_level: + info.append("less than %d (!!)" % crit_level) + state = 2 + elif warn_level and cpu_peak <= warn_level: + info.append("less than %d (!)" % warn_level) + state = 1 + print ", ".join(info) + sys.exit(state) else: - info = [ "CPU utilization (user, system, wait) from %s until %s" %\ - (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), - time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] - - info.append("Highest Peak of %d%% at %s" % (cpu_peak, time.strftime("%b %d %H:%M:%S", peak_time))) - state = 0 - if crit_level and cpu_peak <= crit_level: - info.append("less than %d (!!)" % crit_level) - state = 2 - elif warn_level and cpu_peak <= warn_level: - info.append("less than %d (!)" % warn_level) - state = 1 - print ", ".join(info) - sys.exit(state) + info.append("No data available in time period") + state = 0 + print ": ".join(info) + sys.exit(state) + except MKGeneralException, e: if opt_debug:

9 years, 6 months

Check_MK Git: check_mk: Add missing metrics column for graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: bf38130c7432df187d727be77aadb0dc0b4c9242 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf38130c7432df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 30 10:44:42 2015 +0200 Add missing metrics column for graphs --- web/htdocs/metrics.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index b6b9235..c27b758 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -947,13 +947,13 @@ def page_show_graph(): if service == "_HOST_": query = "GET hosts\n" \ "Filter: host_name = %s\n" \ - "Columns: perf_data check_command\n" % host_name + "Columns: perf_data metrics check_command\n" % host_name else: query = "GET services\n" \ "Filter: host_name = %s\n" \ "Filter: service_description = %s\n" \ - "Columns: perf_data check_command\n" % (host_name, service) + "Columns: perf_data metrics check_command\n" % (host_name, service) html.live.set_only_sites([site]) data = html.live.query_row(query) @@ -964,7 +964,8 @@ def page_show_graph(): 'site' : site, 'host_name' : host_name, 'host_perf_data' : data[0], - 'host_check_command' : data[1], + 'host_metrics' : data[1], + 'host_check_command' : data[2], } else: row = { @@ -972,7 +973,8 @@ def page_show_graph(): 'host_name' : host_name, 'service_description' : service, 'service_perf_data' : data[0], - 'service_check_command' : data[1], + 'service_metrics' : data[1], + 'service_check_command' : data[2], } # now try to render the graph with our graphing. If it is not possible,

9 years, 6 months

Check_MK Git: check_mk: Change for displaying graphs when checks currently output no perfdata

by Mathias Kettner

Module: check_mk Branch: master Commit: 61f9f75d81ad06c09b2dced935f1d2143eb68e9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61f9f75d81ad06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 30 10:36:22 2015 +0200 Change for displaying graphs when checks currently output no perfdata --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bf64ab5..2f3c5ff 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -820,7 +820,7 @@ def paint_graph(row): multisite_painters["svc_pnpgraph" ] = { "title" : _("Service Graphs"), - "columns" : [ "host_name", "service_description", "service_perf_data", "service_check_command" ], + "columns" : [ "host_name", "service_description", "service_perf_data", "service_metrics", "service_check_command" ], "options" : [ 'pnp_timerange' ], "paint" : paint_graph, "printable" : False, @@ -1173,7 +1173,7 @@ multisite_painters["host_notifications_enabled"] = { multisite_painters["host_pnpgraph" ] = { "title" : _("PNP host graph"), "short" : _("PNP graph"), - "columns" : [ "host_name" ], + "columns" : [ "host_name", "host_perf_data", "host_metrics", "host_check_command" ], "options" : [ 'pnp_timerange' ], "paint" : paint_graph, "printable" : False,

9 years, 6 months

Check_MK Git: check_mk: winperf_if FIX: link states of connected IFs were erroneously reported as down

by Goetz Golla

Module: check_mk Branch: master Commit: 7efb4b25eded6e35f1c55fb5988d17c361f8da5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7efb4b25eded6e… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sun Mar 29 11:57:30 2015 +0200 winperf_if FIX: link states of connected IFs were erroneously reported as down --- checks/winperf_if | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/checks/winperf_if b/checks/winperf_if index f08edbb..20af278 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -96,7 +96,7 @@ def convert_winperf_if(info): if counter: for nr, value in enumerate(line[1:len(nic_names)+1]): nics[nic_names[nr]][counter] = int(value) - # Not and integer: then this must be the line with the additional + # Not an integer: then this must be the line with the additional # information from wmic (which is optional!) else: headers = line @@ -194,20 +194,53 @@ def convert_winperf_if(info): if nic.get("GUID") in teaming_info: index_info = ( teaming_info[nic.get("GUID")]["TeamName"], index_info ) + # NetConnectionTable Stuff: + # + # if we have no status, but link information, we assume IF is connected + connection_status = nic.get('NetConnectionStatus', '2') - connection_status = nic.get('NetConnectionStatus') - if connection_status not in ['1', '2', '7']: - # Unknown states are set to down - connection_status = '2' + # Windows NetConnectionStatus Table + # 0 Disconnected + # 1 Connecting + # 2 Connected + # 3 Disconnecting + # 4 Hardware not present + # 5 Hardware disabled + # 6 Hardware malfunction + # 7 Media disconnected + # 8 Authenticating + # 9 Authentication succeeded + # 10 Authentication failed + # 11 Invalid address + # 12 Credentials required + + # ifOperStatus Table + # 1 up + # 2 down + # 3 testing + # 4 unknown + # 5 dormant + # 6 notPresent + # 7 lowerLayerDown + + # NetConnectionStatus : ifOperStatus + # 2 (Connected) : 1 (up) + # 7 (Media disconnected) : 7 (lowerLayerDown) + # * : 2 (down) + + if connection_status == '2': + ifoperstatus = '1' + elif connection_status == '7': + ifoperstatus = '7' + else: + ifoperstatus = '2' converted.append(( index_info, nic_name, "loopback" in nic_name.lower() and '24' or '6', bandwidth or nic[10], # Bandwidth - # NetConnectionStatus: 2 means 'up', 7 is 'not connected'. If the plugin - # wmic_if is missing and we have link information we have to assume 'up': - connection_status, + ifoperstatus, # ifOperStatus nic[-246], # ifInOctets, nic[14], # inucast 0, # inmcast

9 years, 6 months

Check_MK Git: check_mk: Reserved 15 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d14c9873f77b3d80a03f2bbcab48edfa36db833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d14c9873f77b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 29 08:31:59 2015 +0200 Reserved 15 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d1003cf..978a548 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2183 +2198

9 years, 6 months

Check_MK Git: check_mk: Added new metrics definition for check_tcp

by Mathias Kettner

Module: check_mk Branch: master Commit: 39c4368450a4e2386a68c833b76d18ccb603ed75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39c4368450a4e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 10:09:15 2015 +0100 Added new metrics definition for check_tcp --- web/plugins/metrics/check_mk.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index df9897a..71a38da 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -183,6 +183,12 @@ metric_info["pl"] = { "color" : "#ffc030", } +metric_info["response_time"] = { + "title" : _("Response time"), + "unit" : "s", + "color" : "#40a0b0", +} + metric_info["uptime"] = { "title" : _("Uptime"), "unit" : "s", @@ -1054,6 +1060,8 @@ check_metrics["check-mk"] = {} check_metrics["check-mk-ping"] = {} check_metrics["check-mk"] = {} +check_metrics["check_mk_active-tcp"] = { "time" : { "name": "response_time" } } + check_metrics["check_mk-uptime"] = {} check_metrics["check_mk-esx_vsphere_counters.uptime"] = {} check_metrics["check_mk-fritz.uptime"] = {} @@ -1335,6 +1343,14 @@ perfometer_info.append({ "exponent" : 2, }) +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "response_time", + "half_value" : 10, + "exponent" : 4, +}) + + perfometer_info.append(("logarithmic", ( "rta", 0.1, 4))) perfometer_info.append(("linear", ( ["execution_time"], 90.0, None))) perfometer_info.append(("logarithmic", ( "load1", 4.0, 2.0))) @@ -1501,6 +1517,7 @@ define_generic_graph("process_creations") define_generic_graph("threads") define_generic_graph("runtime") define_generic_graph("execution_time") +define_generic_graph("response_time") define_generic_graph("uptime") define_generic_graph("temp") define_generic_graph("time_offset")

9 years, 6 months

Check_MK Git: check_mk: Cleaned up details views for hosts and services

by Mathias Kettner

Module: check_mk Branch: master Commit: e1c7131f63f50fbb5443448a91ebffd27193e118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c7131f63f50f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 09:30:29 2015 +0100 Cleaned up details views for hosts and services New structure is now well defined: 1. Identification 2. State of check 3. Further runtime data, timestamps, etc. 4. Configuration --- web/plugins/views/builtin.py | 162 +++++++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 73 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 7fcfae7..ce51081 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -998,44 +998,54 @@ multisite_builtin_views.update({ 'mustsearch': False, 'name': 'hoststatus', 'owner': '', - 'painters': [('sitealias', None), - ('host', 'host'), - ('alias', None), - ('host_icons', None), - ('host_state', None), - ('host_address', None), - ('host_group_memberlist', None), - ('host_parents', None), - ('host_childs', None), - ('host_servicelevel', None), - ('host_contact_groups', None), - ('host_contacts', None), - ('host_plugin_output', None), - ('host_perf_data', None), - ('host_attempt', None), - ('host_notification_number', None), - ('host_check_interval', None), - ('host_check_type', None), - ('host_state_age', None), - ('host_check_age', None), - ('host_next_check', None), - ('host_next_notification', None), - ('host_last_notification', None), - ('host_check_latency', None), - ('host_check_duration', None), - ('host_in_downtime', None), - ('host_in_notifper', None), - ('host_notifper', None), - ('host_custom_vars', None), - ('num_services', None), - ('num_services_ok', 'host_ok'), - ('num_services_warn', 'host_warn'), - ('num_services_crit', 'host_crit'), - ('num_services_unknown', 'host_unknown'), - ('num_services_pending', 'host_pending'), - ('host_custom_notes', None), - ('host_pnpgraph', None), - ], + 'painters': [ + # 1. Identification and icons + ('sitealias', None), + ('host', 'host'), + ('host_parents', None), + ('host_childs', None), + ('host_address', None), + ('alias', None), + ('host_icons', None), + + # 2. State and metrics + ('host_state', None), + ('host_plugin_output', None), + ('host_pnpgraph', None), + ('host_perf_data', None), + ('host_in_downtime', None), + ('host_in_notifper', None), + + # 2b. Serivce statistics + ('num_services', None), + ('num_services_ok', 'host_ok'), + ('num_services_warn', 'host_warn'), + ('num_services_crit', 'host_crit'), + ('num_services_unknown', 'host_unknown'), + ('num_services_pending', 'host_pending'), + + # 3. Runtime data, timestamps + ('host_attempt', None), + ('host_notification_number', None), + ('host_state_age', None), + ('host_check_age', None), + ('host_next_check', None), + ('host_next_notification', None), + ('host_last_notification', None), + ('host_check_latency', None), + ('host_check_duration', None), + + # 4. Configuration + ('host_check_interval', None), + ('host_notifper', None), + ('host_contact_groups', None), + ('host_contacts', None), + ('host_group_memberlist', None), + ('host_servicelevel', None), + ('host_check_command', None), + ('host_custom_vars', None), + ('host_custom_notes', None), + ], 'public': True, 'show_filters': [], 'sorters': [], @@ -1214,41 +1224,47 @@ multisite_builtin_views.update({ 'name': 'service', 'num_columns': 1, 'owner': '', - 'painters': [('sitealias', None), - ('host', 'hoststatus'), - ('service_description', 'servicedesc'), - ('service_icons', None), - ('service_state', None), - ('svc_group_memberlist', None), - ('svc_servicelevel', None), - ('svc_contact_groups', None), - ('svc_contacts', None), - ('svc_plugin_output', None), - ('svc_long_plugin_output', None), - ('svc_perf_data', None), - ('perfometer', None), - ('svc_check_command', None), - ('svc_check_interval', None), - ('svc_attempt', None), - ('svc_notification_number', None), - ('svc_check_type', None), - ('svc_state_age', None), - ('svc_last_time_ok', None), - ('svc_check_age', None), - ('svc_next_check', None), - ('svc_next_notification', None), - ('svc_last_notification', None), - ('svc_check_latency', None), - ('svc_check_duration', None), - ('svc_in_downtime', None), - ('svc_in_notifper', None), - ('svc_notifper', None), - ('service_display_name', None), - ('svc_custom_vars', None), - ('check_manpage', None), - ('svc_custom_notes', None), - ('svc_pnpgraph', None), - ], + 'painters': [ + # 1. Identification and icons + ('sitealias', None), + ('host', 'hoststatus'), + ('service_description', 'servicedesc'), + ('service_icons', None), + + # 2. State and metrics + ('service_state', None), + ('svc_plugin_output', None), + ('svc_long_plugin_output', None), + ('perfometer', None), + ('svc_pnpgraph', None), + ('svc_perf_data', None), + ('svc_in_downtime', None), + ('svc_in_notifper', None), + + # 3. Runtime data, timestamps + ('svc_attempt', None), + ('svc_notification_number', None), + ('svc_state_age', None), + ('svc_check_age', None), + ('svc_next_check', None), + ('svc_next_notification', None), + ('svc_last_notification', None), + ('svc_last_time_ok', None), + ('svc_check_latency', None), + ('svc_check_duration', None), + + # 4. Configuration + ('svc_check_interval', None), + ('svc_notifper', None), + ('svc_contact_groups', None), + ('svc_contacts', None), + ('svc_group_memberlist', None), + ('svc_servicelevel', None), + ('svc_check_command', None), + ('svc_custom_vars', None), + ('check_manpage', None), + ('svc_custom_notes', None), + ], 'public': True, 'show_filters': [], 'sorters': [],

9 years, 6 months

Check_MK Git: check_mk: Hover graph now also works for hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: ba9b0073680893f742cef9cea7a450a027a54cc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba9b0073680893… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 10:45:06 2015 +0100 Hover graph now also works for hosts --- web/htdocs/metrics.py | 43 ++++++++++++++++++++++++++---------------- web/plugins/icons/builtin.py | 4 ++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 0f12db9..7065034 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -944,22 +944,36 @@ def page_show_graph(): # FIXME HACK TODO We don't have the current perfata and check command # here, but we only need it till metrics.render_svc_time_graph() does # not need these information anymore. - query = "GET services\n" \ - "Filter: host_name = %s\n" \ - "Filter: service_description = %s\n" \ - "Columns: perf_data check_command\n" % (host_name, service) + if service == "_HOST_": + query = "GET hosts\n" \ + "Filter: host_name = %s\n" \ + "Columns: perf_data check_command\n" % host_name + + else: + query = "GET services\n" \ + "Filter: host_name = %s\n" \ + "Filter: service_description = %s\n" \ + "Columns: perf_data check_command\n" % (host_name, service) html.live.set_only_sites([site]) data = html.live.query_row(query) html.live.set_only_sites(None) - row = { - 'site' : site, - 'host_name' : host_name, - 'service_description' : service, - 'service_perf_data' : data[0], - 'service_check_command' : data[1], - } + if service == "_HOST_": + row = { + 'site' : site, + 'host_name' : host_name, + 'host_perf_data' : data[0], + 'host_check_command' : data[1], + } + else: + row = { + 'site' : site, + 'host_name' : host_name, + 'service_description' : service, + 'service_perf_data' : data[0], + 'service_check_command' : data[1], + } # now try to render the graph with our graphing. If it is not possible, # add JS code to let browser fetch the PNP graph @@ -968,7 +982,7 @@ def page_show_graph(): end_time = time.time() start_time = end_time - 8 * 3600 - htmlcode = render_svc_time_graph(row, start_time, end_time, size=(30, 10), show_legend=False) + htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), show_legend=False, graph_id_prefix="hover") if htmlcode: html.write(htmlcode) return @@ -979,10 +993,7 @@ def page_show_graph(): # Fallback to PNP graph rendering host = pnp_cleanup(host_name) - if not service: - svc = "_HOST_" - else: - svc = pnp_cleanup(service) + svc = pnp_cleanup(service) site = html.site_status[site]["site"] if html.mobile: url = site["url_prefix"] + ("pnp4nagios/index.php?kohana_uri=/mobile/popup/%s/%s" % \ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 893718a..721bcee 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -195,13 +195,13 @@ def pnp_icon(row, what): url = "" import metrics - if not hasattr(metrics, 'render_graph_html') or what == 'host': + if not hasattr(metrics, 'render_graph_html'): # Directly ask PNP for all data, don't try to use the new graph fetching mechanism # to keep the number of single requests low hover_content_func = 'pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) else: hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ - (row['site'], row['host_name'], row['service_description']) + (row['site'], row['host_name'], row.get('service_description', '_HOST_')) return '<a href="%s" onmouseover="displayHoverMenu(event, %s)" ' \ 'onmouseout="hoverHide()">%s</a>' % (url, hover_content_func, html.render_icon('pnp', ''))

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015