Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Fix headrify (it deleted files)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2e52b056415ce2130cbcfa85bd35cbf0c18aa4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e52b056415ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 13:38:12 2011 +0100 Fix headrify (it deleted files) --- doc/helpers/headrify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 62996a5..350d44f 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -78,7 +78,7 @@ headrify () if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ -o "${thirdline:0:20}" = "${shouldbe:0:20}" ] ; then - sed '0,/^'"${endline//\*/\*}"'$/d' $file | sed 1d >> $TMP + sed '0,/^'"$endline"'$/d' $file | sed 1d >> $TMP else cat $file >> $TMP fi

12 years, 9 months

Check_MK Git: check_mk: Updated file headers

by git＠mathias-kettner.de

12 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60dceec600e66c24ebcbbe17e72a1c94acd11f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60dceec600e66c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 11:59:38 2011 +0100 Fixed ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 999c096..3643936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,7 +100,7 @@ * FIX: lnx_if: assume interfaces as up if ethtool is missing or not working but interface has been used since last reboot. This fixes the problem where interface are not found by inventory. - * FIX: snmp_uptime: handels alternative timeformat * FIX: snmp_uptime: handels alternative timeformat + * FIX: snmp_uptime: handels alternative timeformat 1.1.12p4: Multisite:

12 years, 9 months

Check_MK Git: check_mk: FIX: snmp_uptime: fixed alternative time output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7deaf9ead161443dee68292eb9a82140da665217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7deaf9ead16144… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 11:54:27 2011 +0100 FIX: snmp_uptime: fixed alternative time output --- ChangeLog | 1 + checks/snmp_uptime | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 739f6a0..999c096 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * FIX: lnx_if: assume interfaces as up if ethtool is missing or not working but interface has been used since last reboot. This fixes the problem where interface are not found by inventory. + * FIX: snmp_uptime: handels alternative timeformat * FIX: snmp_uptime: handels alternative timeformat 1.1.12p4: Multisite: diff --git a/checks/snmp_uptime b/checks/snmp_uptime index dbcf882..7b20d07 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -33,7 +33,12 @@ def inventory_snmp_uptime(info): def check_snmp_uptime(checktype, _no_params, info): if len(info[0]) >= 1: ticks = info[0][0] - uptime = saveint(ticks[:-2]) + try: + uptime = int(ticks[:-2]) + except: + days, h, m, s = ticks.split(":") + uptime = (int(days) * 86400 ) + (int(h) * 3600) + (int(m) * 60) + int(float(s)) + days, rest = divmod(uptime, 60*60*24) hours, rest = divmod(rest, 60*60) minutes, seconds = divmod(rest, 60)

12 years, 9 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: e8fff432e1c06e5c3a4217932c04e6f22fa2b91b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8fff432e1c06e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 11:55:09 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: make host without site: belong to all sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45006cb8c21c0c4c181b98f97665354164017939 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45006cb8c21c0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 11:13:52 2011 +0100 make host without site: belong to all sites --- modules/check_mk.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index cd8b14e..b57ac2b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1085,9 +1085,8 @@ def filter_active_hosts(hostlist): if only_hosts == None and distributed_wato_site == None: return strip_tags(hostlist) elif only_hosts == None: - site_tag = "site:" + distributed_wato_site return [ hostname for hostname in strip_tags(hostlist) - if site_tag in tags_of_host(hostname) ] + if host_is_member_of_site(hostname, distributed_wato_site) ] elif distributed_wato_site == None: return [ hostname for hostname in strip_tags(hostlist) if in_binary_hostlist(hostname, only_hosts) ] @@ -1095,8 +1094,14 @@ def filter_active_hosts(hostlist): site_tag = "site:" + distributed_wato_site return [ hostname for hostname in strip_tags(hostlist) if in_binary_hostlist(hostname, only_hosts) - and site_tag in tags_of_host(hostname) ] + and host_is_member_of_site(hostname, distributed_wato_site) ] +def host_is_member_of_site(hostname, site): + for tag in tags_of_host(hostname): + if tag.startswith("site:"): + return site == tag[5:] + # hosts without a site: tag belong to all sites + return True

12 years, 9 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: 943555c3d1b30d0e2c16f749ff85f3243f70b443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=943555c3d1b30d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 11:12:04 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: Removed debugging line

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 245c00d91d79cd413bbb7950f55cd4199ec223bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=245c00d91d79cd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 11:10:41 2011 +0100 FIX: Removed debugging line --- modules/check_mk_base.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3d1feac..01d6cca 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -729,7 +729,6 @@ def check_unimplemented(checkname, params, info): # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios def do_all_checks_on_host(hostname, ipaddress): - import time ; time.sleep(5) global g_aggregated_service_results g_aggregated_service_results = {} global g_hostname

12 years, 9 months

Check_MK Git: check_mk: Distributed WATO: Always creating distributed_wato. mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c441ea792cd99d4c87978a25c07c25c5361f00ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c441ea792cd99d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 11:10:00 2011 +0100 Distributed WATO: Always creating distributed_wato.mk --- web/htdocs/wato.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 43e7eec..46a3070 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6415,9 +6415,7 @@ def update_distributed_wato_file(sites): for siteid, site in sites.items(): if site.get("replication"): distributed = True - if "socket" not in site \ - or site["socket"] == "unix:" + defaults.livestatus_unix_socket: - create_distributed_wato_file(siteid, site.get("replication")) + create_distributed_wato_file(siteid, site.get("replication")) if not distributed: delete_distributed_wato_file()

12 years, 9 months

Check_MK Git: check_mk: Automatically falling back to hardcoded default language if configured language is not available

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cbed4881d9c61a0a25d6d74dc921f604faf0c26e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbed4881d9c61a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 11:01:09 2011 +0100 Automatically falling back to hardcoded default language if configured language is not available --- ChangeLog | 2 ++ web/htdocs/index.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2db796d..739f6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ * Add Snapin page: show previews of all snapins * Add Snapin page: Trying to prevent dragging confusions by using other click event * New (hidden) button for reloading a snapin (left to the close button) + * Automatically falling back to hardcoded default language if configured + language is not available BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 9e67d4f..ea4f1de 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -170,7 +170,8 @@ def load_language(lang): i18n = gettext.translation('multisite', locale_base, languages = [ lang ], codeset = 'UTF-8') i18n.install(unicode = True) except IOError, e: - raise MKUserError('lang', 'No translation file found for the given language.') + # Fallback to hardcoded default if the given language does not exist + __builtin__.current_language = config.default_language # Main entry point for all HTTP-requests (called directly by mod_apache)

12 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011