Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 3f07a79d94cfbc0ed80b9628b70da9f7eafcd9d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f07a79d94cfbc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 27 08:23:23 2016 +0100 Added clang-analyzer target. --- .gitignore | 1 + Makefile | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2a4812c..d169491 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ api check_mk-*.spec check_mk-*.tar.gz +clang-analyzer/ mk-livestatus-*.tar.gz mkeventd-*.tar.gz check-mk-*.exe diff --git a/Makefile b/Makefile index 9bb769b..b537777 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,9 @@ DISTNAME := $(NAME)-$(VERSION) TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 -CLANG_FORMAT := clang-format-3.7 +CLANG_VERSION := 3.8 +CLANG_FORMAT := clang-format-$(CLANG_VERSION) +SCAN_BUILD := scan-build-$(CLANG_VERSION) CPPCHECK := cppcheck DOXYGEN := doxygen IWYU := include-what-you-use @@ -67,9 +69,9 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix mkeventd/src/,*.cc *.c *.h)) .PHONY: all check-binaries check check-permissions check-spaces check-version \ - clean cppcheck dist documentation format headers healspaces help iwyu \ - minify-js mk-eventd mk-livestatus mrproper optimize-images packages \ - setup setversion version + clang-analyzer clean cppcheck dist documentation format headers \ + healspaces help iwyu minify-js mk-eventd mk-livestatus mrproper \ + optimize-images packages setup setversion version all: dist packages @@ -260,6 +262,11 @@ iwyu: $(MAKE) -C livestatus clean $(MAKE) -C livestatus CC=$(IWYU) CXX=$(IWYU) -k +# Not really perfect rules, but better than nothing +clang-analyzer: + $(MAKE) -C livestatus clean + cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) + cppcheck: $(CPPCHECK) --quiet --enable=all --max-configs=20 --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus

8 years, 7 months

fixed missing item in new check_temperature function

by Simon Betz

Module: check_mk Branch: master Commit: af4765551bc24e50da5aec551fdba76afe8eea04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af4765551bc24e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 26 17:34:40 2016 +0100 fixed missing item in new check_temperature function --- checks/checkpoint_temp | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/checkpoint_temp b/checks/checkpoint_temp index e3cd058..1d2db1e 100644 --- a/checks/checkpoint_temp +++ b/checks/checkpoint_temp @@ -44,6 +44,7 @@ def check_checkpoint_temp(item, params, info): if format_item_checkpoint_temp(name) == item: unit = unit.replace("degree", "").strip().lower() return check_temperature(float(value), params, + "checkpoint_temp_%s" % item, dev_unit=unit, dev_status=checkpoint_sensorstatus_to_nagios[dev_status])

8 years, 7 months

Only show button to graph collections in CEE

by Mathias Kettner

Module: check_mk Branch: master Commit: e2144a2d08813a785f6e312227fecb6ec6c72c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2144a2d08813a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 26 17:11:16 2016 +0100 Only show button to graph collections in CEE --- web/htdocs/visuals.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 990d6c1..ac9da08 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -281,8 +281,10 @@ def page_list(what, title, visuals, custom_columns = [], html.context_button(info["plural_title"].title(), 'edit_%s.py' % other_what, other_what[:-1]) # TODO: We hack in those visuals that already have been moved to pagetypes here - html.context_button(_("Graph Collections"), "graph_collections.py", "graph_collection") - html.context_button(_("Custom Graphs"), "custom_graphs.py", "custom_graph") + if pagetypes.has_page_type("graph_collection"): + html.context_button(_("Graph Collections"), "graph_collections.py", "graph_collection") + if pagetypes.has_page_type("custom_graph"): + html.context_button(_("Custom Graphs"), "custom_graphs.py", "custom_graph") html.context_button(_("Bookmark Lists"), "bookmark_lists.py", "bookmark_list") html.end_context_buttons()

8 years, 7 months

Refactoring: New intermediate step of graphs, initial paint works

by Mathias Kettner

Module: check_mk Branch: master Commit: 97487e28cdd0a50c23964500f2c383318bb4767f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97487e28cdd0a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 25 14:50:52 2016 +0100 Refactoring: New intermediate step of graphs, initial paint works --- web/htdocs/index.py | 1 + web/htdocs/js/checkmk.js | 10 ++++- web/htdocs/metrics.py | 100 +++++++++++++++-------------------------- web/plugins/icons/builtin.py | 4 +- web/plugins/views/painters.py | 43 ++++++++++++++---- 5 files changed, 82 insertions(+), 76 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=97487e28cd…

8 years, 7 months

New hidden Multisite option force_pnp_graphing for forcing to use PNP

by Mathias Kettner

Module: check_mk Branch: master Commit: eae5d7e2b6cd3107a29ddcc485df96028f390a15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae5d7e2b6cd31… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 26 16:52:36 2016 +0100 New hidden Multisite option force_pnp_graphing for forcing to use PNP Even if CMK graphing is present --- web/htdocs/metrics.py | 2 +- web/plugins/config/builtin.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 31059fd..585ce68 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1219,7 +1219,7 @@ def render_graph_pnp(graph_template, translated_metrics): def cmk_graphs_possible(): try: render_graph_html - return browser_supports_canvas() and not html.is_mobile() + return not config.force_pnp_graphing and browser_supports_canvas() and not html.is_mobile() except: return False diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c3eee92..f6e8fd4 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -210,6 +210,9 @@ escape_plugin_output = True # Virtual host trees for the "Virtual Host Trees" snapin virtual_host_trees = [] +# Fall back to PNP4Nagios as graphing GUI even on CEE +force_pnp_graphing = False + # Target email address for "Crashed Check" page crash_report_target = "feedback(a)check-mk.org"

8 years, 7 months

Remove bogus debug message from recent commit

by Mathias Kettner

Module: check_mk Branch: master Commit: 11a04b7ca961a38ac4ab0ec7adc8793c8d1a9771 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11a04b7ca961a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 26 16:39:23 2016 +0100 Remove bogus debug message from recent commit --- web/htdocs/visuals.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 0d9a740..990d6c1 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1382,7 +1382,6 @@ def transform_old_visual(visual): # TODO: Remove this code as soon as everything is moved over to pagetypes.py def ajax_popup_add(): add_type = html.var("add_type") - html.debug(add_type) html.write("<ul>") pagetypes.render_addto_popup(add_type)

8 years, 7 months

Rename function create_graph in JS in order to avoid name conflict

by Mathias Kettner

Module: check_mk Branch: master Commit: 5733fa298c4a064afaf1218adeecec6e74e1824c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5733fa298c4a06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 26 16:39:48 2016 +0100 Rename function create_graph in JS in order to avoid name conflict --- web/htdocs/js/checkmk.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 3364329..706c580 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -713,7 +713,7 @@ function pnp_response_handler(data, code) { response = eval(code); for(var i = 0; i < response.length; i++) { var view = data['view'] == '' ? '0' : data['view']; - create_graph(data, '&' + response[i]['image_url'].replace('#', '%23').replace('&view='+view, '')); + create_pnp_graph(data, '&' + response[i]['image_url'].replace('#', '%23').replace('&view='+view, '')); } view = null; i = null; @@ -739,11 +739,11 @@ function pnp_response_handler(data, code) { // Fallback bei doofer/keiner Antwort function fallback_graphs(data) { for(var s = 0; s < 8; s++) { - create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + s); + create_pnp_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + s); } } -function create_graph(data, params) { +function create_pnp_graph(data, params) { var urlvars = params + '&theme=multisite&baseurl='+data['base_url']; if (typeof(data['start']) !== 'undefined' && typeof(data['end']) !== 'undefined')

8 years, 7 months

#2983 FIX netapp_api_disk: fixed exception when disks were not included in the raid

by Andreas Boesl

Module: check_mk Branch: master Commit: 6529c89ac1efafc0fb2ebb09dd0b89422f667c71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6529c89ac1efaf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 26 16:21:52 2016 +0100 #2983 FIX netapp_api_disk: fixed exception when disks were not included in the raid Some disks on the netapp filer have the raid-state set to unknown and had no physical space information available. The check was unable to handle this. --- .werks/2983 | 10 ++++++++++ ChangeLog | 1 + checks/filerdisks.include | 2 +- checks/netapp_api_disk | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2983 b/.werks/2983 new file mode 100644 index 0000000..5a2ce7b --- /dev/null +++ b/.werks/2983 @@ -0,0 +1,10 @@ +Title: netapp_api_disk: fixed exception when disks were not included in the raid +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453821511 +Class: fix + +Some disks on the netapp filer have the raid-state set to unknown and +had no physical space information available. The check was unable to handle this. diff --git a/ChangeLog b/ChangeLog index 8cb7aec..0895767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,6 +223,7 @@ * 2961 FIX: tsm_sessions: Fixed crash in cae of client name contains spaces * 2962 FIX: esx_vsphere_vm.guest_tools: Fixed exception in case no version info is available * 2963 FIX: esx_vsphere_datastores: Deal with empty url attribute of datastores + * 2983 FIX: netapp_api_disk: fixed exception when disks were not included in the raid... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/filerdisks.include b/checks/filerdisks.include index 2361f71..f8ef316 100644 --- a/checks/filerdisks.include +++ b/checks/filerdisks.include @@ -47,7 +47,7 @@ def check_filer_disks(disks, params): prefaild_parity_disk_count = 0 for disk in disks: - total_capacity += disk["capacity"] + total_capacity += disk.get("capacity", 0) for what in state.keys(): if disk['state'] == what: state[what].append(disk) diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index e2e148b..0ea87bb 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -57,6 +57,8 @@ def check_netapp_api_disk_summary(_no_item, params, info): disk_info = "Serial: %s" % disk.get("serial-number") if "physical-space" in disk: disk_info += ", Size: %s" % get_bytes_human_readable(int(disk["physical-space"])) + disk['capacity'] = int(disk['physical-space']) + disk['identifier'] = disk_info disk['type'] = False raid_type = disk.get("raid-type") @@ -73,7 +75,6 @@ def check_netapp_api_disk_summary(_no_item, params, info): disk['state'] = "spare" else: disk['state'] = 'ok' - disk['capacity'] = int(disk['physical-space']) disks_converted.append(disk)

8 years, 7 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: f865e825981c553bd2495e9ae1b5e5fe7f14245e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f865e825981c55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 26 16:17:35 2016 +0100 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bf2403c..51e9712 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2983 +3033

8 years, 7 months

websphere_mq_channels: slightly cleaned up wato rule

by Sebastian Herbord

Module: check_mk Branch: master Commit: 55e61c9d4cc829f3348f863f8ff4beabffd26b78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55e61c9d4cc829… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jan 26 14:58:14 2016 +0100 websphere_mq_channels: slightly cleaned up wato rule --- web/plugins/wato/check_parameters.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b773905..030243f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -299,7 +299,7 @@ def transform_websphere_mq(source): register_check_parameters( subgroup_applications, "websphere_mq", - _("Maximum number of messages in Websphere Message Queues"), + _("Websphere Message Queues"), Transform( Dictionary( elements = [ @@ -313,7 +313,7 @@ register_check_parameters( )), ("status", Dictionary( - title = _('Override check state based on channel state'), + title = _('Override check state based on channel state (only for channels)'), elements = [ ("STOPPED", MonitoringState( title = _("State when channel is stopped"), @@ -331,7 +331,6 @@ register_check_parameters( optional_keys = [] )), ], - optional_keys = ["status"] ), forth = transform_websphere_mq ),

8 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016