Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64271 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 604e4525fe01229b2fa877ecb7ecd656bf489684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=604e4525fe0122… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 10:15:05 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed editing of ListOf in valuespec editors ( e.g. used in logwatch pattern editor)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6d91d0058e39e4c01c2c9d10a0997830d8e6cf06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d91d0058e39e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 14:03:31 2012 +0200 FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch pattern editor) --- ChangeLog | 2 ++ web/htdocs/js/checkmk.js | 38 +++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 176376f..dbee015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ on hosts with more than 500 services. * FIX: make config options directly active after resetting them to their defaults (didn't work for start_url, etc. + * FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch + pattern editor) Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 5f66f93..6cc7ca7 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1490,17 +1490,20 @@ function valuespec_listof_add(varprefix, magic) { var htmlcode = oPrototype.innerHTML; htmlcode = replace_all(htmlcode, magic, strcount); var oTable = document.getElementById(varprefix + "_table"); - if (count == 0) { // first: no <tbody> present! - oTable.innerHTML = "<tbody><tr>" + htmlcode + "</tr></tbody>"; - valuespec_listof_fixarrows(oTable.childNodes[0]); - } - else { - var oTbody = oTable.childNodes[0]; - var oTr = document.createElement("tr") - oTr.innerHTML = htmlcode; - oTbody.appendChild(oTr); - valuespec_listof_fixarrows(oTbody); + + var oTbody = oTable.childNodes[0]; + if(oTbody == undefined) { // no row -> no <tbody> present! + oTbody = document.createElement('tbody'); + oTable.appendChild(oTbody); } + + // Hack for IE. innerHTML does not work on tbody/tr correctly. + var container = document.createElement('div'); + container.innerHTML = '<table><tbody><tr>' + htmlcode + '</tr></tbody></tr>'; + var oTr = container.childNodes[0].childNodes[0].childNodes[0] // TR + oTbody.appendChild(oTr); + + valuespec_listof_fixarrows(oTbody); } // When deleting we do not fix up indices but simply @@ -1522,6 +1525,7 @@ function valuespec_listof_delete(oA, varprefix, nr) { function valuespec_listof_move(oA, varprefix, nr, where) { var oTr = oA.parentNode.parentNode; // TR to move var oTbody = oTr.parentNode; + var oTable = oTbody.parentNode; if (where == "up") { var sib = oTr.previousSibling; @@ -1541,8 +1545,16 @@ function valuespec_listof_move(oA, varprefix, nr, where) { function valuespec_listof_fixarrows(oTbody) { - for (var i in oTbody.childNodes) { - var oTd = oTbody.childNodes[i].childNodes[0]; /* TD with buttons */ + if(!oTbody || typeof(oTbody.rows) == undefined) { + return; + } + + for(var i = 0, row; row = oTbody.rows[i]; i++) { + if(row.cells.length == 0) + continue; + var oTd = row.cells[0]; /* TD with buttons */ + if(row.cells[0].childNodes.length == 0) + continue; var oIndex = oTd.childNodes[0]; oIndex.value = "" + (parseInt(i) + 1); if (oTd.childNodes.length > 4) { /* movable */ @@ -1558,7 +1570,7 @@ function valuespec_listof_fixarrows(oTbody) { } var oDownTrans = oTd.childNodes[4]; var oDown = oTd.childNodes[5]; - if (i >= oTbody.childNodes.length - 1) { + if (i >= oTbody.rows.length - 1) { oDownTrans.style.display = ""; oDown.style.display = "none"; }

12 years, 4 months

Check_MK Git: check_mk: FIX: Logwatch: Logwatch services in rules configured using WATO must be

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59dd2c4a6d3a2a1616b987c3196f01f58e147826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59dd2c4a6d3a2a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 15:02:02 2012 +0200 FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name --- ChangeLog | 2 ++ checks/logwatch | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbee015..fbb8433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,8 @@ Checks & Agents: * FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles + * FIX: Logwatch: Logwatch services in rules configured using WATO must be + given as item, not as whole service name BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checks/logwatch b/checks/logwatch index 007c235..4154102 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -97,7 +97,9 @@ def logwatch_precompile(hostname, item, _unused): # Initialize the patterns list with the logwatch_rules params = [] description = check_info['logwatch']['service_description'] % item - rules = service_extra_conf(hostname, description, logwatch_rules) + + # This is the new (-> WATO controlled) variable + rules = service_extra_conf(hostname, item, logwatch_rules) for rule in rules: for pattern in rule: params.append((pattern[0], pattern[1]))

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ff965ab88f9fba9a29c5d0806502fc0cbca9a60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff965ab88f9fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 11 08:14:29 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: fixed logwatch pattern item select help text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae67c2b058e28bd20dd5340d9a33daa640f6ade9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae67c2b058e28b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 10 14:05:34 2012 +0200 fixed logwatch pattern item select help text --- checks/mssql_versions | 39 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 3 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/checks/mssql_versions b/checks/mssql_versions new file mode 100644 index 0000000..c24189d --- /dev/null +++ b/checks/mssql_versions @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# <<<mssql_versions>>> +# MSSQL$SQLEXPRESS 10.50.1600.1 + +def inventory_mssql_versions(info): + return [ (line[0].replace('$', '_'), None) for line in info if len(line) >= 2 ] + +def check_mssql_versions(item, _unused, info): + for line in info: + if line[0].replace('$', '_') == item: + return (0, 'OK - Server is running Version %s' % line[1]) + return (2, "UNKNOWN - Server instance not existing or not running") + +check_info['mssql_versions'] = (check_mssql_versions, "MSSQL %s Version", 0, inventory_mssql_versions ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4893395..034a499 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -126,7 +126,8 @@ register_rule(group + '/' + subgroup_applications, ), itemtype = 'item', itemname = 'logfile', - itemhelp = _("One or several regular expressions for matching logfile lines."), + itemhelp = _("Put the item names of the logfiles here. For example \"System$\" " + "to select the service \"LOG System\"."), match = 'list', )

12 years, 4 months

Check_MK Git: check_mk: WATO: sort_sites, improved sort function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b745d5434be1e6628b7ed34cec563d7f89f58c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b745d5434be1e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 11 00:01:05 2012 +0200 WATO: sort_sites, improved sort function --- web/htdocs/wato.py | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c44274..08058c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6027,20 +6027,9 @@ def find_usage_of_timeperiod(tpname): # Sort given sites argument by peer/local, followed by slaves def sort_sites(sites): def custom_sort(a,b): - if a[1].get("replication","peer") == b[1].get("replication","peer"): - # Compare by alias - if a[1].get("alias") == b[1].get("alias"): - return 0 - elif a[1].get("alias") > b[1].get("alias"): - return 1 - else: - return -1 - elif a[1].get("replication") == "slave" and b[1].get("replication","peer") != "slave": - return 1 - elif a[1].get("replication","peer") != "slave" and b[1].get("replication") == "slave": - return -1 - else: - return 0 + return cmp(a[1].get("replication","peer"), b[1].get("replication","peer")) or \ + -cmp(a[1].get("repl_priority",0), b[1].get("repl_priority",0)) or \ + cmp(a[1].get("alias"), b[1].get("alias")) sites.sort(cmp = custom_sort) def mode_sites(phase):

12 years, 4 months

Check_MK Git: check_mk: WATO: ajax_replication now with prepare_folder_info () initialization

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61759dec5058756d8c56ea1e3dbd675d2a05d7ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61759dec505875… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 11 00:04:28 2012 +0200 WATO: ajax_replication now with prepare_folder_info() initialization --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08058c1..aa3ba21 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7018,6 +7018,9 @@ def ajax_replication(): need_sync = srs.get("need_sync", False) need_restart = srs.get("need_restart", False) + # Initialise g_root_folder, load all folder information + prepare_folder_info() + site = config.site(site_id) try: if need_sync:

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50c9c8b4a9e57de581fc9ae27cf84be5c7c1249a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c9c8b4a9e57d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 10 23:59:04 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0661

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5abb561dcaf473dee17663677260219d1ffa19f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5abb561dcaf47… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 10 14:39:04 2012 +0200 Updated bug entries #0661 --- .bugs/661 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/661 b/.bugs/661 new file mode 100644 index 0000000..7d0f6eb --- /dev/null +++ b/.bugs/661 @@ -0,0 +1,11 @@ +Title: Do no monitor host leads to host monitored on all sites +Component: wato +State: open +Date: 2012-05-10 14:36:38 +Targetversion: 1.2.0 +Class: bug + +If you set a host to "do not monitor" in the "monitored on" attribute, +then that host will be monitored on *all* sites instead of on none. +Solution: currently no site: tag is set in that case, but we rather +should set an empty site: tag.

12 years, 4 months

Check_MK Git: check_mk: WATO: global settings: make values clickable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82cac9385a2fc971abf68c3a178ecdeeba22c02f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82cac9385a2fc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 17:52:14 2012 +0200 WATO: global settings: make values clickable --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index efdcc1d..573dc9a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5202,13 +5202,15 @@ def mode_globalvars(phase): html.icon_button(toggle_url, _("Immediately toggle this setting"), "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) else: - html.write(valuespec.value_to_text(current_settings[varname])) + html.write('<a href="%s">%s</a>' % + (edit_url, valuespec.value_to_text(current_settings[varname]))) else: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), "snapin_greyswitch_" + (defaultvalue and "on" or "off")) else: - html.write(valuespec.value_to_text(defaultvalue)) + html.write('<a href="%s">%s</a>' % + (edit_url, valuespec.value_to_text(defaultvalue))) html.write("</td>") html.write('</tr>') html.write("</table>")

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits