Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64147 discussions

Check_MK Git: check_mk: validate_checks: now callable from main directory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 107aec09760940f80f249a1ae56355eaf3d2d1fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=107aec09760940… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 20:10:03 2011 +0200 validate_checks: now callable from main directory --- doc/helpers/validate_checks | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 08b9259..65b97d4 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -57,7 +57,8 @@ else: __name__ = 'asd' -os.chdir('../../') +if os.path.exists("validate_checks"): + os.chdir('../../') defaults_path = 'defaults' #autochecks = [] execfile('check_mk')

13 years

Check_MK Git: check_mk: Commited audit log entries are now pages based on days

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eec84c198df5506a9b209ff1245ad747dfc46391 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec84c198df550… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 19 11:58:07 2011 +0200 Commited audit log entries are now pages based on days --- ChangeLog | 3 + web/htdocs/check_mk.css | 4 ++ web/htdocs/htmllib.py | 10 +++- web/htdocs/wato.py | 112 ++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 111 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f5736c..f915d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,9 @@ Multisite: * FIX: reschedule now works for host names containing spaces + WATO: + * Commited audit log entries are now pages based on days + 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a5f38a7..683f89a 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1971,6 +1971,10 @@ table.add_snapin i { background-repeat: repeat; } +/* Controls for the audit log paged mechanism */ +.wato div.paged_controls { + float: right; +} /* ____ diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0ac7057..2b12878 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -278,16 +278,20 @@ class html: self.write("<input type=submit name=\"%s\" id=\"%s\" value=\"%s\" class=\"%s\">\n" % \ ( varname, varname, title, cssclass)) - def buttonlink(self, href, text, add_transid=False, obj_id='', style=''): + def buttonlink(self, href, text, add_transid=False, obj_id='', style='', title='', disabled=''): if add_transid: href += "&_transid=%d" % self.current_transid() if obj_id: obj_id = ' id=%s' % obj_id if style: style = ' style="%s"' % style + if title: + title = ' title="%s"' % title + if disabled: + title = ' disabled="%s"' % disabled - self.write('<input%s%s value="%s" class=buttonlink type=button onclick="location.href=\'%s\'">' % \ - (obj_id, style, text, href)) + self.write('<input%s%s%s%s value="%s" class=buttonlink type=button onclick="location.href=\'%s\'">' % \ + (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) def jsbutton(self, varname, text, onclick, style=''): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 32002f0..0409068 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -37,7 +37,7 @@ import config -import sys, pprint, socket, re, subprocess, time +import sys, pprint, socket, re, subprocess, time, datetime from lib import * import htmllib @@ -1389,20 +1389,12 @@ def mode_changelog(phase): else: pending = parse_audit_log("pending") - if len(pending) > 0: - message = "<h1>" + _("Changes which are not yet activated:") + "</h1>" - message += render_audit_log(pending, "pending") - html.show_warning(message) - else: - html.write("<div class=info>" + _("No pending changes, monitoring server is up to date.") + "</div>") + render_audit_log(pending, "pending") audit = parse_audit_log("audit") - if len(audit) > 0: - html.write("<b>" + _("All Changes") + "</b>") - html.write(render_audit_log(audit, "audit")) - else: - html.write("<div class=info>" + _("The logfile is empty. No host has been created or changed yet.") + "</div>") - + render_audit_log(audit, "audit") + + def log_entry(linkinfo, action, message, logfilename): if type(message) == unicode: message = message.encode("utf-8") @@ -1510,9 +1502,94 @@ def render_linkinfo(linkinfo): return '<a href="%s">%s</a>' % (url, title) +def get_timerange(t): + st = time.localtime(int(t)) + start = int(time.mktime(time.struct_time((st[0], st[1], st[2], 0, 0, 0, st[6], st[7], st[8])))) + end = start + 86399 + return start, end + +def format_timestamp(t): + return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) + +def paged_log(log): + start = html.var('start', None) + if not start: + start = time.time() + start_time, end_time = get_timerange(int(start)) + + previous_log_time = None + next_log_time = None + first_log_index = None + last_log_index = None + for index, (t, linkinfo, user, action, text) in enumerate(log): + t = int(t) + if t >= end_time: + # This log is too new + continue + elif first_log_index is None and t < end_time and t >= start_time: + # This is a log for this day. Save the first index + if first_log_index is None: + first_log_index = index + + # When possible save the timestamp of the previous log + if index > 0: + next_log_time = int(log[index - 1][0]) + + elif t < start_time and last_log_index is None: + last_log_index = index - 1 + # This is the next log after this day + previous_log_time = int(log[index][0]) + # Finished! + break + + if not last_log_index: + last_log_index = len(log) - 1 + + return log[first_log_index:last_log_index], (start_time, end_time, previous_log_time, next_log_time) + +def display_paged((start_time, end_time, previous_log_time, next_log_time)): + html.write('<div class=paged_controls>') + + html.write(' <b>%s</b> ' % (_('%s to %s') % (format_timestamp(start_time), + format_timestamp(end_time)))) + + if previous_log_time is not None: + html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), + title = '%s: %s' % (_("Older events"), format_timestamp(previous_log_time))) + else: + html.buttonlink(html.makeuri([]), _("<"), disabled = True) + + html.buttonlink(html.makeuri([('start', get_timerange(int(time.time()))[0])]), _("o"), + title = _("Todays events")) + + if next_log_time is not None: + html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), + title = '%s: %s' % (_("Newer events"), format_timestamp(next_log_time))) + else: + html.buttonlink(html.makeuri([]), _(">"), disabled = True) + html.write('</div>') + def render_audit_log(log, what, with_filename = False): - htmlcode = '<table class="wato auditlog">' + htmlcode = '' + if what == 'audit': + log, times = paged_log(log) + empty_msg = _("The logfile is empty. No host has been created or changed yet.") + elif what == 'pending': + empty_msg = _("No pending changes, monitoring server is up to date.") + + if len(log) == 0: + htmlcode += "<div class=info>%s</div>" % empty_msg + return + elif what == 'audit': + htmlcode += "<b>" + _("All Changes") + "</b>" + elif what == 'pending': + htmlcode += "<h1>" + _("Changes which are not yet activated:") + "</h1>" + + if what == 'audit': + display_paged(times) + + htmlcode += '<table class="wato auditlog">' even = "even" for t, linkinfo, user, action, text in log: even = even == "even" and "odd" or "even" @@ -1524,7 +1601,12 @@ def render_audit_log(log, what, with_filename = False): user, text) htmlcode += "</table>" - return htmlcode + + if what == 'audit': + html.write(htmlcode) + display_paged(times) + else: + html.show_warning(htmlcode) # +----------------------------------------------------------------------+ # | _ _ _ |

13 years, 1 month

Check_MK Git: check_mk: Added download link to download the WATO audit log in CSV format

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd1525b4926ae339b752ab15e1f21869f95eb18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd1525b4926ae3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 19 12:37:47 2011 +0200 Added download link to download the WATO audit log in CSV format --- ChangeLog | 1 + web/htdocs/wato.py | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f915d8e..dcb00ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ WATO: * Commited audit log entries are now pages based on days + * Added download link to download the WATO audit log in CSV format 1.1.11i2: Core, Setup, etc.: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0409068..0584dc4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1372,10 +1372,16 @@ def mode_changelog(phase): if log_exists("audit"): html.context_button(_("Clear Audit Log"), html.makeuri([("_action", "clear"), ("_transid", html.current_transid())]), "trash") + html.context_button(_("Download Audit Log"), + html.makeuri([("_action", "csv"), ("_transid", html.current_transid())]), "csv") elif phase == "action": if html.var("_action") == "clear": return clear_audit_log_after_confirm() + + elif html.var("_action") == "csv": + return export_audit_log() + elif html.check_transaction(): try: check_mk_automation("restart") @@ -1508,9 +1514,15 @@ def get_timerange(t): end = start + 86399 return start, end -def format_timestamp(t): +def fmt_datetime(t): return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) +def fmt_date(t): + return time.strftime('%Y-%m-%d', time.localtime(t)) + +def fmt_time(t): + return time.strftime('%H:%M:%S', time.localtime(t)) + def paged_log(log): start = html.var('start', None) if not start: @@ -1550,12 +1562,12 @@ def paged_log(log): def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('<div class=paged_controls>') - html.write(' <b>%s</b> ' % (_('%s to %s') % (format_timestamp(start_time), - format_timestamp(end_time)))) + html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_datetime(start_time), + fmt_datetime(end_time)))) if previous_log_time is not None: html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), - title = '%s: %s' % (_("Older events"), format_timestamp(previous_log_time))) + title = '%s: %s' % (_("Older events"), fmt_datetime(previous_log_time))) else: html.buttonlink(html.makeuri([]), _("<"), disabled = True) @@ -1564,7 +1576,7 @@ def display_paged((start_time, end_time, previous_log_time, next_log_time)): if next_log_time is not None: html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), - title = '%s: %s' % (_("Newer events"), format_timestamp(next_log_time))) + title = '%s: %s' % (_("Newer events"), fmt_datetime(next_log_time))) else: html.buttonlink(html.makeuri([]), _(">"), disabled = True) html.write('</div>') @@ -1596,10 +1608,7 @@ def render_audit_log(log, what, with_filename = False): htmlcode += '<tr class="%s0">' % even htmlcode += '<td>%s</td>' % render_linkinfo(linkinfo) htmlcode += '<td>%s</td><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( - time.strftime("%Y-%m-%d", time.localtime(float(t))), - time.strftime("%H:%M:%S", time.localtime(float(t))), - user, - text) + fmt_date(float(t)), fmt_time(float(t)), user, text) htmlcode += "</table>" if what == 'audit': @@ -1608,6 +1617,26 @@ def render_audit_log(log, what, with_filename = False): else: html.show_warning(htmlcode) +def export_audit_log(): + html.req.content_type = "text/csv; charset=UTF-8" + filename = 'wato-auditlog-%s_%s.csv' % (fmt_date(time.time()), fmt_time(time.time())) + html.req.headers_out['Content-Disposition'] = 'attachment; filename=%s' % filename + titles = ( + _('Date'), + _('Time'), + _('Linkinfo'), + _('User'), + _('Action'), + _('Text'), + ) + html.write(','.join(titles) + '\n') + for t, linkinfo, user, action, text in parse_audit_log("audit"): + if linkinfo == '-': + linkinfo = '' + html.write(','.join((fmt_date(int(t)), fmt_time(int(t)), linkinfo, + user, action, '"' + text + '"')) + '\n') + return False + # +----------------------------------------------------------------------+ # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ |

13 years, 1 month

Check_MK Git: check_mk: FIX: Fixed javascript errors when opening dashboard in IE below 9

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea20586e2330f0ccacbf00d8d44437bd78e33d9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea20586e2330f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Aug 20 00:02:20 2011 +0200 FIX: Fixed javascript errors when opening dashboard in IE below 9 --- web/htdocs/dashboard.py | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ac3a492..f3fce81 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -481,8 +481,26 @@ def render_statistics(what, table, filter): html.write("</table>") + r = 0.0 + pie_parts = [] + if total > 0: + for (name, color, q), value in pies: + perc = 100.0 * value / total + pie_parts.append('chart_pie("%s", %f, %f, %r);' % (what, r, r + perc, color)) + r += perc + html.javascript(""" -function chart_pie(from, to, color) { +function has_canvas_support() { + return document.createElement('canvas').getContext; +} + +function chart_pie(what, from, to, color) { + var context = document.getElementById(what + "_stats").getContext('2d'); + if(!context) + return; + var pie_x = %(x)f; + var pie_y = %(y)f; + var pie_d = %(d)f; context.beginPath(); context.moveTo(pie_x, pie_y); context.arc(pie_x, pie_y, pie_d / 2 - 2, rad(from), rad(to), false); @@ -494,6 +512,7 @@ function chart_pie(from, to, color) { context.strokeStyle = "#ffffff"; context.fill(); context.stroke(); + context = null; } // convert percent to angle(rad) @@ -501,21 +520,11 @@ function rad(g) { return (g * 360 / 100 * Math.PI) / 180; } -pie_x = %(x)f; -pie_y = %(y)f; -pie_d = %(d)f; - -context = document.getElementById("%(what)s_stats").getContext('2d'); - +if(has_canvas_support()) { + %(p)s +} """ % { "what" : what, "x" : pie_diameter / 2, - "y": pie_diameter/2, "d" : pie_diameter }) - - r = 0.0 - if total > 0: - for (name, color, q), value in pies: - perc = 100.0 * value / total - html.javascript('chart_pie(%f, %f, %r);' % (r, r + perc, color)) - r += perc + "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)))

13 years, 1 month

Check_MK Git: check_mk: gb: save und use last bug id

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91e6652e99f97afb12a769ab2f5a9caa6670b265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91e6652e99f97a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 10:51:03 2011 +0200 gb: save und use last bug id --- gb | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/gb b/gb index 97a30b1..ed2339c 100755 --- a/gb +++ b/gb @@ -63,7 +63,13 @@ def goto_bugsdir(): sys.exit(1) def load_config(): + global g_last_bug execfile("config", globals(), globals()) + try: + g_last_bug = int(file(".last").read()) + except: + g_last_bug = None + def load_bugs(): global g_bugs @@ -79,6 +85,10 @@ def load_bugs(): except: continue +def save_last_bugid(id): + file(".last", "w").write("%d\n" % int(id)) + + def check_modified(): global g_modified g_modified = set([]) @@ -130,6 +140,7 @@ def save_bug(bug): f.write(bug["description"]) f.close() git_add(bug) + save_last_bugid(bug["id"]) def git_add(bug): os.system("git add %d" % bug["id"]) @@ -157,7 +168,7 @@ where COMMAND is one of: given as parameter the command will reserve new bug IDS. list [-g] [-r] [STATE] - list bugs (-g: sort after gain, -r: reverse) new - create a new bug - show [# #..] - show several bugs (or all open) + show [# #..] - show several bugs, or 'all' for all, of leave out for last resolve ID - change a bugs state delete #.. - delete bug(s) grep [-v] KW1 KW2... - show bugs containing all of the given keywords (-v: verbose) @@ -276,11 +287,17 @@ def main_list(args): def main_show(args): ids = args if len(ids) == 0: - ids = [ id for (id, bug) in g_bugs.items() if bug["state"] == "open" ] + if g_last_bug == None: + bail_out("No last bug known. Please specify id.") + ids = [ g_last_bug ] + elif ids[0] == 'all': + ids = [ id for (id, bug) in g_bugs.items() ] + for id in ids: if id != ids[0]: sys.stdout.write("-------------------------------------------------------------------------------\n") show_bug(g_bugs[int(id)]) + save_last_bugid(ids[-1]) def get_input(what, default = ""): sys.stdout.write("%s: " % what) @@ -355,14 +372,20 @@ def main_new(args): sys.stdout.write("Bug saved with id %d.\n" % bug["id"]) def main_resolve(args): - if len(args) != 1: - usage() - id = int(args[0]) + if len(args) == 0: + if g_last_bug == None: + bail_out("No last bug, please specify id.") + id = g_last_bug + else: + 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) + show_bug(bug) state = input_choice("State", states.keys()) comment = get_long_input("comment") @@ -436,7 +459,10 @@ def main_grep(args): def main_edit(args): if len(args) == 0: - ids = str(max(g_bugs.keys())) + ids = str(g_last_bug) + if ids == None: + bail_out("No last bug. Please specify id.") + else: ids = args[0] if not os.path.exists(ids): @@ -453,6 +479,8 @@ def main_edit(args): if 0 == os.system("%s %s" % (editor, ids)): git_add(g_bugs[int(ids)]) + save_last_bugid(int(ids)) + def main_commit(args): if len(g_modified) == 0:

13 years, 1 month

Check_MK Git: check_mk: gb: save und use last bug id

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0cc302c236fb383a32d035ad8f90f70a74a5f915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc302c236fb38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 10:51:50 2011 +0200 gb: save und use last bug id --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b3395c5..0e4f78d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ rpm.topdir/ *.deb var/ .bugs/.my_ids +.bugs/.last

13 years, 1 month

Check_MK Git: check_mk: mem: Remove obsolete 2nd parameter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dfec464c452b304bac4f78d00d1b0f45fedaa835 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfec464c452b30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 10:52:13 2011 +0200 mem: Remove obsolete 2nd parameter --- checks/mem | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/mem b/checks/mem index d99505e..27f7ca9 100644 --- a/checks/mem +++ b/checks/mem @@ -37,7 +37,7 @@ def inventory_mem_used(checkname, info): # valid data, assume that item can be checked ci = check_mem_used(None, (0,0), info) if ci[0] <= 2: - return [(None, "", "memused_default_levels")] + return [(None, "memused_default_levels")] else: return [] except:

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6cbc1018d0f67c14b81be615b79866f2ea536d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6cbc1018d0f67… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 10:52:55 2011 +0200 Updated bug entries --- .bugs/21 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/21 b/.bugs/21 index d61fe7b..6cd877c 100644 --- a/.bugs/21 +++ b/.bugs/21 @@ -9,7 +9,12 @@ Class: bug Das Einrechnen in Swap ist Müll. Windows tickt anders. Hier muss ein eigener Check und eine eigene PNP-Schablone gemacht werden. -TotalPage und UsedPage verwenden. Im Quellcode ist das schon -drin, der Check muss angepasst werden und auch die Schablone. Evtl. macht -man einen eigenen Check. Oder man löst es über das Check-Item. +PageTotal und PateFree verwenden. Der Agent sendet das schon. +Der Check muss irgendwie erkennen, dass es sich um Windows handelt +und dann automatisch eine andere Logik anwenden. +Auch die PNP-Schablone muss das berücksichtigen. Die kann am +Namen der Variablen erkennen, dass es Windows ist ("page=..."). + +Auch braucht man dann eigene Schwellwerte. Frage ist, ob man +hier auf dict umstellen muss?

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 345e52b4b4b52514090419f5688bed7c4aa69711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=345e52b4b4b525… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 22:29:24 2011 +0200 Updated bug entries --- .bugs/167 | 10 +++++++--- .bugs/192 | 10 +++++++--- .bugs/51 | 10 +++++++--- .bugs/99 | 10 +++++++--- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.bugs/167 b/.bugs/167 index 38f0d05..43ce162 100644 --- a/.bugs/167 +++ b/.bugs/167 @@ -1,10 +1,14 @@ Title: Update Livestatus API for Python Component: livestatus +State: done +Class: cleanup +Date: 2011-03-01 18:35:46 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-01 18:35:46 -Class: cleanup +Fun: 0 Take the API from web/htdocs/livestatus.py, rework the examples, make it work. + +2011-08-18 22:27:39: changed state open -> done +Done recently. diff --git a/.bugs/192 b/.bugs/192 index f4c8311..9d590ac 100644 --- a/.bugs/192 +++ b/.bugs/192 @@ -1,10 +1,11 @@ Title: Dashlets mit Reload bleiben bei Apache Fehler hängen Component: multisite +State: wontfix +Class: bug +Date: 2011-08-16 17:13:46 Benefit: 2 -State: open Cost: 2 -Date: 2011-08-16 17:13:46 -Class: bug +Fun: 0 Der Apache Fehler bleibt stehen. Der Reload passiert nicht mehr: @@ -17,3 +18,6 @@ You need to start this site in order to access the web interface. Sobald wir das Refresh per AJAX realisiert haben, sollte das Problem damit dann auch gelöst sein. + +2011-08-18 22:25:38: changed state open -> wontfix +Wird eh verschwinden. diff --git a/.bugs/51 b/.bugs/51 index 491b408..a582374 100644 --- a/.bugs/51 +++ b/.bugs/51 @@ -1,13 +1,17 @@ Title: Spalte contact_groups bei hosts und services fehlt Component: livestatus +State: done +Class: cleanup +Date: 2010-12-21 22:01:17 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-21 22:01:17 -Class: cleanup +Fun: 0 Livestatus: Bei den Tabellen hosts und services fehlt die Spalte 'contact_groups'. Man bekommt zwar die Einzelkontakte, aber nicht die Gruppen. Bei den Nagios-Datenstrukturen gibt es aber einen passenden Zeiger dafür. Sollte also nicht schwer sein, das umzusetzen. + +2011-08-18 22:26:43: changed state open -> done +Ist jetzt eingebaut. diff --git a/.bugs/99 b/.bugs/99 index 8ceb747..6c85982 100644 --- a/.bugs/99 +++ b/.bugs/99 @@ -1,13 +1,17 @@ Title: WATO: allow empty config file list Component: wato +State: closed +Class: cleanup +Date: 2011-01-24 11:55:54 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-24 11:55:54 -Class: cleanup +Fun: 0 Das WATO-Snapin funktioniert nicht, wenn man eine leere Liste von Konfigfiles hat. In einem Multi site setup kann es aber durchaus sein, dass der *lokale* Multisite keine Konfigfiles definiert und das WATO-Snapin nur die von Remote-Sites anzeigt. + +2011-08-18 22:27:22: changed state open -> closed +Ist obsolet, weil config_files nicht mehr verwendet wird.

13 years, 1 month

Check_MK Git: check_mk: local: PNP graph now supports multiple values

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a3ba74f1b332c99e797f5d6e142f5378a64dc02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3ba74f1b332c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 22:24:57 2011 +0200 local: PNP graph now supports multiple values --- .bugs/164 | 10 ++++-- ChangeLog | 1 + pnp-templates/check_mk-local.php | 60 +++++++++++++++++++++----------------- 3 files changed, 41 insertions(+), 30 deletions(-) diff --git a/.bugs/164 b/.bugs/164 index 488bdad..8958da8 100644 --- a/.bugs/164 +++ b/.bugs/164 @@ -1,13 +1,17 @@ Title: PNP template for local check should support multiple values Component: checks +State: done +Class: bug +Date: 2011-03-01 11:21:46 Benefit: 1 -State: open Cost: 2 -Date: 2011-03-01 11:21:46 -Class: bug +Fun: 0 Currently only one value is painted. The best way would be probably to call the PNP default template in case no special local template is existent. Beware: we must look in all template dirs for the default template. + +2011-08-18 22:23:21: changed state open -> done +Loop over all values and paint one graph for each value now. In 8 different nice colors. diff --git a/ChangeLog b/ChangeLog index a4a833a..1f5736c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * mk_logwatch: allow to set limits in processing time and number of new log messages per log file * Windows Agent: Now supports direct execution of powershell scripts + * local: PNP template now supports multiple performance values MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/pnp-templates/check_mk-local.php b/pnp-templates/check_mk-local.php index 9e55712..a6d7426 100644 --- a/pnp-templates/check_mk-local.php +++ b/pnp-templates/check_mk-local.php @@ -45,34 +45,40 @@ foreach ($template_dirs as $template_dir) { } } -if (!$found) { - $def[1] = "DEF:cnt=$RRDFILE[1]:$DS[1]:MAX "; - $def[1] .= "AREA:cnt#00ffc6:\"$servicedesc\" "; - $def[1] .= "LINE1:cnt#226600: "; +# Use another color for each graph. After eight graphs colors wrap around. +$area_colors = array( "beff5f", "5fffef", "5faaff", "cc5fff", "ff5fe2", "ff5f6c", "ff975f", "ffec5f"); +$line_colors = array( "5f7a2f", "2f8077", "2f5580", "662f80", "802f71", "802f36", "804b2f", "80762f"); - $upper = ""; - $lower = " -l 0"; - if ($WARN[1] != "") { - $def[1] .= "HRULE:$WARN[1]#ffff00:\"Warning\" "; - } - if ($CRIT[1] != "") { - $def[1] .= "HRULE:$CRIT[1]#ff0000:\"Critical\" "; - } - if ($MIN[1] != "") { - $lower = " -l " . $MIN[1]; - $minimum = $MIN[1]; - } - if ($MAX[1] != "") { - $upper = " -u" . $MAX[1]; - $def[1] .= "HRULE:$MAX[1]#0000b0:\"Upper limit\" "; - } - - $opt[1] = "$lower $upper --title '$hostname: $servicedesc' "; - $def[1] .= "GPRINT:cnt:LAST:\"current\: %6.2lf\" "; - $def[1] .= "GPRINT:cnt:MAX:\"max\: %6.2lf\" "; - $def[1] .= "GPRINT:cnt:AVERAGE:\"avg\: %6.2lf\" "; +if (!$found) { + foreach ($RRDFILE as $i => $RRD) { + $ii = $i % 8; + $name = $NAME[$i]; + $def[$i] = "DEF:cnt=$RRDFILE[$i]:$DS[$i]:MAX "; + $def[$i] .= "AREA:cnt#$area_colors[$ii]:\"$name\" "; + $def[$i] .= "LINE1:cnt#$line_colors[$ii]: "; + + $upper = ""; + $lower = " -l 0"; + if ($WARN[$i] != "") { + $def[$i] .= "HRULE:$WARN[$i]#ffff00:\"Warning\" "; + } + if ($CRIT[$i] != "") { + $def[$i] .= "HRULE:$CRIT[$i]#ff0000:\"Critical\" "; + } + if ($MIN[$i] != "") { + $lower = " -l " . $MIN[$i]; + $minimum = $MIN[$i]; + } + if ($MAX[$i] != "") { + $upper = " -u" . $MAX[$i]; + $def[$i] .= "HRULE:$MAX[$i]#0000b0:\"Upper limit\" "; + } + + $opt[$i] = "$lower $upper --title '$hostname: $servicedesc - $name' "; + $def[$i] .= "GPRINT:cnt:LAST:\"current\: %6.2lf\" "; + $def[$i] .= "GPRINT:cnt:MAX:\"max\: %6.2lf\" "; + $def[$i] .= "GPRINT:cnt:AVERAGE:\"avg\: %6.2lf\" "; + } } - ?> -

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits