Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Install Linux agent in .f12

by Mathias Kettner

Module: check_mk Branch: master Commit: 8f3aa7beed9693c10d5cb0e6e3f6e7d16ccd1a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f3aa7beed9693… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 20:13:02 2013 +0100 Install Linux agent in .f12 --- agents/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/.f12 b/agents/.f12 index 4c32b21..f46aa52 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -4,3 +4,4 @@ if [ -e /etc/check_mk ] then sudo install -m 644 logwatch.cfg /etc/check_mk/ fi +sudo install -m 755 check_mk_agent.linux /usr/bin/check_mk_agent

11 years, 4 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f373a08d30a2eb5facbfe120a0454deac077db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f373a08d30a2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:28:31 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Also detecting wether or not service/

by Lars Michelsen

host groups are used during deletion of them Message-ID: <5134f9ea.a6Jcn0ZMtVhKPrD2%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 354d96b0e907aedb6cc4661dfec6d8266758ba14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=354d96b0e907ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 20:43:51 2013 +0100 Also detecting wether or not service/host groups are used during deletion of them --- web/htdocs/wato.py | 65 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 27 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7541070..6b11fdf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5647,16 +5647,10 @@ def save_configuration_vars(vars, filename): # | Mode for editing host-, service- and contact groups | # '----------------------------------------------------------------------' -# Check if a group is currently in use and cannot be deleted -# Returns a list of occurrances. -# Possible usages: -# - 1. rules: host to contactgroups, services to contactgroups -# - 2. user memberships -def find_usage_of_contact_groups(name): - # Part 1: Rules +def find_usages_of_group_in_rules(name, varnames): used_in = [] rulesets = load_all_rulesets() - for varname in [ 'host_contactgroups', 'service_contactgroups' ]: + for varname in varnames: ruleset = rulesets[varname] rulespec = g_rulespecs[varname] for folder, rule in ruleset: @@ -5664,6 +5658,16 @@ def find_usage_of_contact_groups(name): if value == name: used_in.append(("%s: %s" % (_("Ruleset"), g_rulespecs[varname]["title"]), make_link([("mode", "edit_ruleset"), ("varname", varname)]))) + return used_in + +# Check if a group is currently in use and cannot be deleted +# Returns a list of occurrances. +# Possible usages: +# - 1. rules: host to contactgroups, services to contactgroups +# - 2. user memberships +def find_usages_of_contact_group(name): + # Part 1: Rules + used_in = find_usages_of_group_in_rules(name, [ 'host_contactgroups', 'service_contactgroups' ]) # Is the contactgroup assigned to a user? users = filter_hidden_users(userdb.load_users()) @@ -5698,6 +5702,12 @@ def find_usage_of_contact_groups(name): return used_in +def find_usages_of_host_group(name): + return find_usages_of_group_in_rules(name, [ 'host_groups' ]) + +def find_usages_of_service_group(name): + return find_usages_of_group_in_rules(name, [ 'service_groups' ]) + def mode_groups(phase, what): if what == "host": what_name = _("host groups") @@ -5727,23 +5737,24 @@ def mode_groups(phase, what): delname = html.var("_delete") if what == 'contact': - usages = find_usage_of_contact_groups(delname) - if usages: - message = "%s %s:<ul>" % \ - (_("You cannot delete this contactgroup."), - _("It is still in use by")) - for title, link in usages: - message += '<li><a href="%s">%s</a></li>\n' % (link, title) - message += "</ul>" - raise MKUserError(None, message) + usages = find_usages_of_contact_group(delname) + elif what == 'host': + usages = find_usages_of_host_group(delname) + elif what == 'service': + usages = find_usages_of_service_group(delname) + + if usages: + message = "%s %s:<ul>" % \ + (_("You cannot delete this %s group.") % what, + _("It is still in use by")) + for title, link in usages: + message += '<li><a href="%s">%s</a></li>\n' % (link, title) + message += "</ul>" + raise MKUserError(None, message) - confirm_txt = _('Do you really want to delete the %s group %s?') % (what, delname) - else: - confirm_txt = _("Do you really want to delete the %s group %s? If there are still objects " - "assigned to that group, the group will kept up (but without an alias). " - "Removing all objects from the will make the group disappear completely. ") % (what, delname) + confirm_txt = _('Do you really want to delete the %s group "%s"?') % (what, delname) - c = wato_confirm(_("Confirm deletion of group %s" % delname), confirm_txt) + c = wato_confirm(_("Confirm deletion of group \"%s\"" % delname), confirm_txt) if c: del groups[delname] save_group_information(all_groups) @@ -5952,7 +5963,7 @@ def mode_timeperiods(phase): if phase == "action": delname = html.var("_delete") if html.transaction_valid(): - usages = find_usage_of_timeperiod(delname) + usages = find_usages_of_timeperiod(delname) if usages: message = "%s %s:<ul>" % \ (_("You cannot delete this timeperiod."), @@ -6296,7 +6307,7 @@ class TimeperiodSelection(ElementSelection): # - 1. rules: service/host-notification/check-period # - 2. user accounts (notification period) # - 3. excluded by other timeperiods -def find_usage_of_timeperiod(tpname): +def find_usages_of_timeperiod(tpname): # Part 1: Rules used_in = []

11 years, 4 months

Check_MK Git: check_mk: Now really fixed duplicate tag registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 15f449ddc7300c00ec97aa025b548eb1b42e968b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f449ddc7300c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 20:29:13 2013 +0100 Now really fixed duplicate tag registration --- web/htdocs/config.py | 12 +----------- web/htdocs/index.py | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 8e6b9b4..25dfd8d 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -408,17 +408,7 @@ def read_site_config(): def save_site_config(): save_user_file("siteconfig", user_siteconf) -# Datastructures and functions needed before plugins can be loaded -loaded_with_language = False - def load_plugins(): - global loaded_with_language - if loaded_with_language == current_language: - return - load_web_plugins("config", globals()) - # This must be set after plugin loading to make broken plugins raise - # exceptions all the time and not only the first time (when the plugins - # are loaded). - loaded_with_language = current_language +load_plugins() diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 882bdf4..ffd836c 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -34,8 +34,8 @@ __builtin__.current_language = None from mod_python import apache, util, Cookie import sys, os, pprint from lib import * -import livestatus, defaults, config -import htmllib, login, userdb, hooks, default_permissions +import livestatus +import defaults, config, htmllib, login, userdb, hooks, default_permissions # Load page handlers pagehandlers = {}

11 years, 4 months

Check_MK Git: check_mk: Fixed duplicate tag registration

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b74ae60b49efe06e4e64303d4d3f83d11e77ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b74ae60b49ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 20:06:58 2013 +0100 Fixed duplicate tag registration --- web/htdocs/index.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3eb3cb8..882bdf4 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -35,7 +35,6 @@ from mod_python import apache, util, Cookie import sys, os, pprint from lib import * import livestatus, defaults, config -config.load_plugins() import htmllib, login, userdb, hooks, default_permissions # Load page handlers

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0906

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a40a1db0950a55f5471e1b39d632faaa73ba10e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a40a1db0950a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 19:45:23 2013 +0100 Updated bug entries #0906 --- .bugs/906 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/906 b/.bugs/906 index 7e3b977..dc2c2a1 100644 --- a/.bugs/906 +++ b/.bugs/906 @@ -1,9 +1,9 @@ Title: logwatch.ec: Need some fallback mechanism if processing takes too long Component: checks -State: open +Class: bug +State: done Date: 2013-01-31 11:23:38 Targetversion: 1.2.2 -Class: bug Nagios kills Check_MK when it takes too long. When e.g. logwatch.ec is taking more than 60 seconds, the script is terminated and all unprocessed messages @@ -25,3 +25,6 @@ logwatch.ec: Add a third message processing mode, which writes a file into this spool directory named ".<hostname>_<item>_timestamp". Escape the "/" with "\" in the file name. After writing rename the file to the same name without the leading dot. + +2013-03-04 19:45:21: changed state open -> done +Has been implemented.

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0789

by Lars Michelsen

Module: check_mk Branch: master Commit: 90b4386fd582fc3f98e1d95bcebc01dce15f34c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90b4386fd582fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 12:24:56 2013 +0100 Updated bug entries #0789 --- .bugs/789 | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/.bugs/789 b/.bugs/789 index c330767..c6b0813 100644 --- a/.bugs/789 +++ b/.bugs/789 @@ -1,7 +1,7 @@ Title: Settings in multisite.mk without default values persist in browser cache Component: multisite Class: bug -State: wontfix +State: open Date: 2012-09-13 17:42:33 Targetversion: 1.2.3 @@ -11,6 +11,3 @@ must not modify files of the main distribution). If it once sets a value in multisite.mk and that is later removed (factory settings) then the positive settings survives in the browser cache. We need to find a method how extension modules can define or declare default values for settings in multisite.mk - -2013-03-04 12:24:04: changed state open -> wontfix -Wont fix this in 1.2.2.

11 years, 4 months

Check_MK Git: check_mk: Added plugins to config module to make registration of default values

by Lars Michelsen

Module: check_mk Branch: master Commit: 516bc21bf41b0bcb4d4b042c0c3a0de7f958c190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=516bc21bf41b0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 12:47:22 2013 +0100 Added plugins to config module to make registration of default values possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings --- .bugs/789 | 7 +- ChangeLog | 3 + mkeventd/web/plugins/config/mkeventd.py | 34 +++++ mkeventd/web/plugins/wato/mkeventd.py | 22 +--- web/htdocs/config.py | 223 +++---------------------------- web/plugins/config/bi.py | 31 +++++ web/plugins/config/builtin.py | 193 ++++++++++++++++++++++++++ web/plugins/config/wato.py | 38 ++++++ 8 files changed, 324 insertions(+), 227 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=516bc21bf4…

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0789

by Lars Michelsen

Module: check_mk Branch: master Commit: f0c333a1ff2d0410d5b5ec13ec2026aacbb57cab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0c333a1ff2d04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 12:24:11 2013 +0100 Updated bug entries #0789 --- .bugs/789 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/789 b/.bugs/789 index 46d43fe..c330767 100644 --- a/.bugs/789 +++ b/.bugs/789 @@ -1,9 +1,9 @@ Title: Settings in multisite.mk without default values persist in browser cache Component: multisite -State: open +Class: bug +State: wontfix Date: 2012-09-13 17:42:33 Targetversion: 1.2.3 -Class: bug If you write an extension (like mkeventd) that wants to put a settings into multisite.mk then it cannot put a default value into config.py (it @@ -11,3 +11,6 @@ must not modify files of the main distribution). If it once sets a value in multisite.mk and that is later removed (factory settings) then the positive settings survives in the browser cache. We need to find a method how extension modules can define or declare default values for settings in multisite.mk + +2013-03-04 12:24:04: changed state open -> wontfix +Wont fix this in 1.2.2.

11 years, 4 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fc91eebb378a095aa860c9bb402a9b8bac28e36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc91eebb378a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 19:41:45 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013