Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#2978 FIX agent_appdynamics: fixed missing closing brackets for piggyback data

by Simon Betz

Module: check_mk Branch: master Commit: 3b2e77cdbff41198b8a3c4c0b30102a21f48a8d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b2e77cdbff411… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 9 16:53:38 2016 +0100 #2978 FIX agent_appdynamics: fixed missing closing brackets for piggyback data --- .werks/2978 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_appdynamics | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/2978 b/.werks/2978 new file mode 100644 index 0000000..da46a21 --- /dev/null +++ b/.werks/2978 @@ -0,0 +1,9 @@ +Title: agent_appdynamics: fixed missing closing brackets for piggyback data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455033110 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e853a3d..5d419df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -260,6 +260,7 @@ * 3070 FIX: windows agent: replaced a very costy section regarding installed software... * 3071 FIX: cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed... * 2990 FIX: netapp_api_vs_traffic: fixed incorrect CIFS latency... + * 2978 FIX: agent_appdynamics: fixed missing closing brackets for piggyback data Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/special/agent_appdynamics b/agents/special/agent_appdynamics index 6102ca9..1cddefe 100755 --- a/agents/special/agent_appdynamics +++ b/agents/special/agent_appdynamics @@ -193,3 +193,4 @@ for node, applications in grouped_data.iteritems(): else: output_items.append('%s:%s' % (name, value)) sys.stdout.write('|'.join(output_items) + '\n') +sys.stdout.write('<<<<>>>>\n')

8 years, 7 months

Updated bug entries #0858, #0859, #0860, #0861

by Bastian Kuhn

Module: check_mk Branch: master Commit: e114863bd7884d01ef1d6ae54f3f11cf2f02a895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e114863bd7884d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Feb 9 15:33:15 2016 +0100 Updated bug entries #0858, #0859, #0860, #0861 --- .bugs/858 | 9 +++++++++ .bugs/859 | 8 ++++++++ .bugs/860 | 8 ++++++++ .bugs/861 | 9 +++++++++ 4 files changed, 34 insertions(+) diff --git a/.bugs/858 b/.bugs/858 new file mode 100644 index 0000000..01ef58a --- /dev/null +++ b/.bugs/858 @@ -0,0 +1,9 @@ +Title: Discovery check lifes in history +Component: checks +State: open +Date: 2016-02-09 15:25:38 +Targetversion: 1.2.7 +Class: bug + +After Changing a rule like Diskstat Diskcovery mode and a re discovery every seams fine. But some times later the Check_MK Discovery Check +reports unchecked services. But if you then reschedule the Discovery Service by hand, everything is fine again diff --git a/.bugs/859 b/.bugs/859 new file mode 100644 index 0000000..24438f4 --- /dev/null +++ b/.bugs/859 @@ -0,0 +1,8 @@ +Title: Changing the output_format doesen't change the response header +Component: multisite +State: open +Date: 2016-02-09 15:28:09 +Targetversion: 1.2.7 +Class: bug + +If you change the output_format for example to json, the response header is still html diff --git a/.bugs/860 b/.bugs/860 new file mode 100644 index 0000000..55bea0f --- /dev/null +++ b/.bugs/860 @@ -0,0 +1,8 @@ +Title: Bug in Daily 08.02.16: Ackn doesn't work any more +Component: multisite +State: open +Date: 2016-02-09 15:29:25 +Targetversion: 1.2.7 +Class: bug + +It is not possible to acknowldge services anymore. Downtime works. The list of services was mit OK and CRIT services. diff --git a/.bugs/861 b/.bugs/861 new file mode 100644 index 0000000..ee540ec --- /dev/null +++ b/.bugs/861 @@ -0,0 +1,9 @@ +Title: Reshedule Checks only affects some services from the list +Component: checks +State: open +Date: 2016-02-09 15:31:09 +Targetversion: 1.2.7 +Class: bug + +Reshedule Active checks like HW/SW Inventory doesen't work at all. If you have for example 50 Services, only 12 where done. +So you have to do it multiple times until all checks are triggered

8 years, 7 months

cifs latency is reported in accumulated nanoseconds

by Andreas Boesl

