Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: gb: allow filtering

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 603b5d0e845f4923170ed10b5a82617ca7ca3e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=603b5d0e845f49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 21 13:33:33 2010 +0100 gb: allow filtering --- gb | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/gb b/gb index 559d48f..af7fb6b 100755 --- a/gb +++ b/gb @@ -143,9 +143,33 @@ def show_bug(bug): def main_list(args): bugs = g_bugs.values() + # arguments are tags from state, component and class. Multiple values + # in one class are orred. Multiple types are anded. + filters = {} + for a in args: + hit = False + for tp, values in [ + ( "component", components ), ( "state", states ), ( "class", classes ), ]: + for v in values: + if v.startswith(a): + entries = filters.get(tp, []) + entries.append(v) + filters[tp] = entries + hit = True + break + if hit: + break + if not hit: + bail_out("No such component, state or class: %s" % a) + # sort for bug in bugs: - if len(args) == 0 or bug["state"].startswith(args[0]): + skip = False + for tp, entries in filters.items(): + if bug[tp] not in entries: + skip = True + break + if not skip: list_bug(bug)

13 years, 9 months

Check_MK Git: check_mk: New internal mini-bugtracker: gb

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a8021a6b16d47d3a8b582c24af8b279f2e120305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8021a6b16d47d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 21 09:55:08 2010 +0100 New internal mini-bugtracker: gb --- gb | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 290 insertions(+), 0 deletions(-) diff --git a/gb b/gb new file mode 100755 index 0000000..1cadd90 --- /dev/null +++ b/gb @@ -0,0 +1,290 @@ +#!/usr/bin/python + +import sys, os, time, termios, tty + +# colored output, if stdout is a tty +if sys.stdout.isatty(): + tty_red = '\033[31m' + tty_green = '\033[32m' + tty_yellow = '\033[33m' + tty_blue = '\033[34m' + tty_magenta = '\033[35m' + tty_cyan = '\033[36m' + tty_white = '\033[37m' + tty_bgblue = '\033[44m' + tty_bgmagenta = '\033[45m' + tty_bgwhite = '\033[47m' + tty_bold = '\033[1m' + tty_underline = '\033[4m' + tty_normal = '\033[0m' +else: + tty_red = '' + tty_green = '' + tty_yellow = '' + tty_blue = '' + tty_magenta = '' + tty_cyan = '' + tty_white = '' + tty_bgblue = '' + tty_bgmagenta = '' + tty_bold = '' + tty_underline = '' + tty_normal = '' + tty_ok = 'OK' + +state_colors = { + "open" : tty_blue, + "done" : tty_green, + "closed" : tty_normal, +} + +components = [ "core", "checks", "multisite", "livestatus", "wato" ] + +def bail_out(text): + sys.stderr.write(text + "\n") + sys.exit(1) + + +def goto_bugsdir(): + base_dir = os.path.abspath('.') + while not os.path.exists(".bugs") and os.path.abspath('.') != '/': + os.chdir("..") + + try: + os.chdir(".bugs") + except: + sys.stderr.write("Cannot find directory .bugs\n") + sys.exit(1) + +def load_bugs(): + global g_bugs + g_bugs = {} + for entry in os.listdir("."): + try: + bugid = int(entry) + try: + g_bugs[bugid] = load_bug(bugid) + except: + sys.stderr.write("SKIPPING INVALID BUG %d\n" % bugid) + except: + continue + + +def load_bug(bugid): + bug = { + "id" : bugid, + "cost" : 1, + "benefit" : 1, + "fun" : 0, + "state" : "unknown", + "title" : "unknown", + "component" : "general", + } + + f = file(str(bugid)) + for line in f: + line = line.strip() + if line == "": + break + header, value = line.split(":", 1) + bug[header.strip().lower()] = value.strip() + + description = "" + for line in f: + description += line + + bug["description"] = description + return bug + +def save_bug(bug): + f = file(str(bug["id"]), "w") + f.write("Title: %s\n" % bug["title"]) + for key, val in bug.items(): + if key not in [ "title", "description", "id" ]: + f.write("%s%s: %s\n" % (key[0].upper(), key[1:], val)) + f.write("\n") + f.write(bug["description"]) + f.close() + os.system("git add %d" % bug["id"]) + +def next_bug_id(): + return max(g_bugs.keys()) + 1 + +def add_comment(bug, title, comment): + bug["description"] += """ +%s: %s +%s""" % (time.strftime("%F %T"), title, comment) + + + +def usage(): + sys.stdout.write("""Usage: gb COMMAND [ARGS...] + +where COMMAND is one of: + + list [STATE] ... list bugs + new ... create a new bug + show [ID ID..] ... show several bugs (or all open) + resolve ID ... change a bugs state + delete ID.. ... delete bug(s) + +""") + sys.exit(1) + +def bug_state(bug): + state = bug["state"] + return "%s%-7s%s" % (tty_bold + state_colors.get(state, ""), state, tty_normal) + +def list_bug(bug): + sys.stdout.write("#%04d %-7s %-60s\n" % + (int(bug["id"]), bug_state(bug), bug["title"])) + +def show_bug(bug): + list_bug(bug) + sys.stdout.write("\n%s\n" % bug["description"]) + +def main_list(args): + bugs = g_bugs.values() + # sort + for bug in bugs: + if len(args) == 0 or bug["state"].startswith(args[0]): + list_bug(bug) + + +def main_show(args): + ids = args + if len(ids) == 0: + ids = [ id for (id, bug) in g_bugs.items() if bug["state"] == "open" ] + for id in ids: + if id != ids[0]: + sys.stdout.write("-------------------------------------------------------------------------------\n") + show_bug(g_bugs[int(id)]) + +def get_input(what, default = ""): + sys.stdout.write("%s: " % what) + sys.stdout.flush() + value = sys.stdin.readline().strip() + if value == "": + return default + else: + return value + +def get_long_input(what): + sys.stdout.write("Enter %s. End with CTRL-D.\n" % what) + usertext = sys.stdin.read() + # remove leading and trailing empty lines + while usertext.startswith("\n"): + usertext = usertext[1:] + while usertext.endswith("\n\n"): + usertext = usertext[:-1] + return usertext + +def getch(): + fd = sys.stdin.fileno() + old_settings = termios.tcgetattr(fd) + try: + tty.setraw(sys.stdin.fileno()) + ch = sys.stdin.read(1) + finally: + termios.tcsetattr(fd, termios.TCSADRAIN, old_settings) + if ord(ch) == 3: + raise KeyboardInterrupt() + return ch + +def input_choice(what, choices): + ctc = {} + texts = [] + for choice in choices: + for c in choice: + if c not in ctc: + ctc[c] = choice + texts.append(choice.replace(c, tty_bold + c + tty_normal, 1)) + break + + while True: + sys.stdout.write("%s (%s): " % (what, ", ".join(texts))) + sys.stdout.flush() + c = getch() + if c in ctc: + return ctc[c] + +def main_new(args): + bug = {} + bug["id"] = next_bug_id() + bug["state"] = "open" + bug["date"] = time.strftime("%F %T") + bug["title"] = get_input("Title") + if bug["title"] == "": + sys.stderr.write("Cancelled.\n") + sys.exit(0) + bug["cost"] = int(get_input("Cost", 1)) + bug["benefit"] = int(get_input("Benefit", 1)) + + bug["description"] = get_long_input("description") + g_bugs[bug["id"]] = bug + save_bug(bug) + sys.stdout.write("Bug saved with id %d.\n" % bug["id"]) + +def main_resolve(args): + if len(args) != 1: + usage() + id = int(args[0]) + bug = g_bugs.get(id) + if not bug: + bail_out("No such bug.\n") + + list_bug(bug) + state = input_choice("State", state_colors.keys()) + + comment = get_long_input("comment") + add_comment(bug, "changed state %s -> %s" % (bug["state"], state), comment) + bug["state"] = state + save_bug(bug) + +def main_delete(args): + for ids in args: + if 0 == os.system("git rm %s" % ids): + sys.stdout.write("Delete bug %s (%s)\n" % (ids, g_bugs[int(ids)]["descriptions"])) + + + +# _ +# _ __ ___ __ _(_)_ __ +# | '_ ` _ \ / _` | | '_ \ +# | | | | | | (_| | | | | | +# |_| |_| |_|\__,_|_|_| |_| +# + +goto_bugsdir() +load_bugs() + +if len(sys.argv) < 2: + usage() + +cmd = sys.argv[1] +commands = { + "list" : main_list, + "show" : main_show, + "new" : main_new, + "resolve" : main_resolve, + "delete" : main_delete, +} + +hits = [] +for name, func in commands.items(): + if name == cmd: + hits = [ (name, func) ] + break + elif name.startswith(cmd): + hits.append((name, func)) + +if len(hits) < 1: + usage() + +elif len(hits) > 1: + sys.stderr.write("Command '%s' is ambigous. Possible are: %s\n" % \ + ", ".join([ n for (n,f) in hits])) + +else: + hits[0][1](sys.argv[2:]) +

