Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 03ddf8e78e610ef86b1f1a82953a001d680236e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03ddf8e78e610e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 23 14:08:02 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: textarea: fix auto resizing, consider line wraps

by Mathias Kettner

Module: check_mk Branch: master Commit: 6becdf723b6446daf25271bf944ac254ba1cb30f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6becdf723b6446… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 23 14:08:00 2013 +0100 textarea: fix auto resizing, consider line wraps --- web/htdocs/js/checkmk.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2d165b5..5037422 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1554,8 +1554,7 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - var rows = oArea.value.split(/\r?\n|\r/).length; - oArea.rows = rows; + oArea.style.height = oArea.scrollHeight + "px"; } function valuespec_listof_add(varprefix, magic) {

11 years, 5 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: e7caecfb9055c4ededc08e48c91331cc9bd03c3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7caecfb9055c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 22 17:36:34 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: ValueSpec TextAreaUnicode: new auto-size feature

by Mathias Kettner

Module: check_mk Branch: master Commit: ec2cab485585db9c5b03e743c25723c83bcd8724 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec2cab485585db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 22 17:36:32 2013 +0100 ValueSpec TextAreaUnicode: new auto-size feature --- web/htdocs/htmllib.py | 7 ++++--- web/htdocs/js/checkmk.js | 5 +++++ web/htdocs/valuespec.py | 13 +++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bdb7081..6b7b05e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -557,14 +557,15 @@ class html: def password_input(self, varname, default_value = "", size=12, **args): self.text_input(varname, default_value, type="password", size = size, **args) - def text_area(self, varname, deflt="", rows=4, cols=30): + def text_area(self, varname, deflt="", rows=4, cols=30, attrs = {}): value = self.req.vars.get(varname, deflt) error = self.user_errors.get(varname) if error: self.write("<x class=inputerror>") - self.write("<textarea rows=%d cols=%d name=\"%s\">%s</textarea>\n" % ( - rows, cols, varname, attrencode(value))) + attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) + self.write("<textarea rows=%d cols=%d name=\"%s\"%s>%s</textarea>\n" % ( + rows, cols, varname, attributes, attrencode(value))) if error: self.write("</x>") self.set_focus(varname) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 492b0f4..2d165b5 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1553,6 +1553,11 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } } +function valuespec_textarea_resize(oArea) { + var rows = oArea.value.split(/\r?\n|\r/).length; + oArea.rows = rows; +} + function valuespec_listof_add(varprefix, magic) { var oCountInput = document.getElementById(varprefix + "_count"); var count = parseInt(oCountInput.value); diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 37ec526..51c964f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -484,13 +484,22 @@ class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) self._cols = kwargs.get("cols", 60) - self._rows = kwargs.get("rows", 20) + self._rows = kwargs.get("rows", 20) # Allowed: "auto" -> Auto resizing def value_to_text(self, value): return "<pre class=ve_textarea>%s</pre>" % value def render_input(self, varprefix, value): - html.text_area(varprefix, value, rows=self._rows, cols=self._cols) + if self._rows == "auto": + attrs = { "onkeyup" : 'valuespec_textarea_resize(this);' } + if html.has_var(varprefix): + rows = len(html.var(varprefix).splitlines()) + else: + rows = len(value.splitlines()) + else: + attrs = {} + rows = self._rows + html.text_area(varprefix, value, rows=rows, cols=self._cols, attrs = attrs) # Overridded because we do not want to strip() here and remove '\r' def from_html_vars(self, varprefix):

11 years, 5 months

Check_MK Git: check_mk: Switched version number in Changelog

by Mathias Kettner

Module: check_mk Branch: master Commit: 079b5678e0f9e4b5a94fa8e041350b92deac294d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=079b5678e0f9e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 22 15:59:50 2013 +0100 Switched version number in Changelog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44c1316..f49db56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.1i6: +1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including the performance graphs of hosts and services

11 years, 5 months

Check_MK Git: check_mk: Remove conflict from ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: ac0fc7d53f889b8b16ff87c98842dcbba6d60351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac0fc7d53f889b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 22 14:43:37 2013 +0100 Remove conflict from ChangeLog --- ChangeLog | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0746ae1..44c1316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,6 @@ Multisite: * Added comment painter to notification related views ->>>>>>> e75f82c19d125f6599dbc63b8defc4c589f7d363 WATO: * Added hr_mem check to the memory checkgroup to make it configurable in WATO

11 years, 5 months

Check_MK Git: check_mk: Code beautification for cmk -II on clusters

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d1ce7749fb62413c163ccd5d2e23d6538e22eb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d1ce7749fb624… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 22 14:39:36 2013 +0100 Code beautification for cmk -II on clusters --- modules/check_mk.py | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index efb5aee..6f0e9b4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -823,14 +823,14 @@ def is_cluster(hostname): # If host is node of one or more clusters, return a list of the clusters # (untagged). If not, return an empty list. def clusters_of(hostname): - return [ strip_tags(c) for c,n in clusters.items() if hostname in n] + return [ strip_tags(c) for c,n in clusters.items() if hostname in n ] # Determine wether a service (found on a physical host) is a clustered # service and - if yes - return the cluster host of the service. If # no, returns the hostname of the physical host. def host_of_clustered_service(hostname, servicedesc): - my_cluster = clusters_of(hostname) - if not my_cluster: # we are not a cluster node + the_clusters = clusters_of(hostname) + if not the_clusters: return hostname # 1. New style: explicitlely assigned services @@ -846,9 +846,7 @@ def host_of_clustered_service(hostname, servicedesc): # 1. Old style: clustered_services assumes that each host belong to # exactly on cluster if in_boolean_serviceconf_list(hostname, servicedesc, clustered_services): - cluster = clusters_of(hostname) - if cluster: - return cluster[0] + return the_clusters[0] return hostname @@ -4879,23 +4877,23 @@ if __name__ == "__main__": # or are no valid hostnames are considered to be tags. for host in hostnames: remove_autochecks_of(host, checknames) - clusters_of_host = clusters_of(host) - if clusters_of_host: - missing = [] - for clust in clusters_of_host: - for node in nodes_of(clust): - if node not in hostnames: - missing.append(node) - if len(missing) == 0: - if opt_verbose: - sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) - remove_autochecks_of(clust, checknames) - else: - sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % - (host, clust, ",".join(missing), clust)) - # if the host is part of a cluster and - # the other nodes of that cluster are - # also present in the list, then we also # drop the checks of the clusters + # If all nodes of a cluster are contained in the list, then + # also remove the autochecks of that cluster. Beware: a host + # can be part more multiple clusters + for clust in clusters_of(host): + missing = [] # collect nodes missing on the command line + for node in nodes_of(clust): + if node not in hostnames: + missing.append(node) + + if len(missing) == 0: + if opt_verbose: + sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) + remove_autochecks_of(clust, checknames) + + else: + sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % + (host, clust, ",".join(missing), clust)) else: for host in all_active_hosts() + all_active_clusters():

11 years, 5 months

Check_MK Git: check_mk: Removed old comment

by Lars Michelsen

Module: check_mk Branch: master Commit: 283d4899b6ad14970a0ffd58613c0cb5c8a67f1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=283d4899b6ad14… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 12:00:42 2013 +0100 Removed old comment --- checks/services | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/checks/services b/checks/services index bcf8ae5..d4410f7 100644 --- a/checks/services +++ b/checks/services @@ -216,10 +216,6 @@ def check_windows_services(item, params, info): return (best_state, infotext) - -# check_info['services'] = (check_windows_services, "service_%s", 0, inventory_windows_services) -# checkgroup_of['services'] = 'services' - factory_settings["services_default_levels"] = { "states" : [ ( "running", None, 0 ) ], "else" : 2,

11 years, 5 months

Check_MK Git: check_mk: cmk --notify: added missing vars NOTIFY_NOTIFICATIONAUTHOR, NOTIFY_NOTIFICATIONAUTHORNAME, NOTIFY_NOTIFICATIONAUTHORALIAS

by Lars Michelsen

Module: check_mk Branch: master Commit: e75f82c19d125f6599dbc63b8defc4c589f7d363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75f82c19d125f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 12:01:47 2013 +0100 cmk --notify: added missing vars NOTIFY_NOTIFICATIONAUTHOR, NOTIFY_NOTIFICATIONAUTHORNAME, NOTIFY_NOTIFICATIONAUTHORALIAS --- ChangeLog | 4 +++- check_mk_templates.cfg | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 558aa45..0fef4f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,9 @@ * cmk --notify: added notification script to generate HTML mails including the performance graphs of hosts and services * cmk --notify: added the macros NOTIFY_LASTHOSTSTATECHANGE, NOTIFY_HOSTSTATEID, - NOTIFY_LASTSERVICESTATECHANGE, NOTIFY_SERVICESTATEID and NOTIFY_NOTIFICATIONCOMMENT + NOTIFY_LASTSERVICESTATECHANGE, NOTIFY_SERVICESTATEID, NOTIFY_NOTIFICATIONCOMMENT, + NOTIFY_NOTIFICATIONAUTHOR, NOTIFY_NOTIFICATIONAUTHORNAME, NOTIFY_NOTIFICATIONAUTHORALIAS + Checks & Agents: * FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 4e26a86..051cca4 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -340,6 +340,9 @@ define command { NOTIFY_LONGDATETIME='$LONGDATETIME$' \ NOTIFY_HOSTDOWNTIME='$HOSTDOWNTIME$' \ NOTIFY_NOTIFICATIONCOMMENT='$NOTIFICATIONCOMMENT$' \ + NOTIFY_NOTIFICATIONAUTHOR='$NOTIFICATIONAUTHOR$' \ + NOTIFY_NOTIFICATIONAUTHORNAME='$NOTIFICATIONAUTHORNAME$' \ + NOTIFY_NOTIFICATIONAUTHORALIAS='$NOTIFICATIONAUTHORALIAS$' \ NOTIFY_HOSTTAGS='$_HOSTTAGS$' \ @BINDIR@/check_mk --notify }

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0898

by Lars Michelsen

Module: check_mk Branch: master Commit: c77ed4045cec58fab1ca955b344ea4350935e6bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c77ed4045cec58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 09:56:37 2013 +0100 Updated bug entries #0898 --- .bugs/898 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/898 b/.bugs/898 new file mode 100644 index 0000000..434e964 --- /dev/null +++ b/.bugs/898 @@ -0,0 +1,16 @@ +Title: Unresolvable host prevents loading configuration (bad behaviour) +Component: core +State: open +Date: 2013-01-22 09:44:36 +Targetversion: 1.4.0 +Class: nastiness + +It seems strange, I am able to add a host to Check_MK by the host name and +while the name can be resolved everything is OK. But once the name is not +resolvable anymore (for whatever reason), the monitoring still works but +if I want to rewrite the config and restart nagios, the process is blocked +by that unresolvable host. + +This seems a bit nasty. It would be better to have a warning message or just +no message while applying the config. The monitoring will show me the fact +that the host is not resolvable.

11 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013