Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 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: 492fffa92122b25b0d4f05aed3eb13bd6d1d27e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=492fffa92122b2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 26 15:32:26 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Added new setting to logwatch to change service output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfccb0ecf035425fedd039f80692886858a54bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfccb0ecf03542… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 26 15:32:13 2012 +0200 Added new setting to logwatch to change service output --- checkman/logwatch | 4 ++++ checks/logwatch | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checkman/logwatch b/checkman/logwatch index 066da97..da4d90c 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -86,3 +86,7 @@ logwatch_dir (string): Directory where log messages are For each host a subdirectory is created. The name of the files therein are the names of the logfiles with slashes replaced by backslashes. + +logwatch_service_output (string): Change the output of the service to ony + print stats and not the last error message. Default is {default}, use {small} if + you only want to have the stats. diff --git a/checks/logwatch b/checks/logwatch index c98b65d..cf798b2 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -30,9 +30,10 @@ logwatch_dir = var_dir + '/logwatch' logwatch_patterns = { } logwatch_rules = [] logwatch_max_filesize = 500000 # do not save more than 500k of message (configurable) +logwatch_service_output = "default" # Variables embedded in precompiled checks -check_config_variables += [ "logwatch_dir", "logwatch_max_filesize" ] +check_config_variables += [ "logwatch_dir", "logwatch_max_filesize", "logwatch_service_output" ] def inventory_logwatch(info): inventory = [] @@ -348,9 +349,11 @@ def check_logwatch(item, params, info): count_txt = [] for level, num in state_counts.iteritems(): count_txt.append('%d %s' % (num, logwatch_level_name(level))) - - return (worst, state + " - %s messages (Last worst: \"%s\")" % + if logwatch_service_output == 'default': + return (worst, state + " - %s messages (Last worst: \"%s\")" % (', '.join(count_txt), last_worst_line)) + else: + return (worst, state + " - %s messages" % ', '.join(count_txt)) check_info['logwatch'] = {

12 years

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: 203b1d55c7fae146bb8a9283f2175970aa313e64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203b1d55c7fae1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 25 15:58:24 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: Removed old file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3885efeca4221099795e34d7f6eab8c0f2bdada2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3885efeca42210… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 25 13:44:27 2012 +0200 Removed old file --- MIGRATION_NOTES | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/MIGRATION_NOTES b/MIGRATION_NOTES deleted file mode 100644 index 40fc9a0..0000000 --- a/MIGRATION_NOTES +++ /dev/null @@ -1,21 +0,0 @@ -Migration notes for wato-ng: - -1. Hostlisten sind abgeschafft, Dateien müssen hosts.mk heißen. - In doc/helpers gibt es ein Migrationsskript. -2. Dateien müssen unter /wato/ liegen. -3. wato_host_tags anstelle von host_tags. Das id-Feld ist - jetzt zwingend vorgeschrieben. None ist (wohl?) nicht mehr - erlaubt. -4. if und Freunde: es sind nur noch dictionary parameter erlaubt - if_default_levels = { ... } wurden eingeführt. Die if_... - Variablen für Defaultlevels gibt es nicht mehr. - -Dokumentation: - -- checkgroup_parameters erklären. Evtl. noch erklären, wie man die Checkgroup - herausbekommt. cmk -L soll diese ausgeben. cmk -M soll die auch ausgeben. - -- timeperiods erklären, evtl. umbenennen nach define_timeperiods? -- define_contacts erklären - -

12 years

Check_MK Git: check_mk: Fixed fsc_temp check in case of sensor problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 625934b59a8ed8858e04f4a9313f2ffe1539a0be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=625934b59a8ed8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 25 14:52:03 2012 +0200 Fixed fsc_temp check in case of sensor problems --- checks/fsc_temp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/fsc_temp b/checks/fsc_temp index b29bb00..0fc36d8 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -37,7 +37,9 @@ def check_fsc_temp(item, _no_params, info): crit = int(line[3]) infotext = "%d C (levels at %d C / %d C)" % (current, warn, crit) perfdata = [ ("temp", current, warn, crit, 0 ) ] - if current >= crit and crit > 0: + if current == -1: + return(3, "UNKNOWN - Problem with sensor") + elif current >= crit and crit > 0: return (2, "CRIT - %s" % infotext, perfdata) elif current >= warn and warn > 0: return (1, "WARN - %s" % infotext, perfdata)