13 years, 9 months

Check_MK Git: check_mk: Start converting LIESMICH.zutun to .bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 082e28df7b1f22b20721236cbc0513b7893dc291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082e28df7b1f22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 21 11:03:02 2010 +0100 Start converting LIESMICH.zutun to .bugs --- .bugs/1 | 9 +++++++++ .bugs/10 | 10 ++++++++++ .bugs/2 | 10 ++++++++++ .bugs/3 | 9 +++++++++ .bugs/4 | 11 +++++++++++ .bugs/5 | 10 ++++++++++ .bugs/6 | 12 ++++++++++++ .bugs/7 | 14 ++++++++++++++ .bugs/8 | 16 ++++++++++++++++ .bugs/9 | 14 ++++++++++++++ .bugs/config | 22 ++++++++++++++++++++++ LIESMICH.zutun | 34 ---------------------------------- gb | 35 ++++++++++++++++++++--------------- 13 files changed, 157 insertions(+), 49 deletions(-) diff --git a/.bugs/1 b/.bugs/1 new file mode 100644 index 0000000..718b17b --- /dev/null +++ b/.bugs/1 @@ -0,0 +1,9 @@ +Title: Describe StatsGroupBy +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:45:58 +Class: todo + +multiple columns are allowed now. Columns: used. diff --git a/.bugs/10 b/.bugs/10 new file mode 100644 index 0000000..3306b0b --- /dev/null +++ b/.bugs/10 @@ -0,0 +1,10 @@ +Title: Multisite mit Chrome kompatible machen +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2010-12-21 11:01:49 +Class: bug + +Bekannte Probleme: +* reschedule Knopf wird nicht animiert diff --git a/.bugs/2 b/.bugs/2 new file mode 100644 index 0000000..c542023 --- /dev/null +++ b/.bugs/2 @@ -0,0 +1,10 @@ +Title: Hostnamen in ipaddresses +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:50:11 +Class: todo + +Dokumentieren, wie man dyndns-Hosts in den Griff bekommen, +indem man den Hostnamen in ipaddresses einträgt. diff --git a/.bugs/3 b/.bugs/3 new file mode 100644 index 0000000..90a9924 --- /dev/null +++ b/.bugs/3 @@ -0,0 +1,9 @@ +Title: Manpages zu Netapp-checks fehlen +Component: doku +Benefit: 2 +State: open +Cost: 2 +Date: 2010-12-21 10:51:29 +Class: todo + +df_netapp und df_netapp32 haben noch keine man-Page diff --git a/.bugs/4 b/.bugs/4 new file mode 100644 index 0000000..55cee59 --- /dev/null +++ b/.bugs/4 @@ -0,0 +1,11 @@ +Title: Doku zu local-Hierarchie und MKPs in OMD +Component: doku +Benefit: 2 +State: open +Cost: 3 +Date: 2010-12-21 10:52:57 +Class: todo + +In der Check_MK-Doku sollte beschrieben werden, wie Check_MK +in OMD funktioniert im allgemeinen und die local/-Hierarchie +im besonderen. Auch wie man MKPs unter OMD verwendet. diff --git a/.bugs/5 b/.bugs/5 new file mode 100644 index 0000000..5fdf8d9 --- /dev/null +++ b/.bugs/5 @@ -0,0 +1,10 @@ +Title: ALL_SERVICES anstelle von [""] verwenden +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2010-12-21 10:54:20 +Class: todo + +Sobald ALL_SERVICES in der aktuelle stabilen Version verfügbar ist, +in der Doku überall [""] entfernen und dadurch ersetzten. diff --git a/.bugs/6 b/.bugs/6 new file mode 100644 index 0000000..08f6291 --- /dev/null +++ b/.bugs/6 @@ -0,0 +1,12 @@ +Title: is_contact_member_of_contactgroup selbst programmieren +Component: livestatus +Benefit: 5 +State: open +Cost: 2 +Date: 2010-12-21 10:55:19 +Class: todo + +Diese Funktion ist im CVS schon weg und sehr leicht +selbst zu programmieren. Sollte man bald mal machen, +damit ein stabiles Livestatus schon bereit ist, wenn +das neue Nagios kommt. diff --git a/.bugs/7 b/.bugs/7 new file mode 100644 index 0000000..030a6bf --- /dev/null +++ b/.bugs/7 @@ -0,0 +1,14 @@ +Title: Timeperiod-Übergänge ins Nagios-Log schreiben +Component: livestatus +Benefit: 3 +State: open +Cost: 1 +Date: 2010-12-21 10:56:28 +Class: feature + +Livestatus hält ja ohnehin einen Cache der Timeperiods. Immer +wenn eine umschaltet, sollte ein Logeintrag gemacht werden. +Auch initial beim Starten des Systems. Anhand dieser Einträge +ist es später viel einfacher, die Verfügbarkeiten zu berechnen. +Das sollte man recht bald programmieren, damit die Leute +schon Gelegenheit haben, Daten zu sammeln. diff --git a/.bugs/8 b/.bugs/8 new file mode 100644 index 0000000..3ec8b2f --- /dev/null +++ b/.bugs/8 @@ -0,0 +1,16 @@ +Title: Inventurcheck: retry-interval konfigurieren +Component: core +Benefit: 2 +State: open +Cost: 2 +Date: 2010-12-21 10:59:01 +Class: feature + +Eigentlich könnte der Inventurcheck doch - wenn er nicht OK ist - +öfters laufen. Auf diese Art wird er schneller von selbst wieder grün, +wenn man das Problem behebt. Da der Inventurcheck sowieso die Cachefiles +verwendet, sollte es auch kein Performanceproblem sein, wenn man +es oft macht (gilt das auch für den SNMP-Scan?). + +Lösung könnte sein: in main.mk inventory_check_retry = 5. Und diesen +Wert per Default auf 5 setzen (5 Minuten). diff --git a/.bugs/9 b/.bugs/9 new file mode 100644 index 0000000..d621c0c --- /dev/null +++ b/.bugs/9 @@ -0,0 +1,14 @@ +Title: Multisite mit IE kompatibel machen +Component: multisite +Benefit: 4 +State: open +Cost: 3 +Date: 2010-12-21 11:01:09 +Class: bug + +Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: +* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. + Nur das reload macht er +* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt +* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung + klappt nicht. diff --git a/.bugs/config b/.bugs/config new file mode 100644 index 0000000..fa2ff10 --- /dev/null +++ b/.bugs/config @@ -0,0 +1,22 @@ +states = { + "open" : tty_blue, + "done" : tty_green, + "closed" : tty_normal, +} + +components = [ + "core", + "checks", + "multisite", + "livestatus", + "wato", + "doku" +] + +classes = [ + "cleanup", + "bug", + "todo", + "phantasm", + "feature", +] diff --git a/LIESMICH.zutun b/LIESMICH.zutun index b8cd8af..b5b5064 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,37 +1,3 @@ -DOKU: --------------------------------------------------------------------------------- -Hostnamen in ipaddresses eintragen: Das sollte man dokumentieren -(wegen dynamischen Hosts.) - -Man-Pages zu df_netapp und df_netapp32 fehlen (df_netapp geht nur mit bulkwalk_hosts!!) - -Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie - -[""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen. Das geht -aber erst, wenn eine stabile Version das ALL_SERVICES erlaubt! - --------------------------------------------------------------------------------- - -Livestatus: is_contact_member_of_contactgroup selbst programmieren, - da diese Funktion in Nagios rausfliegen wird. - -Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. -Das geht aber auch mit extra_service_conf. Evtl. reicht hier die Doku. -Ein sinnvoller Default-Wert wäre aber schon gut. - --------------------------------------------------------------------------------- -BUGS beheben ab 1.1.9i1 --------------------------------------------------------------------------------- -Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: -* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. - Nur das reload macht er -* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt -* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung - klappt nicht. - -Multsite: Kompatible mit Chrome machen. Probleme: -* reschedule Knopf wird nicht animiert - WATO: Wenn ein Agent einen rauswirft (leere Ausgabe, Connection closed), kommt im WATO bei der Inventur keine sinnvolle Fehlermeldung. diff --git a/gb b/gb index 1cadd90..01f9721 100755 --- a/gb +++ b/gb @@ -32,14 +32,6 @@ else: tty_normal = '' tty_ok = 'OK' -state_colors = { - "open" : tty_blue, - "done" : tty_green, - "closed" : tty_normal, -} - -components = [ "core", "checks", "multisite", "livestatus", "wato" ] - def bail_out(text): sys.stderr.write(text + "\n") sys.exit(1) @@ -56,6 +48,9 @@ def goto_bugsdir(): sys.stderr.write("Cannot find directory .bugs\n") sys.exit(1) +def load_config(): + execfile("config", globals(), globals()) + def load_bugs(): global g_bugs g_bugs = {} @@ -108,7 +103,10 @@ def save_bug(bug): os.system("git add %d" % bug["id"]) def next_bug_id(): - return max(g_bugs.keys()) + 1 + if len(g_bugs) == 0: + return 1 + else: + return max(g_bugs.keys()) + 1 def add_comment(bug, title, comment): bug["description"] += """ @@ -133,11 +131,11 @@ where COMMAND is one of: def bug_state(bug): state = bug["state"] - return "%s%-7s%s" % (tty_bold + state_colors.get(state, ""), state, tty_normal) + return "%s%-7s%s" % (tty_bold + states.get(state, ""), state, tty_normal) def list_bug(bug): - sys.stdout.write("#%04d %-7s %-60s\n" % - (int(bug["id"]), bug_state(bug), bug["title"])) + sys.stdout.write("#%04d %-6s %-7s %-10s %-60s\n" % + (int(bug["id"]), bug_state(bug), bug["class"], bug["component"], bug["title"])) def show_bug(bug): list_bug(bug) @@ -206,7 +204,11 @@ def input_choice(what, choices): sys.stdout.flush() c = getch() if c in ctc: + sys.stdout.write(" %s%s%s\n" % ( + tty_bold, ctc[c], tty_normal)) return ctc[c] + else: + sys.stdout.write("\n") def main_new(args): bug = {} @@ -217,8 +219,10 @@ def main_new(args): if bug["title"] == "": sys.stderr.write("Cancelled.\n") sys.exit(0) - bug["cost"] = int(get_input("Cost", 1)) - bug["benefit"] = int(get_input("Benefit", 1)) + bug["class"] = input_choice("Class", classes) + bug["component"] = input_choice("Component", components) + bug["cost"] = input_choice("Cost", "123456789") + bug["benefit"] = input_choice("Benefit", "123456789") bug["description"] = get_long_input("description") g_bugs[bug["id"]] = bug @@ -234,7 +238,7 @@ def main_resolve(args): bail_out("No such bug.\n") list_bug(bug) - state = input_choice("State", state_colors.keys()) + state = input_choice("State", states.keys()) comment = get_long_input("comment") add_comment(bug, "changed state %s -> %s" % (bug["state"], state), comment) @@ -256,6 +260,7 @@ def main_delete(args): # goto_bugsdir() +load_config() load_bugs() if len(sys.argv) < 2:

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7c9da4723030d2a120caa6a5c77851738e49bc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7c9da4723030d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:32:51 2010 +0100 Updated internal doku --- LIESMICH.zutun | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index dab0a6a..b8cd8af 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -22,6 +22,16 @@ Ein sinnvoller Default-Wert wäre aber schon gut. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: +* reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. + Nur das reload macht er +* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt +* Snapin "Views": Die Spiegelpunkt sind zu weit links, die Einrückung + klappt nicht. + +Multsite: Kompatible mit Chrome machen. Probleme: +* reschedule Knopf wird nicht animiert + WATO: Wenn ein Agent einen rauswirft (leere Ausgabe, Connection closed), kommt im WATO bei der Inventur keine sinnvolle Fehlermeldung.

13 years, 9 months

Check_MK Git: check_mk: Multisite: fixed perf-o-meter in Google Chrome

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f41d4bddfe993c1a2bdd349acbd59c65a9c6d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f41d4bddfe993… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:30:03 2010 +0100 Multisite: fixed perf-o-meter in Google Chrome --- web/htdocs/check_mk.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 7ee958c..6d3eef3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -817,6 +817,7 @@ table.services tr.data td.perfometer table td { padding: 0px; margin: 0px; border: none; + height: 22px; } table.services tr.data td.perfometer a {

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix layout of host names with state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67f3d3cd39abb0cf0857563eaae8a3b749feb486 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f3d3cd39abb0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 20:12:01 2010 +0100 Multisite: fix layout of host names with state --- web/htdocs/check_mk.css | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 712aadc..7ee958c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -840,6 +840,9 @@ td.statex { /* zero count */ background-color: #0b3; color: #fff; } +.hstate { + white-space: nowrap; +} /* WARN */ .state1, .state1 a { background-color: #ff0; color: #000;

13 years, 9 months

Check_MK Git: check_mk: Makefile: ship missing .js files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66c9418cb97e266a6513d53f0f165a7779e086d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c9418cb97e26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 19:43:46 2010 +0100 Makefile: ship missing .js files --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 09931eb..9ad879c 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ dist: mk-livestatus mkdir -p $(DISTNAME) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico} htdocs/*.{py,css,js} plugins/*/*.py) + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar czf $(DISTNAME)/pnp-rraconf.tar.gz $(TAROPTS) -C pnp-rraconf $$(cd pnp-rraconf ; ls *.rra.cfg README.rra)

13 years, 9 months

Check_MK Git: check_mk: printer_supply: handle case where no current available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c035d82729704e2b2e3cad430e92c736f7bd203d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c035d82729704e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 17:13:08 2010 +0100 printer_supply: handle case where no current available --- ChangeLog | 1 + checks/printer_supply | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6df57d9..f47fa0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) * cups_queues: fixed plugin error due to invalid import of datetime, converted other checks from 'from datetime import...' to 'import datetime'. + * printer_supply: handle the case where the current value is missing Livestatus: * new column pnpgraph_present in table host and service. In order for this diff --git a/checks/printer_supply b/checks/printer_supply index a6df030..ed387fc 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -79,7 +79,7 @@ def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info): if line[0] == item: maxlevel = float(line[1]) - current = float(line[2]) + current = savefloat(line[2]) leftperc = 100.0 * current / maxlevel warn, crit = params # in percent infotext = "%.0f%% (levels at %.0f%% / %.0f%%)" % (leftperc, warn, crit)

13 years, 9 months

Check_MK Git: check_mk: Multisite: new view "Alert Statistics"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8027244d5931624a49a76748c8b3baca6eb040f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8027244d593162… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 17:06:48 2010 +0100 Multisite: new view "Alert Statistics" --- ChangeLog | 3 ++ LIESMICH.zutun | 11 +++++-- web/htdocs/views.py | 27 +++++++++++----- web/plugins/views/builtin.py | 61 ++++++++++++++++++++++++++++++++++++- web/plugins/views/datasources.py | 9 +++++ web/plugins/views/painters.py | 35 +++++++++++++++++++++ web/plugins/views/sorters.py | 8 +++++ 7 files changed, 140 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8027244d59…

13 years, 9 months

Check_MK Git: check_mk: Livestatus: use Columns: instead of StatsGroupBy:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5be217725b7c213cc1a3c975b928a12027d4d23e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be217725b7c21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 20 16:12:00 2010 +0100 Livestatus: use Columns: instead of StatsGroupBy: StatsGroupBy: is now deprecated. Columns: does the same thing for you. --- ChangeLog | 3 +++ livestatus/src/Query.cc | 31 ++++++++----------------------- livestatus/src/Query.h | 3 --- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15fe292..ccef56e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * Multisite: removed (undocumented) view parameters show_buttons and show_controls. Please use display_options instead. * Finally removed deprecated filesystem_levels. Please use check_parameters instead. + * Livestatus: The StatsGroupBy: header is still working but now deprecated. + Please simply use Columns: instead. If your query contains at least one Stats: + header than Columns: has the meaning of the old StatsGroupBy: header Core, Setup, etc.: * Create alias 'cmk' for check_mk in bin/ (easier typing) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index c9a3542..877b765 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -177,12 +177,12 @@ Column *Query::createDummyColumn(const char *name) } - void Query::addColumn(Column *column) { _columns.push_back(column); } + bool Query::hasNoColumns() { return _columns.size() == 0 && !doStats(); @@ -419,23 +419,8 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - if (!_table) - return; - - char *column_name; - while (column_name = next_field(&line)) { - Column *column = _table->column(column_name); - if (!column) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: unknown column '%s'", column_name); - return; - } - _stats_group_columns.push_back(column); - } - - if (_stats_group_columns.size() == 0) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsGroupBy: missing an argument"); - return; - } + logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); + parseColumnsLine(line); } @@ -645,7 +630,7 @@ void Query::start() // if we have no StatsGroupBy: column, we allocate one only row of Aggregators, // directly in _stats_aggregators. When grouping the rows of aggregators // will be created each time a new group is found. - if (_stats_group_columns.size() == 0) + if (_columns.size() == 0) { _stats_aggregators = new Aggregator *[_stats_columns.size()]; for (unsigned i=0; i<_stats_columns.size(); i++) @@ -691,7 +676,7 @@ bool Query::processDataset(void *data) Aggregator **aggr; // When doing grouped stats, we need to fetch/create a row // of aggregators for the current group - if (_stats_group_columns.size() > 0) { + if (_columns.size() > 0) { _stats_group_spec_t groupspec; computeStatsGroupSpec(groupspec, data); aggr = getStatsGroup(groupspec); @@ -732,7 +717,7 @@ bool Query::processDataset(void *data) void Query::finish() { // grouped stats - if (doStats() && _stats_group_columns.size() > 0) + if (doStats() && _columns.size() > 0) { // output values of all stats groups (output has been post poned until now) for (_stats_groups_t::iterator it = _stats_groups.begin(); @@ -984,8 +969,8 @@ Aggregator **Query::getStatsGroup(Query::_stats_group_spec_t &groupspec) void Query::computeStatsGroupSpec(Query::_stats_group_spec_t &groupspec, void *data) { - for (_stats_group_columns_t::iterator it = _stats_group_columns.begin(); - it != _stats_group_columns.end(); + for (_columns_t::iterator it = _columns.begin(); + it != _columns.end(); ++it) { Column *column = *it; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 5cc1955..1a85b63 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -87,9 +87,6 @@ class Query _stats_columns_t _stats_columns; // must also delete Aggregator **_stats_aggregators; - typedef vector <Column *> _stats_group_columns_t; - _stats_group_columns_t _stats_group_columns; - typedef vector<string> _stats_group_spec_t; typedef map<_stats_group_spec_t, Aggregator **> _stats_groups_t; _stats_groups_t _stats_groups;

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits