Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: New ValueSpec for EmailAddress

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4b2c16cce98e6dcfdaf39988d0fd9ce0a45aa42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b2c16cce98e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 15:02:11 2012 +0100 New ValueSpec for EmailAddress --- web/htdocs/valuespec.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8c0fa99..cbefb10 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time +import math, os, time, re from lib import * # Abstract base class of all value declaration classes. @@ -242,6 +242,21 @@ class TextAscii(ValueSpec): if not self._allow_empty and value.strip() == "": raise MKUserError(varprefix, _("An empty value is not allowed here.")) + +class EmailAddress(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._re_email = re.compile('^[A-Z0-9._%+-]+(a)[A-Z0-9.-]+\.[A-Z]{2,4}$', re.I) + + def value_to_text(self, value): + return '<a href="mailto:%s">%s</a>' % (value, value) + + def validate_value(self, value, varprefix): + TextAscii.validate_value(self, value, varprefix) + if value: + if not self._re_email.match(value): + raise MKUserError(varprefix, _("You entered an invalid email address.")) + class TextUnicode(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs)

12 years, 8 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: 0212510215f8f3d89dc44e6dea508b76c5ed9fae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0212510215f8f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 15:02:14 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Removed broken function call

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f33baeeaa553e4b64a2bf1e6d970ac63fa98fa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f33baeeaa553e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:40:18 2012 +0100 Removed broken function call --- web/htdocs/wato.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 71089dd..8396078 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7375,12 +7375,12 @@ def mode_hosttags(phase): delete_url = html.makeactionuri([("_delete", tag_id)]) html.write("<td>") if nr == 0: - empty_html.icon_button() + html.empty_icon_button() else: html.icon_button(html.makeactionuri([("_move", str(-nr))]), _("Move this tag group one position up"), "up") if nr == len(hosttags) - 1: - empty_html.icon_button() + html.empty_icon_button() else: html.icon_button(html.makeactionuri([("_move", str(nr))]), _("Move this tag group one position down"), "down") @@ -8324,7 +8324,7 @@ def create_rule(rulespec, hostname=None, item=NO_ITEM): def rule_button(action, help=None, folder=None, rulenr=0): if action == None: - empty_html.icon_button() + html.empty_icon_button() else: vars = [("_folder", folder[".path"]), ("_rulenr", str(rulenr)),

12 years, 8 months

Check_MK Git: check_mk: Removed IP-Address attribute from folders

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cba10fd9b81e3aa7ef2117134596714cac75a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cba10fd9b81e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:24:23 2012 +0100 Removed IP-Address attribute from folders --- ChangeLog | 1 + web/plugins/wato/builtin_attributes.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11994de..7446c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * New painter for normal and retry check interval (added to detail views) WATO: + * Removed IP-Address attribute from folders * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 5c29ec9..3e85bcd 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -44,4 +44,4 @@ declare_host_attribute(TextAttribute("ipaddress", _("IP address"), "dynamic IP addresses."), allow_empty = False), show_in_table = True, - show_in_folder = True) + show_in_folder = False)

12 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11fbb712e10550f8b6651ec8cf6dda3dbcd69e11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11fbb712e10550… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:33:35 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 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: fc894f4da24586aca66f58cef2f0e8ccaf8ebf54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc894f4da24586… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 12:05:24 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: FIX: netapp_volumes: added raid4 as allowed state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e58bea8acd4df6882640ba1c3cb67ca24d3ca464 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e58bea8acd4df6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 12:04:44 2012 +0100 FIX: netapp_volumes: added raid4 as allowed state --- ChangeLog | 1 + checks/netapp_volumes | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad4f67a..4e2800f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ Checks & Agents: * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu + * FIX: netapp_volumes: added raid4 as allowed state (thanks to Michaël Coquard) 1.1.12p6: Checks & Agents: diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 05394c5..00aeb92 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -110,7 +110,7 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += '(!)' - elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored', 'raid4' ]: ret_state = 2 output += '(!!)'

12 years, 8 months

