Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Updated bug entries #2332

by Mathias Kettner

Module: check_mk Branch: master Commit: ad1a1dede0be451df967793de911aa3336dc15e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad1a1dede0be45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 20 10:51:56 2015 +0200 Updated bug entries #2332 --- .bugs/2332 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2332 b/.bugs/2332 new file mode 100644 index 0000000..fce4220 --- /dev/null +++ b/.bugs/2332 @@ -0,0 +1,13 @@ +Title: Add button in host details for creating a manual check for this host +Component: wato +State: open +Date: 2015-04-20 10:44:05 +Targetversion: future +Class: nastiness + +Due to the movement of the manual checks into a new WATO module it is +not longer possible to create a manual check right from the host details. +We could add a button [Manual Checks] here, that bringst you to the +WATO module for manual checks - while keeping the host context. Wehn +you select a rule set you would then see the green balls and have a but +for creating a rule for that specific host.

9 years, 5 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: b2a625e598043cf161e98fd8c4c922e463afb81b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a625e598043c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 20 10:43:56 2015 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 862a8b3..4f98fcf 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2332 +2342

9 years, 5 months

Check_MK Git: check_mk: Use smaller font for hover graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a117031ff745dbd876952421ec3c1e009b91c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a117031ff745d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 19 17:17:19 2015 +0200 Use smaller font for hover graphs --- web/htdocs/metrics.py | 2 +- web/plugins/icons/builtin.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 8e1cc3f..e1a17d3 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -985,7 +985,7 @@ def page_show_graph(): end_time = time.time() start_time = end_time - 8 * 3600 - htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), show_legend=False, graph_id_prefix="hover") + htmlcode = render_time_graph(row, start_time, end_time, size=(30, 10), font_size=8, show_legend=False, graph_id_prefix="hover") if htmlcode: html.write(htmlcode) return diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 1ebb244..4865126 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -232,6 +232,7 @@ def pnp_icon(row, what): else: url = "" + # TODO: Import in function is not good import metrics if not hasattr(metrics, 'render_graph_html'): # Directly ask PNP for all data, don't try to use the new graph fetching mechanism

9 years, 5 months

Check_MK Git: check_mk: Fixed wrong js file names

by Lars Michelsen

Module: check_mk Branch: master Commit: de74df3b03034a8c2acf65b6f3b3bea88569332f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de74df3b03034a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 19:37:37 2015 +0200 Fixed wrong js file names --- web/htdocs/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5a24940..857f142 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -794,9 +794,9 @@ class html: for js in [ "checkmk", "graphs" ] + javascripts: if defaults.omd_root: if os.path.exists(defaults.omd_root + "/share/check_mk/web/htdocs/js/" + js + ".js"): - fname = '%s-%s.js' % (js, defaults.check_mk_version) + fname = '%s-%s' % (js, defaults.check_mk_version) else: - fname = '%s.js' % js + fname = '%s' % js self.javascript_file(fname) if self.browser_reload != 0:

9 years, 5 months

Check_MK Git: check_mk: More javascript code cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: faa6643e972310902bb8a880329435aa860a2190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faa6643e972310… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 18:26:44 2015 +0200 More javascript code cleanups --- web/htdocs/htmllib.py | 14 ++- web/htdocs/js/bi.js | 148 -------------------------- web/htdocs/js/checkmk.js | 238 ++++++++++++++++++++++++++++++++++++++++++ web/htdocs/js/hover.js | 155 --------------------------- web/htdocs/views.py | 2 +- web/plugins/icons/builtin.py | 4 +- 6 files changed, 247 insertions(+), 314 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=faa6643e97…

9 years, 5 months

Check_MK Git: check_mk: fixed styling of pnpgraphs ; closing popup menus when clicking trigger again

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ebca8e42244640bde7a6cae35dbfa8244841574 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ebca8e4224464… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 18:40:09 2015 +0200 fixed styling of pnpgraphs ; closing popup menus when clicking trigger again --- web/htdocs/js/checkmk.js | 14 ++++++++------ web/htdocs/pages.css | 6 +++--- web/htdocs/status.css | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b02172c..8b74e35 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -738,7 +738,7 @@ function create_graph(data, params) { if (data.with_link) { var graph_container = document.createElement('div'); - graph_container.setAttribute('class', 'graph') + graph_container.setAttribute('class', 'pnp_graph') var view = data['view'] == '' ? 0 : data['view']; // needs to be extracted from "params", hack! @@ -2395,11 +2395,13 @@ function toggle_popup(event, trigger_obj, ident, what, data, params) event = window.event; var container = trigger_obj.parentNode; - close_popup(); - - if (popup_id === ident) { - popup_id = null; - return; // same icon clicked: just close the menu + if (popup_id) { + if (popup_id === ident) { + close_popup(); + return; // same icon clicked: just close the menu + } else { + close_popup(); + } } popup_id = ident; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 8fc894b..4e16d96 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1101,7 +1101,7 @@ table.debug_vars td { /* Popup for adding to visuals (Dashboard, Reports */ -div.graph, div.popup_trigger { +div.pnp_graph, div.popup_trigger { position: relative; } @@ -1109,7 +1109,7 @@ div.popup_trigger { display: inline-block; } -div.graph a.popup_trigger { +div.pnp_graph a.popup_trigger { position: absolute; top: 10px; left: 10px; @@ -1120,7 +1120,7 @@ div.graph a.popup_trigger { background-image: url(images/button_add_dashlet_lo.png); } -div.graph a.popup_trigger:hover { +div.pnp_graph a.popup_trigger:hover { background-image: url(images/button_add_dashlet_hi.png); cursor: pointer; } diff --git a/web/htdocs/status.css b/web/htdocs/status.css index cd96776..c4ba9c0 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -382,7 +382,7 @@ table.data tr.data td.pnpgraph { padding: 0; } -tr.data td.pnpgraph div.graph > a > img { +tr.data td.pnpgraph div.pnp_graph > a > img { border: 1px solid #888; margin: 4px 4px 4px 4px; box-shadow: 1px 1px 3px #000000;

9 years, 5 months

Check_MK Git: check_mk: #2204 Inventory of switch ports, allows searching for unused ports

by Mathias Kettner

Module: check_mk Branch: master Commit: c6188a8616dd34f6d0af401573d1cb5aae47e1c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6188a8616dd34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:56:41 2015 +0200 #2204 Inventory of switch ports, allows searching for unused ports The Check_MK HW/SW-Inventory now collections information via SNMP. The first two implemented plugins are for the basic SNMP information and for the list of network interfaces (switch ports). The latter are available in a new status view where you can search ports for various criteria - e.g. all ports where the type is Ethernet and that are down for at least one month. All you need to do is to active the HW/SW-Inventory on those devices. --- .werks/2204 | 14 + ChangeLog | 1 + inventory/if | 76 +++++ inventory/snmp_info | 39 +++ inventory/win_disks | 2 +- modules/check_mk.py | 2 + modules/check_mk_base.py | 13 +- modules/discovery.py | 18 +- modules/inventory.py | 19 +- web/htdocs/check_mk.css | 1 + web/htdocs/images/icon_networking.png | Bin 0 -> 2991 bytes web/htdocs/metrics.py | 9 - web/htdocs/pages.css | 2 +- web/htdocs/views.css | 38 +++ web/htdocs/visuals.py | 3 + web/plugins/views/inventory.py | 538 ++++++++++++++++++++++----------- web/plugins/visuals/infos.py | 11 - web/plugins/visuals/inventory.py | 278 +++++++++++++---- 18 files changed, 801 insertions(+), 263 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c6188a8616…

9 years, 5 months

Check_MK Git: check_mk: Add missing space, for internal code cosmetics

by Mathias Kettner

Module: check_mk Branch: master Commit: b3d7dd574ee271a5e966824cb2bcb6f239ea5192 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d7dd574ee271… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:49:40 2015 +0200 Add missing space, for internal code cosmetics --- checks/if.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/if.include b/checks/if.include index 6cb11ab..88bcd27 100644 --- a/checks/if.include +++ b/checks/if.include @@ -541,7 +541,7 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, general_traffic_levels = if_get_traffic_levels(params) for line in info: - node, line = if_extract_node(line,has_nodeinfo) + node, line = if_extract_node(line, has_nodeinfo) ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \

9 years, 5 months

Check_MK Git: check_mk: if64, if64_tplink: convert implementation to use parse function

by Mathias Kettner

Module: check_mk Branch: master Commit: 9764860adefb1fbf7e8329b8304f01776eb01a83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9764860adefb1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:49:11 2015 +0200 if64, if64_tplink: convert implementation to use parse function --- checks/if64 | 14 +++++++------- checks/if64_tplink | 22 +++++++--------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/checks/if64 b/checks/if64 index 325e4bf..58e4197 100644 --- a/checks/if64 +++ b/checks/if64 @@ -24,20 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def fix_if64_highspeed(info): +def parse_if64(info): + parsed = [] for line in info: - if type(line[4]) == str: # not yet converted - line[4] = saveint(line[4]) * 1000000 + # Fix for switches like DLINK, with empty lines in MIB + if saveint(line[1]) > 0: + parsed.append(line[:4] + [saveint(line[4]) * 1000000] + line[5:]) + return parsed def inventory_if64(info): - # Fix for switches like DLINK, with empty lines in MIB - info = [ x for x in info if saveint(x[1]) > 0 ] - fix_if64_highspeed(info) return inventory_if_common(info, has_nodeinfo = True) def check_if64(item, params, info): - fix_if64_highspeed(info) return check_if_common(item, params, info, has_nodeinfo = True) @@ -65,6 +64,7 @@ def if64_scan_function(oid): check_info["if64"] = { + "parse_function": parse_if64, 'check_function': check_if64, 'inventory_function': inventory_if64, 'service_description': 'Interface %s', diff --git a/checks/if64_tplink b/checks/if64_tplink index 01376b2..e958077 100644 --- a/checks/if64_tplink +++ b/checks/if64_tplink @@ -24,25 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def fix_tplink_highspeed(info): +def parse_if64_tplink(info): + parsed = [] for line in info: - if type(line[3]) == str: # not yet converted - line[3] = saveint(line[3]) * 1000000 + parsed.append(line[:3] + [ int(line[3]) * 1000000 ] + line[4:]) + return parsed -def inventory_tplink(info): - fix_tplink_highspeed(info) - return inventory_if_common(info) - -def check_tplink(item, params, info): - fix_tplink_highspeed(info) - return check_if_common(item, params, info) - - -# check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 check_info["if64_tplink"] = { - 'check_function': check_tplink, - 'inventory_function': inventory_tplink, + 'parse_function': parse_if64_tplink, + 'check_function': check_if_common, + 'inventory_function': inventory_if_common, 'service_description': 'Interface %s', 'has_perfdata': True, 'includes': [ 'if.include' ],

9 years, 5 months

Check_MK Git: check_mk: Move network interface types from WATO to lib.py

by Mathias Kettner

Module: check_mk Branch: master Commit: a88d1fae5f10c2dde7acbd4540e456568df8a4e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a88d1fae5f10c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:52:05 2015 +0200 Move network interface types from WATO to lib.py --- web/htdocs/lib.py | 285 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 76 +-------- 2 files changed, 292 insertions(+), 69 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a88d1fae5f…

9 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015