12 years

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: a356f396f9189217a4ecb1288086c7967ada8955 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a356f396f91892… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 25 14:52:14 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Updated bug entries #0724

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cdea01799f882ba6f02b02806cf0d46dcedeb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cdea01799f882… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 16:38:23 2012 +0200 Updated bug entries #0724 --- .bugs/724 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/724 b/.bugs/724 index f84c29b..d1ac80a 100644 --- a/.bugs/724 +++ b/.bugs/724 @@ -1,9 +1,12 @@ Title: Notification delay WATO rules only save first service listed Component: wato -State: open +Class: bug +State: works4me Date: 2012-08-21 13:25:39 Targetversion: 1.2.0 -Class: bug WATO shows entries for multiple services if you try to define a notification delay, but only the first service named will also be in the stored ruleset. + +2012-09-24 16:38:21: changed state open -> works4me +Works over here.

12 years

Check_MK Git: check_mk: Fixed typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22f12e076958bb5669c57f4bfc38e43b61971c66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f12e076958bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 15:11:25 2012 +0200 Fixed typo --- .bugs/701 | 7 +++++-- .bugs/761 | 7 +++++-- .bugs/782 | 7 +++++-- web/htdocs/wato.py | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.bugs/701 b/.bugs/701 index 9f2f392..e9076a7 100644 --- a/.bugs/701 +++ b/.bugs/701 @@ -1,10 +1,13 @@ Title: Logout not working when configured cookie auth but using basic auth Component: multisite -State: open +Class: bug +State: wontfix Date: 2012-07-09 09:31:42 Targetversion: future -Class: bug Multisite can be configured to use cookie auth but uses basic auth when available. In this case of implicit basic auth usage the logout functionality does not work since the page_logout() function only takes the configured option into account. + +2012-09-24 15:07:42: changed state open -> wontfix +This is a case of misconfiguration. There is no easy fix possible at the moment - closing. diff --git a/.bugs/761 b/.bugs/761 index c3c2287..8178a68 100644 --- a/.bugs/761 +++ b/.bugs/761 @@ -1,11 +1,14 @@ Title: ValueSpec ListOf breaks during user input error Component: multisite -State: open +Class: bug +State: done Date: 2012-05-30 10:23:56 Targetversion: 1.2.0 -Class: bug When an element of a ListOf() raises a user validation error then the total ListOf() seems to fall back to its original value - for example I've added a value and then changed its position to top and then saved. + +2012-09-24 15:08:34: changed state open -> done +Has already been fixed in 1.2.1i1 diff --git a/.bugs/782 b/.bugs/782 index 3dc9589..40b1355 100644 --- a/.bugs/782 +++ b/.bugs/782 @@ -1,9 +1,12 @@ Title: WATO Homescreen has "refresh: 0 secs" in bottom line Component: wato -State: open +Class: nastiness +State: done Date: 2012-07-04 08:27:52 Targetversion: 1.2.0 -Class: nastiness In htmllib.py we need to suppress this message if the refresh is 0. + +2012-09-24 14:58:33: changed state open -> done +Has already been solved. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c40939d..e8ec7d5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8934,7 +8934,7 @@ def mode_edit_hosttag(phase): _("The tag ID '%s' is already being used as auxiliary tag.") % id) if len(new_choices) == 0: - raise MKUserError("id_0", _("Please specify at least on tag.")) + raise MKUserError("id_0", _("Please specify at least one tag.")) if len(new_choices) == 1 and new_choices[0][0] == None: raise MKUserError("id_0", _("Tags with only one choice must have an ID."))

12 years

Check_MK Git: check_mk: Added "view" parameter to dashlet_pnpgraph webservice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7d42fd8baa99d6e9abbff950e852a2fcee04989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d42fd8baa99d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 14:38:05 2012 +0200 Added "view" parameter to dashlet_pnpgraph webservice --- .bugs/702 | 7 +++++-- ChangeLog | 4 ++++ web/htdocs/dashboard.py | 11 +++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bugs/702 b/.bugs/702 index 1fcb715..212e042 100644 --- a/.bugs/702 +++ b/.bugs/702 @@ -1,8 +1,11 @@ Title: dashlet_pnpgraph is missing parameter "view" Component: multisite -State: open +Class: bug +State: done Date: 2012-07-27 10:26:30 Targetversion: 1.2.0 -Class: bug The view parameter is always set to 0. + +2012-09-24 14:37:03: changed state open -> done +Has just been implemented. diff --git a/ChangeLog b/ChangeLog index 129299c..c6a68c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0p3 + Mulitisite + * Added "view" parameter to dashlet_pnpgraph webservice + 1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c2076e0..bacb6a2 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -616,14 +616,17 @@ if (has_canvas_support()) { """ % { "x" : pie_diameter / 2, "y": pie_diameter/2, "d" : pie_diameter, 'p': '\n'.join(pie_parts) }) def dashlet_pnpgraph(): - render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0))) + render_pnpgraph( + html.var("site"), html.var("host"), html.var("service"), + int(html.var("source", 0)), int(html.var("view", 0)), + ) def dashlet_nodata(): html.write("<div class=nograph><div class=msg>") html.write(html.var("message", _("No data available."))) html.write("</div></div>") -def render_pnpgraph(site, host, service=None, source=0): +def render_pnpgraph(site, host, service = None, source = 0, view = 0): if not host: html.message("Invalid URL to this dashlet. Missing <tt>host</tt>") return; @@ -635,8 +638,8 @@ def render_pnpgraph(site, host, service=None, source=0): else: base_url = html.site_status[site]["site"]["url_prefix"] base_url += "pnp4nagios/index.php/" - var_part = "?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ - (pnp_cleanup(host), pnp_cleanup(service), source, int(time.time())) + var_part = "?host=%s&srv=%s&view=0&source=%d&view=%d&theme=multisite&_t=%d" % \ + (pnp_cleanup(host), pnp_cleanup(service), source, view, int(time.time())) pnp_url = base_url + "graph" + var_part img_url = base_url + "image" + var_part

12 years

Check_MK Git: check_mk: FIX: It is now possible to create clusters in empty folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5986ef2f8f9bf52e642b6908d5558efc15405cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5986ef2f8f9bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 16:29:25 2012 +0200 FIX: It is now possible to create clusters in empty folders --- .bugs/718 | 7 +++++-- .bugs/731 | 7 +++++-- .bugs/738 | 7 +++++-- .bugs/740 | 7 +++++-- .bugs/797 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 25 ++++++++++++------------- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.bugs/718 b/.bugs/718 index c40b25d..a9b9368 100644 --- a/.bugs/718 +++ b/.bugs/718 @@ -1,9 +1,9 @@ Title: WATO tags menue has issues when deleting tags Component: wato -State: open +Class: bug +State: done Date: 2012-08-10 16:42:19 Targetversion: future -Class: bug If you create an empty tag (desc. and tag id) and then another one the empty tag will corrupt the tag id's. @@ -11,3 +11,6 @@ It seems this faulty state is also saved: If you delete another tag later on, all tags below the tag you're deleting are also lost. It's already verified to be a bug ;) + +2012-09-24 15:33:16: changed state open -> done +It is not possible to define empty tag ids or descriptions anymore. Should be solved now. diff --git a/.bugs/731 b/.bugs/731 index 23473e9..16ec9ea 100644 --- a/.bugs/731 +++ b/.bugs/731 @@ -1,9 +1,12 @@ Title: Link to pnp4nagios when hash key in service description Component: multisite -State: open +Class: bug +State: done Date: 2012-07-10 11:43:04 Targetversion: future -Class: bug On service icon linkes, the hash char are not replaced by %23 so the link doesent work on pnp service graph line, just the first hash a replaced + +2012-09-24 15:58:44: changed state open -> done +Works in current versions diff --git a/.bugs/738 b/.bugs/738 index 407d28c..9352274 100644 --- a/.bugs/738 +++ b/.bugs/738 @@ -1,8 +1,11 @@ Title: Creating clusters in emtpty wato folders Component: wato -State: open +Class: bug +State: done Date: 2012-08-21 14:13:37 Targetversion: 1.2.0 -Class: bug It is not possible to create an cluster host in an folder without normal hosts in it. + +2012-09-24 16:28:51: changed state open -> done +It is now possible to create clusters in empty folders. diff --git a/.bugs/740 b/.bugs/740 index fb0ce4f..64c8a64 100644 --- a/.bugs/740 +++ b/.bugs/740 @@ -1,8 +1,11 @@ Title: Empty "Monitoring on Host field" deleteds all Wato config Component: wato -State: open +Class: bug +State: done Date: 2012-09-04 11:35:16 Targetversion: 1.2.0 -Class: bug In replicated wato settings all configuration get lost, when the Monitoring on host field is empty on creating a host + +2012-09-24 16:03:22: changed state open -> done +It is not possible to select an empty value in "monitored on". So this bug has been fixed. diff --git a/.bugs/797 b/.bugs/797 index b74b5bd..6e4fafc 100644 --- a/.bugs/797 +++ b/.bugs/797 @@ -1,9 +1,9 @@ Title: PNP Graph zoom zooms wrong position Component: multisite -State: open +Class: bug +State: wontfix Date: 2012-08-22 11:21:24 Targetversion: 1.2.0 -Class: bug If you make a area selection on a pnp graphs displayed in multisite you end up at a different position in the graph than you expected @@ -11,3 +11,6 @@ If you try to view the right-most position, it will not be possible because you always get something else. LM: Where can PNP graphs be zoomed while being displayed in multisite? + +2012-09-24 15:59:27: changed state open -> wontfix +Can not reproduce. Closing this. Please report back with a detailed description how to reproduce. diff --git a/ChangeLog b/ChangeLog index 3b703ba..2152120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Added "view" parameter to dashlet_pnpgraph webservice WATO + * FIX: It is now possible to create clusters in empty folders * FIX: Fixed problem with complaining empty ListOf() valuespecs 1.2.1i1: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e8ec7d5..2fdc5f1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -704,18 +704,18 @@ def save_hosts(folder = None): out.write(' %s,\n' % entry) out.write("]\n") - if len(clusters) > 0: - out.write("\nclusters.update({") - for entry, nodes in clusters: - out.write('\n %s : %s,\n' % (entry, repr(nodes))) - out.write("})\n") - - if len(ipaddresses) > 0: - out.write("\n# Explicit IP addresses\n") - out.write("ipaddresses.update(") - out.write(pprint.pformat(ipaddresses)) - out.write(")") - out.write("\n") + if len(clusters) > 0: + out.write("\nclusters.update({") + for entry, nodes in clusters: + out.write('\n %s : %s,\n' % (entry, repr(nodes))) + out.write("})\n") + + if len(ipaddresses) > 0: + out.write("\n# Explicit IP addresses\n") + out.write("ipaddresses.update(") + out.write(pprint.pformat(ipaddresses)) + out.write(")") + out.write("\n") for nag_varname, entries in custom_macros.items(): macrolist = [] @@ -1889,7 +1889,6 @@ def mode_edithost(phase, new, cluster): if hostname: go_to_services = html.var("services") if html.check_transaction(): - if new: g_folder[".hosts"][hostname] = host mark_affected_sites_dirty(g_folder, hostname)

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits