Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: FIX: syntax error in man page of cisco_power

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0acc566efbe0e06391d084034004f8ac999a9bc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0acc566efbe0e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:26:26 2011 +0200 FIX: syntax error in man page of cisco_power --- ChangeLog | 1 + checkman/cisco_power | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index da92d65..9b5b2c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: cisco_power: fix syntax error in man page (broke also Multisite) * FIX: local: fixed search for custom templates PNP template * FIX: if/if64: always generate unique items (in case ifAlias is used) * FIX: ipmi: fix ugly ouput in case of warning and error diff --git a/checkman/cisco_power b/checkman/cisco_power index 70f5390..a98cc94 100644 --- a/checkman/cisco_power +++ b/checkman/cisco_power @@ -3,6 +3,7 @@ agents: snmp author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk +description: This check monitors the health of redundant power supplies in CISCO switches. If one of the two power supplies fails, the check goes critical.

13 years, 5 months

Check_MK Git: check_mk: FIX: cmk -II also refreshes cluster checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64cb66de650cfa6283a86eb613d803877be51400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cb66de650cfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 28 08:38:02 2011 +0200 FIX: cmk -II also refreshes cluster checks But only if all nodes of the cluster are specified as hosts to -II. If you only specify some, then a warning is printed an the cluster is untouched. Otherwise service (originated at the other nodes) might get lost. --- .bugs/16 | 32 +++++++++++++++++++++++++++++--- ChangeLog | 1 + modules/check_mk.py | 20 +++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/.bugs/16 b/.bugs/16 index 7dd601e..80f13e2 100644 --- a/.bugs/16 +++ b/.bugs/16 @@ -1,10 +1,11 @@ Title: check_mk -II bei Clustern löscht die Checks nicht Component: core +State: done +Class: bug +Date: 2010-12-21 12:15:32 Benefit: 2 -State: open Cost: 3 -Date: 2010-12-21 12:15:32 -Class: bug +Fun: 0 Wenn man ein check_mk -II macht, dann werden clustered services nicht entfernt. Um das sauber hinzubekommen, muss man sicherstellen, @@ -20,3 +21,28 @@ zulässt und dann einfach automatisch anstelle dessen die Nodes inventarisiert und zusätzlich die Checks vom Cluster entfernt. Das könnte eine einfache Lösung sein. So sorgt der User selbst dafür, dass der Cluster richtig behandelt wird. + +Dabei stellt sich mir die Frage, ob es eigentlich einen Inventur-Check +auf den Cluster gibt, oder wie das geregelt ist. + +Noch weiter in die Zukunft gedacht, gibt es die Idee, dass clustered_services +(und auch ignored_services), garnicht mehr bei der Inventur angewandt wird, +sondern generell nach dem Einlesen der Autochecks. Die manuellen Checks +sollten ja nicht betroffen sein. Wenn man schon was in ignored services +auflistet, warum sollte es dann trotzdem gecheckt werden, blos weil man +es man früher aufgenommen hat? + +Der Vorteil - im Bezug auf die Clustered Services - könnte sein, dass man +noch weiß, woher der Service ursprünglich kam. Andererseits kann dann +folgendes passieren: + +1. Inventur findet service X auf Node A +2. service schenkt auf B +3. Man macht cmk -II auf A +4. nun ist der Service weg! + +===> Ist also auch keine wirklich gute Lösung. + +2011-04-28 08:37:57: changed state open -> done +-II entfernt jetzt auch die Cluster Checks, falls alle nodes +angegeben wurden. diff --git a/ChangeLog b/ChangeLog index 3e7aed8..da92d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: cmk -II also refreshes cluster checks, if all nodes are specified * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services diff --git a/modules/check_mk.py b/modules/check_mk.py index ec53c54..4cb4457 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -723,7 +723,7 @@ def is_cluster(hostname): return False # If host is node of a cluster, return name of that cluster -# (untagged). If not, return None. If a host belongt to +# (untagged). If not, return None. If a host belongs to # more than one cluster, then a random cluster is choosen. def cluster_of(hostname): for clustername, nodes in clusters.items(): @@ -4190,6 +4190,24 @@ if __name__ == "__main__": if len(hostnames) > 0: for host in hostnames: remove_autochecks_of(host, checknames) + clust = cluster_of(host) + if clust: + missing = [] + for node in clusters[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, clust)) + 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 + else: for host in all_active_hosts() + all_active_clusters(): remove_autochecks_of(host, checknames)

13 years, 5 months

Check_MK Git: check_mk: Multisite: fix font size in tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae5fa5e3692e7f208f497b61f23abe298546a9d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae5fa5e3692e7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 27 17:52:53 2011 +0200 Multisite: fix font size in tables --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a04d71d..bcc2895 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -20,7 +20,7 @@ td, th { vertical-align: top; } -input, select { +input, td, select { font-size: 9pt; }

13 years, 5 months

Check_MK Git: check_mk: Fix check_mk.css after merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fee697b269c2c802793366e595575abf3b94ff2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fee697b269c2c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 16:59:13 2011 +0200 Fix check_mk.css after merge --- web/htdocs/check_mk.css | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e5d6c3..a04d71d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -743,16 +743,6 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; -======= -td.perfometer div.title { - height: 0px; - position: relative; - top: 3px; - left: 0px; - width: 120px; - text-align: center; - white-space: nowrap; ->>>>>>> A lot of additional styling cleanups }

13 years, 5 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: c7024505aa55676bb16d5decf6ab51cde48fa686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7024505aa5567… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 16:59:23 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 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: 04c05a77b9bd3232c06cd705138cd57c794a79a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04c05a77b9bd32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 15:49:02 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: Fixed merge problem during style cleanup

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: be51eaf742dbbf45f8f863fe701ff6867f84cc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be51eaf742dbbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 15:34:04 2011 +0200 Fixed merge problem during style cleanup --- web/htdocs/check_mk.css | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e5d6c3..a04d71d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -743,16 +743,6 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; -======= -td.perfometer div.title { - height: 0px; - position: relative; - top: 3px; - left: 0px; - width: 120px; - text-align: center; - white-space: nowrap; ->>>>>>> A lot of additional styling cleanups }

13 years, 5 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: 97b729bd651e56072baa212420682c830c47f88f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97b729bd651e56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:11:58 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: FIX: avoid floating points with e in performance data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc9e591e458208cd309e41b7badb124a963072fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc9e591e458208… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:11:09 2011 +0200 FIX: avoid floating points with e in performance data --- ChangeLog | 1 + modules/check_mk_base.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b765fdd..3e7aed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 31c0aba..9c1e601 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -888,11 +888,15 @@ def open_command_pipe(): -def none_to_empty(x): +def convert_perf_value(x): if x == None: return "" - else: + elif type(x) in [ str, unicode ]: return x + elif type(x) == float: + return ("%.6f" % x).rstrip("0").rstrip(".") + else: + return str(x) def submit_check_result(host, servicedesc, result, sa): @@ -921,7 +925,7 @@ def submit_check_result(host, servicedesc, result, sa): for p in perfdata: # replace None with "" and fill up to 6 values - p = (map(none_to_empty, p) + ['','','',''])[0:6] + p = (map(convert_perf_value, p) + ['','','',''])[0:6] perftexts.append("%s=%s;%s;%s;%s;%s" % tuple(p) ) if perftexts != [] and not direct_rrd_update(host, servicedesc, perfdata): if check_command and perfdata_format == "pnp":

13 years, 5 months

Check_MK Git: check_mk: Fixed replacement issue

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10f406fb9eb08fcbb411e166d7dafb5554981436 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10f406fb9eb08f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 11:43:00 2011 +0200 Fixed replacement issue --- web/htdocs/check_mk.css | 4 ++-- web/htdocs/sidebar.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1d83ee5..6e5d6c3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -534,13 +534,13 @@ table.navi tr.form td.form { padding: 0; } -table.navi tr.form td.#fffborder { +table.navi tr.form td.whiteborder { border-left: 1px solid #fff; border-right: 1px solid #fff; border-bottom: 1px solid #fff; } -table.navi tr.form div.#fffborder, table.navi tr.form table.#fffborder { +table.navi tr.form div.whiteborder, table.navi tr.form table.whiteborder { border-left: 1px solid #fff; border-right: 1px solid #fff; margin: 0; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 0d11e18..465ee5c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -118,8 +118,7 @@ def sidebar_foot(): html.write('<div id="side_footer">') if config.may("configure_sidebar"): html.write('<div class=button>\n') - html.write('<a target="main" href="sidebar_add_snapin.py"') - html.write('>Add snapin</a></div>') + html.write('<a target="main" href="sidebar_add_snapin.py">Add snapin</a></div>') html.write("<div class=copyright>© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>\n") html.write('</div>')

13 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011