Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Added a Makefile target to generate a clang compilation database.

by Sven Panne

Module: check_mk Branch: master Commit: 11417c11f297fa669c611f20c502aec25641e48d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11417c11f297fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 3 11:11:23 2016 +0100 Added a Makefile target to generate a clang compilation database. --- .gitignore | 1 + Makefile | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d169491..1fc2593 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ api check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ +compile_commands.json mk-livestatus-*.tar.gz mkeventd-*.tar.gz check-mk-*.exe diff --git a/Makefile b/Makefile index 1ba1f5f..aa2e4bc 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ SCAN_BUILD := scan-build-$(CLANG_VERSION) CPPCHECK := cppcheck DOXYGEN := doxygen IWYU := include-what-you-use +BEAR := bear-fixed # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ @@ -245,7 +246,7 @@ minify-js: fi clean: - rm -rf api clang-analyzer dist.tmp rpm.topdir *.rpm *.deb *.exe \ + rm -rf api clang-analyzer compile_commands.json dist.tmp rpm.topdir *.rpm *.deb *.exe \ mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js @@ -255,7 +256,11 @@ mrproper: git clean -xfd -e .bugs 2>/dev/null || git clean -xfd setup: - sudo apt-get install figlet pngcrush slimit + sudo apt-get install figlet pngcrush slimit bear + +compile_commands.json: $(FILES_TO_FORMAT) + $(MAKE) -C livestatus clean + $(BEAR) $(MAKE) -C livestatus -j8 # Not really perfect rules, but better than nothing iwyu:

8 years, 7 months

Custom graphs can now be added to dashboards using the context menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d4411f4513f870f022416efe982b65721dfede8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d4411f4513f87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 11:04:26 2016 +0100 Custom graphs can now be added to dashboards using the context menu --- web/htdocs/dashboard.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9472325..8d4d5f8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1249,20 +1249,31 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): return if dashlet_type == "pnpgraph": - # Context will always be None here, but the graph reference (in params) - # will contain it. Example: + # Context will always be None here, but the graph_specification (in params) + # will contain it. Transform the data to the format needed by the dashlets. + # Example: # params = [ 'template', {'service_description': 'CPU load', 'site': 'mysite', # 'graph_index': 0, 'host_name': 'server123'}]) - graph_info = params[1] + graph_specification = params[1] if params[0] == "template": context = { - "host" : graph_info["host_name"] + "host" : graph_specification["host_name"] } - if graph_info.get("service_description") != "_HOST_": - context["service"] = graph_info["service_description"] + if graph_specification.get("service_description") != "_HOST_": + context["service"] = graph_specification["service_description"] params = { - "source" : graph_info["graph_index"] + 1 + "source" : graph_specification["graph_index"] + 1 + } + + elif params[0] == "custom": + # Override the dashlet type here. It would be better to get the + # correct dashlet type from the menu. But this does not seem to + # be a trivial change. + dashlet_type = "custom_graph" + context = {} + params = { + "custom_graph": params[1], } @@ -1286,8 +1297,9 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): # save the original context and override the context provided by the view context = dashlet['context'] load_view_into_dashlet(dashlet, len(dashboard['dashlets']), view_name, add_context=context) - elif dashlet_type == "pnpgraph": - # The "add to visual" popup does not provide a timerang information, + + elif dashlet_type in [ "pnpgraph", "custom_graph" ]: + # The "add to visual" popup does not provide a timerange information, # but this is not an optional value. Set it to 25h initially. dashlet.setdefault("timerange", "1")

8 years, 7 months

When a timeperiod check in Check_MK modules fails now assume active, not inactive

by Mathias Kettner

Module: check_mk Branch: master Commit: fe8aeafe32f7bdd7d76ee298c37be1a72f7d9d5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe8aeafe32f7bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 3 10:45:02 2016 +0100 When a timeperiod check in Check_MK modules fails now assume active, not inactive This is e.g. used during notifications. If for any reason the core does not work during a notification then we better assume that all timeperiods are active so in this error case users will rather get too many notifications than too few. --- 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 67c20ac..dcc3d20 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2283,7 +2283,7 @@ def check_timeperiod(timeperiod): raise else: # If the query is not successful better skip this check then fail - return False + return True return timeperiod not in g_inactive_timerperiods

8 years, 7 months

Remove bogus unused debug function in prediction.py

by Mathias Kettner

Module: check_mk Branch: master Commit: 02bb96592f8e71db43e06a63671d23fbce8da008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02bb96592f8e71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 3 10:43:15 2016 +0100 Remove bogus unused debug function in prediction.py --- modules/prediction.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index 0101b99..80b84fa 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -29,9 +29,6 @@ # Export data from an RRD file. This requires an up-to-date # version of the rrdtools. -def debug(x): - import pprint ; pprint.pprint(x) - def rrd_export(filename, ds, cf, fromtime, untiltime, rrdcached=None): # rrdtool xport --json -s 1361554418 -e 1361640814 --step 60 DEF:x=/omd/sites/heute/X.rrd:1:AVERAGE XPORT:x:HIRNI cmd = "rrdtool xport --json -s %d -e %d --step 60 " % (fromtime, untiltime) @@ -64,6 +61,7 @@ def rrd_export(filename, ds, cf, fromtime, untiltime, rrdcached=None): return data["meta"]["step"], [ x[0] for x in data["data"] ] + def find_ds_in_pnp_xmlfile(xml_file, varname): ds = None name = None @@ -83,6 +81,7 @@ def find_ds_in_pnp_xmlfile(xml_file, varname): ds = None name = None + def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime): global rrdcached_socket rrd_base = "%s/%s/%s" % (rrd_path, pnp_cleanup(hostname), @@ -110,6 +109,7 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime rrdcached_socket = omd_root + "/tmp/run/rrdcached.sock" return rrd_export(rrd_file, ds, cf, fromtime, untiltime, rrdcached_socket) + daynames = [ "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"]

8 years, 7 months

Extracted small Livestatus function for general purpose

by Mathias Kettner

Module: check_mk Branch: master Commit: 541ec43a88006008d9551a8ff2937020c04ab949 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=541ec43a880060… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 3 10:45:28 2016 +0100 Extracted small Livestatus function for general purpose --- modules/check_mk_base.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dcc3d20..de317e4 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2262,6 +2262,24 @@ def camelcase_to_underscored(name): result += c return result + +# Return plain response from local Livestatus - without any parsing +def simple_livestatus_query(lql): + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(livestatus_unix_socket) + # We just get the currently inactive timeperiods. All others + # (also non-existing) are considered to be active + s.send(lql) + s.shutdown(socket.SHUT_WR) + response = "" + while True: + chunk = s.recv(4096) + if not chunk: + break + response += chunk + return response + + # Check if a timeperiod is currently active. We have no other way than # doing a Livestatus query. This is not really nice, but if you have a better # idea, please tell me... @@ -2270,14 +2288,8 @@ def check_timeperiod(timeperiod): # Let exceptions happen, they will be handled upstream. if g_inactive_timerperiods == None: try: - import socket - s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - s.connect(livestatus_unix_socket) - # We just get the currently inactive timeperiods. All others - # (also non-existing) are considered to be active - s.send("GET timeperiods\nColumns: name\nFilter: in = 0\n") - s.shutdown(socket.SHUT_WR) - g_inactive_timerperiods = s.recv(10000000).splitlines() + response = simple_livestatus_query("GET timeperiods\nColumns: name\nFilter: in = 0\n") + g_inactive_timerperiods = response.splitlines() except Exception, e: if opt_debug: raise @@ -2287,6 +2299,7 @@ def check_timeperiod(timeperiod): return timeperiod not in g_inactive_timerperiods + # retrive the service level that applies to the calling check. def get_effective_service_level(): service_levels = service_extra_conf(g_hostname, g_service_description,

8 years, 7 months

Generalized dashlet graph rendering code

by Lars Michelsen

Module: check_mk Branch: master Commit: fac03e9aa9ccb4aca1c49662bc4db839553db3f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fac03e9aa9ccb4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 10:45:04 2016 +0100 Generalized dashlet graph rendering code --- web/htdocs/metrics.py | 40 ++++++++++++++++++------------------- web/plugins/dashboard/dashlets.py | 36 ++++++++++++++++++++++----------- web/plugins/pages/shipped.py | 2 +- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 4b9132e..d755f45 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1351,22 +1351,25 @@ def host_service_graph_popup_pnp(site, host_name, service_description): # | This page handler is called by graphs embedded in a dashboard. | # '----------------------------------------------------------------------' -def page_host_service_graph_dashlet(): +def page_graph_dashlet(): + spec = html.var("spec") + if not spec: + raise MKUserError("spec", _("Missing spec parameter")) + + graph_specification = json.loads(html.var("spec")) + if cmk_graphs_possible(): - func = host_service_graph_dashlet_cmk + host_service_graph_dashlet_cmk(graph_specification) + elif graph_specification[0] == "template": + host_service_graph_dashlet_pnp(graph_specification) else: - func = host_service_graph_dashlet_pnp - - site = html.var('site') - host_name = html.var('host_name') - service_description = html.var('service') - source = int(html.var("source")) - return func(site, host_name, service_description, source) + html.write(_("This graph can not be rendered.")) -def host_service_graph_dashlet_cmk(site, host_name, service_description, source): +def host_service_graph_dashlet_cmk(graph_specification): size = (int(((float(html.var("width")) - 49 - 5)/html_size_per_ex)), int((float(html.var("height")) - 23)/html_size_per_ex)) + graph_render_options = { "size" : size, "font_size" : 8, @@ -1375,26 +1378,23 @@ def host_service_graph_dashlet_cmk(site, host_name, service_description, source) "resizable" : False, } + # FIXME: html.var("timerange") ??? end_time = time.time() start_time = end_time - 8 * 3600 graph_data_range = { "time_range" : (start_time, end_time), } - graph_specification = ( - "template", { - "site" : site, - "host_name" : host_name, - "service_description" : service_description, - }) - html_code = render_graphs_from_specification_html(graph_specification, graph_data_range, graph_render_options) html.write(html_code) -def host_service_graph_dashlet_pnp(site, host_name, service_description, source): - pnp_host = pnp_cleanup(host_name) - pnp_svc = pnp_cleanup(service_description) +def host_service_graph_dashlet_pnp(graph_specification): + site = graph_specification[1]["site"] + source = int(graph_specification[1]["graph_index"]) + + pnp_host = pnp_cleanup(graph_specification[1]["host_name"]) + pnp_svc = pnp_cleanup(graph_specification[1]["service_description"]) url_prefix = html.site_status[site]["site"]["url_prefix"] html.write(url_prefix + "pnp4nagios/index.php/image?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 2331d77..0b32df7 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -24,6 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +try: + import simplejson as json +except ImportError: + import json + # .--Overview------------------------------------------------------------. # | ___ _ | # | / _ \__ _____ _ ____ _(_) _____ __ | @@ -361,8 +366,15 @@ def dashlet_graph_reload_js(nr, dashlet): # configured. So we assume the default timerange here by default. timerange = dashlet.get('timerange', '1') - return 'dashboard_render_graph(%d, \'%s\', \'%s\', \'%s\', \'%s\', \'%s\')' % \ - (nr, site, host, service, dashlet["source"], timerange) + graph_specification = ("template", { + "site" : site, + "host_name" : host, + "service_description" : service, + "graph_index" : dashlet["source"] -1, + }) + + return "dashboard_render_graph(%d, %s, '%s')" % \ + (nr, json.dumps(graph_specification), timerange) dashlet_types["pnpgraph"] = { @@ -410,22 +422,22 @@ dashlet_types["pnpgraph"] = { "on_refresh" : dashlet_graph_reload_js, "script": """ var dashlet_offsets = {}; -function dashboard_render_graph(nr, site, host_name, service, source, timerange) +function dashboard_render_graph(nr, graph_specification, timerange) { // Get the target size for the graph from the inner dashlet container var inner = document.getElementById('dashlet_inner_' + nr); var c_w = inner.clientWidth; var c_h = inner.clientHeight; - call_ajax("host_service_graph_dashlet.py?site="+encodeURIComponent(site) - +"&host_name="+encodeURIComponent(host_name) - +"&service="+encodeURIComponent(service) - +"&source="+encodeURIComponent(source) - +"&timerange="+encodeURIComponent(timerange) - +"&width="+c_w - +"&height="+c_h - +"&id="+nr - +"&what=dashlet", { + var post_data = "spec=" + encodeURIComponent(JSON.stringify(graph_specification)) + + "&timerange=" + encodeURIComponent(timerange) + + "&width=" + c_w + + "&height=" + c_h + + "&id=" + nr; + + call_ajax("graph_dashlet.py", { + post_data : post_data, + method : "POST", response_handler : handle_dashboard_render_graph_response, handler_data : nr, }); diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 1795ab0..477fcb1 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -64,7 +64,7 @@ pagehandlers.update({ "view" : views.page_view, "ajax_inv_render_tree" : views.ajax_inv_render_tree, "host_service_graph_popup" : metrics.page_host_service_graph_popup, - "host_service_graph_dashlet" : metrics.page_host_service_graph_dashlet, + "graph_dashlet" : metrics.page_graph_dashlet, "ajax_set_rowselection" : weblib.ajax_set_rowselection, "prediction_graph" : prediction.page_graph, "logwatch" : logwatch.page_show,

8 years, 7 months

fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: cf17c711c96ae1e7cb017c1868e36a57280074db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf17c711c96ae1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 3 10:29:16 2016 +0100 fixed typo --- agents/special/agent_netapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index b54e2b7..ea614f4 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -683,7 +683,7 @@ else: snapshots_elements = volume_snapshots.child_get("snapshots") if snapshots_elements: print format_dict(dict_reserved, prefix = "volume_snapshot %s" % name, as_line = True) - print format_config(snapshot_elements, "volume_snapshot", name, + print format_config(snapshots_elements, "volume_snapshot", name, config_report = ["volume_snapshot", "percentage-of-total-blocks", "cumulative-total"])

8 years, 7 months

#2988 check_mk_agent.aix: now provides infos for postfix mailq check

by Andreas Boesl

Module: check_mk Branch: master Commit: 6c1496f73571e7d41497ef832b6dc9fab97310e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c1496f73571e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 3 10:24:44 2016 +0100 #2988 check_mk_agent.aix: now provides infos for postfix mailq check --- .werks/2988 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2988 b/.werks/2988 new file mode 100644 index 0000000..47c58f1 --- /dev/null +++ b/.werks/2988 @@ -0,0 +1,9 @@ +Title: check_mk_agent.aix: now provides infos for postfix mailq check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454491443 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a72c685..154ae82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * 2985 MongoDB: Introduced agent plugin and some checks... * 2457 mssql_counters.sqlstats: New check to monitor several rates from the SQL statistics object * 2941 tinkerforge, tinkerforge.ambient, tinkerforge.humidity, tinkerforge.motion, tinkerforge.temperature: new checks to monitor tinkerforge sensors... + * 2988 check_mk_agent.aix: now provides infos for postfix mailq check * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7a4f35f..31be60b 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -217,6 +217,11 @@ then $(which trd) -s fi +if [ -x /usr/sbin/sendmail ] ; then + echo '<<<postfix_mailq>>>'; + mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6 +fi + # uptime formats # 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 --> 9147600 # 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 --> 9150360

8 years, 7 months

Remove bogus log entry in graphing

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ce17fded1756aef1875eda969a72d2f3e50a2c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ce17fded1756a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 3 10:10:55 2016 +0100 Remove bogus log entry in graphing --- web/htdocs/metrics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 8bae21d..4b9132e 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1389,7 +1389,6 @@ def host_service_graph_dashlet_cmk(site, host_name, service_description, source) }) html_code = render_graphs_from_specification_html(graph_specification, graph_data_range, graph_render_options) - html.log(html_code) html.write(html_code)

8 years, 7 months

Fix adding graphs to dashboards

by Mathias Kettner

Module: check_mk Branch: master Commit: 50b04e8240189032b01272552db44488da1431b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b04e82401890… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 3 10:06:46 2016 +0100 Fix adding graphs to dashboards --- web/htdocs/dashboard.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index caed08f..9472325 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1248,6 +1248,24 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): # Exceptions do not work here. return + if dashlet_type == "pnpgraph": + # Context will always be None here, but the graph reference (in params) + # will contain it. Example: + + # params = [ 'template', {'service_description': 'CPU load', 'site': 'mysite', + # 'graph_index': 0, 'host_name': 'server123'}]) + graph_info = params[1] + if params[0] == "template": + context = { + "host" : graph_info["host_name"] + } + if graph_info.get("service_description") != "_HOST_": + context["service"] = graph_info["service_description"] + params = { + "source" : graph_info["graph_index"] + 1 + } + + load_dashboards(lock=True) if dashboard_name not in available_dashboards:

8 years, 7 months

← Newer
1
...
33
34
35
36
37
38
39
40
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