Module: check_mk Branch: master Commit: ebb4e5c402d482c1b21c439fa418e1b4a997a19b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebb4e5c402d482… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 9 14:58:49 2016 +0100 cifs latency is reported in accumulated nanoseconds --- checks/netapp_api_vs_traffic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/netapp_api_vs_traffic b/checks/netapp_api_vs_traffic index 0cccff6..4fd48b2 100644 --- a/checks/netapp_api_vs_traffic +++ b/checks/netapp_api_vs_traffic @@ -54,8 +54,8 @@ def check_netapp_api_vs_traffic(item, _no_params, parsed): ("write_data", "fcp_write_data", "write data", 1, get_bytes_human_readable)]), "cifs:vserver": ("CIFS", - [ ("cifs_read_latency", "cifs_read_latency", "read latency", 0.000001, lambda x: "%.2f ms" % x), - ("cifs_write_latency", "cifs_write_latency", "write latency", 0.000001, lambda x: "%.2f ms" % x), + [ ("cifs_read_latency", "cifs_read_latency", "read latency", 0.000000001, lambda x: "%.2f ms" % (x * 1000)), + ("cifs_write_latency", "cifs_write_latency", "write latency", 0.000000001, lambda x: "%.2f ms" % (x * 1000)), ("cifs_read_ops", "cifs_read_ios", "read OPs", 1, int), ("cifs_write_ops", "cifs_write_ios", "write OPs", 1, int)]),

8 years, 7 months

htmllib: new helper for getting all variables with some prefix

by Mathias Kettner

Module: check_mk Branch: master Commit: be4b54aef9f49b2833aab684cf3c02b655e796b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be4b54aef9f49b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 9 10:33:35 2016 +0100 htmllib: new helper for getting all variables with some prefix --- web/htdocs/htmllib.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 26bba1a..4644683 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1204,6 +1204,13 @@ class html(GUITester): def all_vars(self): return self.vars + + def all_varnames_with_prefix(self, prefix): + for varname, value in self.vars.items(): + if varname.startswith(prefix): + yield varname + + # Return all values of a variable that possible occurs more # than once in the URL. note: self.listvars does contain those # variable only, if the really occur more than once.

8 years, 7 months

Add missing WATO folder filter to report contexts

by Mathias Kettner

Module: check_mk Branch: master Commit: 7af8dbfa59aca9821efb00ffbc159ea78b3d4984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7af8dbfa59aca9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:45:02 2016 +0100 Add missing WATO folder filter to report contexts --- web/htdocs/visuals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e9c991a..9751459 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1090,7 +1090,7 @@ class VisualFilterList(ListOfMultiple): self._filters = {} for info in self._infos: for fname, filter in filters_allowed_for_info(info).items(): - if fname not in fspecs and fname not in ubiquitary_filters: + if fname not in fspecs: # and fname not in ubiquitary_filters: fspecs[fname] = VisualFilter(fname, title = filter.title, )

8 years, 7 months

Fix name of filter variable for WATO filter - fixes editing contexts

by Mathias Kettner

Module: check_mk Branch: master Commit: cae08e79f9cd855d9f617e774910727220d645b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cae08e79f9cd85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:45:18 2016 +0100 Fix name of filter variable for WATO filter - fixes editing contexts --- web/plugins/visuals/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/wato.py b/web/plugins/visuals/wato.py index 716219c..5b1c814 100644 --- a/web/plugins/visuals/wato.py +++ b/web/plugins/visuals/wato.py @@ -28,7 +28,7 @@ import wato class FilterWatoFile(Filter): def __init__(self): - Filter.__init__(self, "wato_folder", _("WATO Folder"), "host", ["filename"], []) + Filter.__init__(self, "wato_folder", _("WATO Folder"), "host", ["wato_folder"], []) self.last_wato_data_update = None

8 years, 7 months

Put import bi again into plugins/views/painters.py

by Mathias Kettner

Module: check_mk Branch: master Commit: e473de76aa384c8d3042b8f3bb1b4238ba3ee157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e473de76aa384c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:40:11 2016 +0100 Put import bi again into plugins/views/painters.py This break an arkane exception --- web/htdocs/views.py | 2 +- web/plugins/views/painters.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index df3f5eb..babed74 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import config, defaults, livestatus, time, os, re, pprint, time -import weblib, traceback, forms, valuespec, inventory, visuals, metrics, bi +import weblib, traceback, forms, valuespec, inventory, visuals, metrics from lib import * # Datastructures and functions needed before plugins can be loaded diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d87d596..bb93b2e 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -62,6 +62,9 @@ # styles are not modular and all defined in check_mk.css. This will # change in future. +import bi # Needed for BI Icon. For arkane reasons (ask htdocs/module.py) this + # cannot be imported in views.py directly. + # .--Painter Options-----------------------------------------------------. # | ____ _ _ | # | | _ \ __ _(_)_ __ | |_ ___ _ __ |

8 years, 7 months

Add missing import bi after code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: bb83b9b1ea4ac3a7883f63dba2ab8cb3f66cac29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb83b9b1ea4ac3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:10:13 2016 +0100 Add missing import bi after code cleanup --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index babed74..df3f5eb 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import config, defaults, livestatus, time, os, re, pprint, time -import weblib, traceback, forms, valuespec, inventory, visuals, metrics +import weblib, traceback, forms, valuespec, inventory, visuals, metrics, bi from lib import * # Datastructures and functions needed before plugins can be loaded

8 years, 7 months

Updated bug entries #2419

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d7c22dd081bb57e6f766fff2a0ef1d4312d70b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d7c22dd081bb5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 15:56:39 2016 +0100 Updated bug entries #2419 --- .bugs/2419 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2419 b/.bugs/2419 new file mode 100644 index 0000000..6916b33 --- /dev/null +++ b/.bugs/2419 @@ -0,0 +1,13 @@ +Title: Missing contact group check-mk-notify when never been in WATO +Component: core +State: open +Date: 2016-02-08 15:55:13 +Targetversion: 1.2.8 +Class: bug + +1. Create a new site in the CEE +2. omd config set CORE nagios +3. cmk -R --> missing contact group check-mk-notiry + +When you now go in WATO (no need for changing something), it works +out. Seems that the default WATO configuration fixes that.

8 years, 7 months

Fix broken PNP graphs on CEE with Nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: da1a24323ec31d7de3d9811586af2b974fd13c2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da1a24323ec31d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:09:41 2016 +0100 Fix broken PNP graphs on CEE with Nagios core --- web/htdocs/metrics.py | 30 +++++++++++++++++++++++------- web/plugins/icons/builtin.py | 4 ++-- web/plugins/views/painters.py | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7927856..b6fd6ac 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1257,14 +1257,30 @@ def render_graph_pnp(graph_template, translated_metrics): # '----------------------------------------------------------------------' -def cmk_graphs_possible(): +def cmk_graphs_possible(site_id = None): try: - render_graph_html - return not config.force_pnp_graphing and browser_supports_canvas() and not html.is_mobile() + render_graph_html # Will throw exception if missing + return not config.force_pnp_graphing \ + and browser_supports_canvas() \ + and site_is_running_cmc(site_id) \ + and not html.is_mobile() except: return False +# If site_id is None then we return True if at least +# one site is running CMC +def site_is_running_cmc(site_id): + if site_id: + return site_id in html.site_status \ + and html.site_status[site_id].get("program_version").startswith("Check_MK") + else: + for status in html.site_status.values(): + if status.get("program_version").startswith("Check_MK"): + return True + return False + + def browser_supports_canvas(): user_agent = html.get_user_agent() if 'MSIE' in user_agent: @@ -1327,14 +1343,14 @@ def get_graph_template_by_source(graph_templates, source): # This page is called for the popup of the graph icon of hosts/services. def page_host_service_graph_popup(): - site = html.var('site') + site_id = html.var('site') host_name = html.var('host_name') service_description = html.var('service') - if cmk_graphs_possible(): - host_service_graph_popup_cmk(site, host_name, service_description) + if cmk_graphs_possible(site_id): + host_service_graph_popup_cmk(site_id, host_name, service_description) else: - host_service_graph_popup_pnp(site, host_name, service_description) + host_service_graph_popup_pnp(site_id, host_name, service_description) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 7ea856d..9962507 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -344,7 +344,7 @@ def pnp_graph_icon_link(row, what): if 'X' not in html.display_options: return "" - if not metrics.cmk_graphs_possible(): + if not metrics.cmk_graphs_possible(row["site"]): return pnp_url(row, what) else: return new_graphing_url(row, what) @@ -353,7 +353,7 @@ def pnp_graph_icon_link(row, what): def pnp_icon(row, what): url = pnp_graph_icon_link(row, what) - if not metrics.cmk_graphs_possible(): + if not metrics.cmk_graphs_possible(row["site"]): # 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 = 'fetch_pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 221fc93..d87d596 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -917,7 +917,7 @@ multisite_painters["svc_group_memberlist"] = { } def paint_time_graph(row): - if metrics.cmk_graphs_possible(): + if metrics.cmk_graphs_possible(row["site"]): return paint_time_graph_cmk(row) else: return paint_time_graph_pnp(row)

8 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016