Check_MK Git: check_mk: FIX: Fixed "move to target folders" after CSV import

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7f66c2d6c73e08cc69703a0fd19b6b41b8dfb87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7f66c2d6c73e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:03:42 2012 +0100 FIX: Fixed "move to target folders" after CSV import --- .f12 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/.f12 b/.f12 new file mode 100644 index 0000000..2a88411 --- /dev/null +++ b/.f12 @@ -0,0 +1,13 @@ +#!/bin/bash +SITE=${SITE:-$(omd sites --bare | head -n 1)} +set -xe + +sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ + -e "s#@VARDIR@#/omd/sites/$SITE/var/check_mk#g" \ + -e "s#@CHECK_ICMP@#/omd/sites/$SITE/lib/nagios/plugins/check_icmp#g" \ + -e "s#@PNPURL@#/$SITE/pnp4nagios/#g" \ + -e "s#@CGIURL@#/$SITE/nagios/cgi-bin#g" \ + < check_mk_templates.cfg > /tmp/check_mk_templates.cfg + +sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d +sudo omd restart $SITE nagios diff --git a/ChangeLog b/ChangeLog index bb8fd2c..11994de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ WATO: * FIX: Fixed missing folders in "move to" dropdown fields + * FIX: Fixed "move to target folders" after CSV import BI: * improve doc/treasures/check_bi_local.py: local check that creates diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 049853f..71089dd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -71,6 +71,8 @@ # performance issues. # ".total_hosts" -> recursive number of hosts, computed on demand by # num_hosts_in() +# ".siteid" -> This attribute is mandatory for host objects and optional for folder +# objects. In case of hosts and single WATO setup it is always none. # # # g_folder -> The folder object representing the folder the user is @@ -2152,8 +2154,11 @@ def create_target_folder_from_aliaspath(aliaspath): ".folders" : {}, ".files" : {}, ".parent" : folder, - ".siteid" : folder[".siteid"], } + + if '.siteid' in folder: + new_folder['.siteid'] = folder[".siteid"] + folder[".folders"][name] = new_folder g_folders[new_path] = new_folder folder = new_folder

12 years, 8 months

Check_MK Git: check_mk: FIX: Fixed missing folders in "move to" dropdown fields

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c00cede951bd8ec4fb0be5b1a582e47a059891d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c00cede951bd8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 08:52:20 2012 +0100 FIX: Fixed missing folders in "move to" dropdown fields The id(g_folder) returned the same value for all the folders. --- ChangeLog | 3 +++ web/htdocs/wato.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad4f67a..bb8fd2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,9 @@ * Added filter for log state (UP,DOWN,OK,CRIT...) to all log views * New painter for normal and retry check interval (added to detail views) + WATO: + * FIX: Fixed missing folders in "move to" dropdown fields + BI: * improve doc/treasures/check_bi_local.py: local check that creates Nagios services out of BI aggregates diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9fc43ae..049853f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1238,9 +1238,9 @@ def move_to_folder_combo(what, thing = None, top = False): msg += " (%s)" % os_path selections.append((os_path, msg)) selections.sort(cmp=lambda a,b: cmp(a[1].lower(), b[1].lower())) - move_to_folder_combo_cache[id(g_folder)] = selections + move_to_folder_combo_cache[g_folder['.path']] = selections else: - selections = move_to_folder_combo_cache[id(g_folder)] + selections = move_to_folder_combo_cache[g_folder['.path']] if len(selections) > 1: if thing == None:

12 years, 8 months

Check_MK Git: check_mk: Linux agent: fix syntax error in IPMI code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dcca6653d8dbd6e8f89401d31a8fafb7f59c762e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcca6653d8dbd6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 8 17:44:44 2012 +0100 Linux agent: fix syntax error in IPMI code --- agents/check_mk_agent.linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8c8541d..96384f1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -260,7 +260,7 @@ then if [ $? = 255 ] ; then break ; fi WAITMAX="waitmax 3" done - ) 200 >> $"$sdrcache" + ) 200>>"$sdrcache" fi # State of LSI MegaRAID controller via MegaCli. You can download that tool from:

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012