Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64689 discussions

Check_MK Git: check_mk: Removed old WATO icon gif

by Lars Michelsen

Module: check_mk Branch: master Commit: aa1097057e48e6fe2ee1cdaea0f2fc378cb64b0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1097057e48e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 11:06:16 2014 +0100 Removed old WATO icon gif --- .bugs/2132 | 7 +++++-- web/htdocs/htmllib.py | 10 ++++++++++ web/htdocs/images/icon_wato.gif | Bin 1506 -> 0 bytes web/plugins/icons/wato.py | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.bugs/2132 b/.bugs/2132 index 407ab21..70195ba 100644 --- a/.bugs/2132 +++ b/.bugs/2132 @@ -1,11 +1,14 @@ Title: WATO context button on quicksearch result page broken Component: multisite -State: open +Class: bug +State: works4me Date: 2014-07-04 09:30:24 Targetversion: 1.2.5i1 -Class: bug When searching for a host substring, for example "node", results in a page listing all services of the hosts node1 and node2. When clicking on the context button WATO, it displays a red error message that the host "node" (the substring) is not managed by WATO. + +2014-12-01 11:05:43: changed state open -> works4me +old bug, already fixed. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1727e0f..618f67d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,6 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Notes for future rewrite: +# +# - Make clear which functions return values and which write out values +# render_*, add_*, write_* (e.g. icon() -> outputs directly, +# render_icon() -> returns icon +# render_icon() -> returns icon +# +# - Order of arguments: +# e.g. icon(help, icon) -> change and make help otional? + import time, os, pwd, urllib, random from lib import * diff --git a/web/htdocs/images/icon_wato.gif b/web/htdocs/images/icon_wato.gif deleted file mode 100644 index 5aae7e8..0000000 Binary files a/web/htdocs/images/icon_wato.gif and /dev/null differ diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 6f0b705..053b301 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -35,11 +35,11 @@ def wato_link(folder, site, hostname, where): (html.urlencode(folder), html.urlencode(hostname)) if where == "inventory": url += "&mode=inventory" - help = _("Edit services in WATO - the Check_MK Web Administration Tool") + help = _("Edit services") else: url += "&mode=edithost" - help = _("Open this host in WATO - the Check_MK Web Administration Tool") - return '<a href="%s"><img class=icon src="images/icon_wato.gif" ' \ + help = _("Edit this host") + return '<a href="%s"><img class=icon src="images/icon_wato.png" ' \ 'title="%s"></a>' % (url, help) else: return ""

9 years, 10 months

Check_MK Git: check_mk: #1555 FIX Improved validation on timeperiod references of non existing periods

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ab16d2d1e20e54accaedb503d6d8ea48dac4b63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab16d2d1e20e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 11:53:11 2014 +0100 #1555 FIX Improved validation on timeperiod references of non existing periods configured notification, check etc. periods were not validated for their existance correctly. --- .bugs/1010 | 7 +++++-- .bugs/1066 | 7 +++++-- .bugs/2103 | 7 +++++-- .bugs/2104 | 7 +++++-- .bugs/2130 | 7 +++++-- .werks/1555 | 10 ++++++++++ ChangeLog | 1 + 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.bugs/1010 b/.bugs/1010 index 2495a4b..4aee187 100644 --- a/.bugs/1010 +++ b/.bugs/1010 @@ -1,8 +1,11 @@ Title: wato global settings, empty line Component: wato -State: open +Class: bug +State: done Date: 2014-11-05 22:34:21 Targetversion: future -Class: bug in global settings - configuration gui (wato) there is an empty line which can be switched ON or OFF + +2014-12-01 11:09:33: changed state open -> done +Has already been fixed. diff --git a/.bugs/1066 b/.bugs/1066 index d2b88df..90b2d12 100644 --- a/.bugs/1066 +++ b/.bugs/1066 @@ -1,12 +1,15 @@ Title: cmk -m does not start if manpages without catalog: header Component: docu -State: open +Class: bug +State: done Date: 2014-03-26 11:19:32 Targetversion: 1.2.5i1 -Class: bug if you installed some mkp packages from the exchange or so and their check manpages do not contain a catalog: header then cmk -m does not start at all (failing) missing catalog: header must be caught + +2014-12-01 11:08:58: changed state open -> done +Has already been fixed. diff --git a/.bugs/2103 b/.bugs/2103 index 02c5bb8..36c1062 100644 --- a/.bugs/2103 +++ b/.bugs/2103 @@ -1,9 +1,9 @@ Title: Quicksearch of hosts: incorrect WATO link Component: multisite -State: open +Class: bug +State: done Date: 2014-02-10 14:24:58 Targetversion: 1.2.5i1 -Class: bug For example: Doint a quicksearch on "x" returns the hosts esx_host and winxp @@ -18,3 +18,6 @@ htdocs/views.py: lines following: # WATO: If we have a host context, then show button to WATO, if permissions allow this Note: checking if a WATO host exist might take some time... + +2014-12-01 11:07:48: changed state open -> done +Is already fixed. diff --git a/.bugs/2104 b/.bugs/2104 index 9040e87..9be62eb 100644 --- a/.bugs/2104 +++ b/.bugs/2104 @@ -1,9 +1,9 @@ Title: creating core config: check if used timeperiod actually exists Component: core -State: open +Class: bug +State: done Date: 2014-03-10 13:03:53 Targetversion: 1.2.5i1 -Class: bug On creating the configuration for the core, there is now validation if a timeperiod used in any rules is actually defined. This causes a crash @@ -19,3 +19,6 @@ extra_service_conf['notification_period'] = [ ( 'office-hours', [], ALL_HOSTS, ALL_SERVICES ), ] + extra_service_conf['notification_period'] + +2014-12-01 11:51:29: changed state open -> done +Has been fixed. Added validation to cmc config generator. Nagios does validation on its own diff --git a/.bugs/2130 b/.bugs/2130 index dd94b0f..80c0fcf 100644 --- a/.bugs/2130 +++ b/.bugs/2130 @@ -1,9 +1,12 @@ Title: Dynamic file system levels can not be edited Component: wato -State: open +Class: bug +State: done Date: 2014-06-16 15:38:54 Targetversion: 1.2.5i1 -Class: bug When a df rule has dynamic file system levels configured, this is saved and can be used, but when opened in WATO again, the value can not be loaded again. + +2014-12-01 11:12:14: changed state open -> done +Has already been fixed. diff --git a/.werks/1555 b/.werks/1555 new file mode 100644 index 0000000..20a345b --- /dev/null +++ b/.werks/1555 @@ -0,0 +1,10 @@ +Title: Improved validation on timeperiod references of non existing periods +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417431125 +Class: fix + +configured notification, check etc. periods were not validated for their +existance correctly. diff --git a/ChangeLog b/ChangeLog index 6f7f6cd..c009d79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1483 FIX: Savely replace illegal vertical bars in check plugin output... * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... * 1545 FIX: Terminating with exit code 3 now when duplicate host has been found + * 1555 FIX: Improved validation on timeperiod references of non existing periods... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices

9 years, 10 months

Check_MK Git: check_mk: #1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 19248c4fe5cf665e64b6c12fd8ba24731f86f47a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19248c4fe5cf66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 13:29:36 2014 +0100 #1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore --- .bugs/2142 | 7 +++++-- .werks/1556 | 12 ++++++++++++ ChangeLog | 1 + modules/automation.py | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.bugs/2142 b/.bugs/2142 index 58418a1..add15db 100644 --- a/.bugs/2142 +++ b/.bugs/2142 @@ -1,12 +1,15 @@ Title: Inventory via WATO fails if checks are missing Component: wato -State: open +Class: bug +State: done Date: 2014-01-16 17:29:54 Targetversion: 1.2.5i1 -Class: bug Inventorized Fritzbox-1und1 Failed to inventorize Fritzbox-Alt: 'fritz.uptime' That was because that check was missing. An cmk -II on the commanline could fix it. A WATO Inventory should simply ignore such problems. + +2014-12-01 12:13:11: changed state open -> done +Fixed. diff --git a/.werks/1556 b/.werks/1556 new file mode 100644 index 0000000..2c4a5f7 --- /dev/null +++ b/.werks/1556 @@ -0,0 +1,12 @@ +Title: WATO inventory ignores already inventorized checks which does not exist anymore +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417432395 +Class: fix + +Previous versions totally failed to inventorize when a host already has a service +inventorized which belongs to a check which is not existant anymore. It terminated +with "Failed to inventorize Fritzbox-Alt: 'fritz.uptime'". This error is skipped over +now by simply ignoring the check. diff --git a/ChangeLog b/ChangeLog index c009d79..527d7ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule * 1542 FIX: Changed text of "debug_log" option to be clearer in distributed setups... * 1546 FIX: Fixed adding cluster nodes to new cluster in complain phase... + * 1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/modules/automation.py b/modules/automation.py index 4a84981..61e3207 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -353,6 +353,9 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=F opt_no_tcp = True opt_dont_submit = True + if ct not in check_info: + continue # Skip not existing check silently + try: exitcode = None perfdata = []

9 years, 10 months

Check_MK Git: check_mk: Reserved 15 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 753f1ca2b281fce57e5e06e27b2762c6855fa20c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=753f1ca2b281fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 1 13:29:47 2014 +0100 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 1fa85e6..0a02468 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1557 +1572

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2230, #2231

by Mathias Kettner

Module: check_mk Branch: master Commit: 853d978be5d1611d242179b7c5421edadafe7ae9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853d978be5d161… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 1 10:43:10 2014 +0100 Updated bug entries #2230, #2231 --- .bugs/2230 | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/2231 | 9 ++ 2 files changed, 369 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=853d978be5…

9 years, 10 months

Check_MK Git: check_mk: wato.py / Web-API: some internal code improvements.

by Andreas Boesl

Module: check_mk Branch: master Commit: dc1a10ffdbb0ba542260dcde32ee30dd7ceeceee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc1a10ffdbb0ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 1 12:44:39 2014 +0100 wato.py / Web-API: some internal code improvements. its now easier to implement multi-add/edit functions --- web/htdocs/wato.py | 219 +++++++++++++++++++++++++----------------- web/plugins/webapi/webapi.py | 11 ++- 2 files changed, 139 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc1a10ffdb…

9 years, 10 months

Check_MK Git: check_mk: removed html formatted text in title

by Andreas Boesl

Module: check_mk Branch: master Commit: 287f1019a92b57ddbd34ab8dd4ed92d20e979293 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=287f1019a92b57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 1 10:23:30 2014 +0100 removed html formatted text in title --- web/htdocs/logwatch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 50e1f31..49a20be 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -241,12 +241,12 @@ def do_log_ack(host, filename): for int_filename in host_logs(host): file_display = form_file_to_ext(int_filename) todo.append((host, int_filename, file_display)) - ack_msg = _('all logfiles of host <tt>%s</tt>') % html.attrencode(host) + ack_msg = _('all logfiles of host %s') % html.attrencode(host) elif host and filename: # one log on one host int_filename = form_file_to_int(filename) todo = [ (host, int_filename, form_file_to_ext(int_filename)) ] - ack_msg = _('the log file <tt>%s</tt> on host <tt>%s</tt>') % \ + ack_msg = _('the log file %s on host %s') % \ (html.attrencode(filename), html.attrencode(host)) html.header(_("Acknowledge %s") % ack_msg, stylesheets = stylesheets)

9 years, 10 months

Check_MK Git: check_mk: #1518 raritan_pdu_inlet, raritan_pdu_inlet_summary : Modified existing check to give one item per phase and support setting levels.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 207cb89c7802b4dbbdcfb7b9f024915aa8b89dc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207cb89c7802b4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 28 17:04:09 2014 +0100 #1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels. raritan_pdu_inlet used to create one item per sensor. Now, only one item per phase is created. A Perf-O-Meter displaying the power has been added, as well as a WATO rule to configure warning and critical levels. raritan_pdu_inlet_summary works very similarily, but provides summary information concerning all phases. --- .werks/1518 | 13 ++++++ ChangeLog | 2 + checkman/raritan_pdu_inlet | 25 ++++++----- checkman/raritan_pdu_inlet_summary | 30 +++++++++++++ checks/elphase.include | 78 +++++++++++++++++++++++++++++++++- checks/raritan_pdu_inlet | 1 + checks/raritan_pdu_inlet.include | 6 +-- checks/raritan_pdu_inlet_summary | 1 + web/plugins/perfometer/check_mk.py | 9 ++++ web/plugins/wato/check_parameters.py | 48 ++++++++++++++++++++- 10 files changed, 197 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=207cb89c78…

9 years, 10 months

Check_MK Git: check_mk: New ValuSpec for absolut directory names

by Mathias Kettner

Module: check_mk Branch: master Commit: f7d5d8f7fab52d09cc6075e5d8c190c7eb3d0487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d5d8f7fab52d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 15:06:56 2014 +0100 New ValuSpec for absolut directory names --- web/htdocs/valuespec.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 513687c..24a7c41 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -569,6 +569,12 @@ class Hostname(TextAscii): self._regex = re.compile('^[-0-9a-zA-Z_.]+$') self._regex_error = _("Please enter a valid hostname or IPv4 address.") +class AbsoluteDirname(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._regex = re.compile('^(/|(/[^/]+)+)$') + self._regex_error = _("Please enter a valid absolut pathname with / as a path separator.") + # Valuespec for a HTTP Url (not HTTPS), that # automatically adds http:// to the value @@ -653,6 +659,7 @@ class TextAreaUnicode(TextUnicode): # A variant of TextAscii() that validates a path to a filename that # lies in an existing directory. +# TODO: Rename the valuespec here to ExistingFilename or somehting similar class Filename(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs)

9 years, 10 months

Check_MK Git: check_mk: Now really fixed refreshing of pnp graph dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fc58418f7f4cff8e62821a12ebbea2e0f7e3534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc58418f7f4cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:54:27 2014 +0100 Now really fixed refreshing of pnp graph dashlets --- web/htdocs/dashboard.py | 13 +++++++++---- web/htdocs/js/dashboard.js | 7 ++++++- web/plugins/dashboard/dashlets.py | 8 ++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index aaf083f..d01f3ef 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -379,8 +379,13 @@ def render_dashboard(name): url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: - # FIXME: remove add_wato_folder_to_url - refresh_dashlets.append([nr, refresh, str(add_wato_folder_to_url(url, wato_folder))]) + if 'on_refresh' in dashlet_type: + action = 'function() {%s}' % dashlet_type['on_refresh'](nr, dashlet) + else: + # FIXME: remove add_wato_folder_to_url + action = '"%s"' % add_wato_folder_to_url(url, wato_folder) # url to dashboard_dashlet.py + refresh_dashlets.append('[%d, %d, %s]' % (nr, refresh, action)) + # Update the dashlets context with the dashboard global context when there are # useful information @@ -482,7 +487,7 @@ var title_height = %d; var dashlet_padding = Array%s; var dashlet_min_size = Array%s; var corner_overlap = %d; -var refresh_dashlets = %r; +var refresh_dashlets = [%s]; var on_resize_dashlets = {%s}; var dashboard_name = '%s'; var dashboard_mtime = %d; @@ -493,7 +498,7 @@ calculate_dashboard(); window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); """ % (MAX, GROW, raster, header_height, screen_margin, title_height, dashlet_padding, dashlet_min_size, - corner_overlap, refresh_dashlets, ','.join(on_resize), name, board['mtime'], + corner_overlap, ','.join(refresh_dashlets), ','.join(on_resize), name, board['mtime'], html.makeuri([('edit', '1')]), repr(dashlets_js))) if mode == 'edit': diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index e7878b3..929c6b8 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -294,7 +294,12 @@ function dashboard_scheduler(initial) { if ((initial && document.getElementById("dashlet_inner_" + nr).innerHTML == '') || (refresh > 0 && timestamp % refresh == 0)) { - get_url(url + "&mtime=" + dashboard_mtime, dashboard_update_contents, "dashlet_inner_" + nr); + if (typeof(url) === 'string') { + get_url(url + "&mtime=" + dashboard_mtime, dashboard_update_contents, "dashlet_inner_" + nr); + } + else { + url(); // Execute "on_refresh" javascript function + } } } diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index db1e8e7..34685fb 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -336,9 +336,9 @@ def make_pnp_url(dashlet, what): else: base_url = html.site_status[site]["site"]["url_prefix"] base_url += "pnp4nagios/index.php/" - var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite&_t=%d" % \ + var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ (pnp_cleanup(dashlet['context']['host']), pnp_cleanup(service), - dashlet['source'], dashlet['timerange'], int(time.time())) + dashlet['source'], dashlet['timerange']) return base_url + what + var_part def dashlet_pnpgraph(nr, dashlet): @@ -378,6 +378,9 @@ dashlet_types["pnpgraph"] = { """, "on_resize" : lambda nr, dashlet: 'dashboard_render_pnpgraph(%d, \'%s\');' % (nr, make_pnp_url(dashlet, 'image')), + # execute this js handler instead of refreshing the dashlet by calling "render" again + "on_refresh" : lambda nr, dashlet: 'dashboard_render_pnpgraph(%d, \'%s\');' % + (nr, make_pnp_url(dashlet, 'image')), "script": """ var dashlet_offsets = {}; function dashboard_render_pnpgraph(nr, img_url) @@ -436,6 +439,7 @@ function load_graph_img(nr, img, img_url, c_w, c_h) img_url += '&graph_width='+(c_w - dashlet_offsets[nr][0]) +'&graph_height='+(c_h - dashlet_offsets[nr][1]); } + img_url += '&_t='+Math.floor(Date.parse(new Date()) / 1000); // prevent caching img.src = img_url; } """

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits