[checkmk-commits] Check_MK Git: check_mk: Minor optical improvements in Werks

Module: check_mk Branch: master Commit: 06f8f520d9fadb74d6de7f5c15c26cb7713962ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06f8f520d9fadb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 6 13:38:11 2013 +0100 Minor optical improvements in Werks --- ChangeLog | 22 +++++++++++----------- werk | 19 +++++++++++++------ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff4751b..3bd9e4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,23 +1,23 @@ 1.2.3i7: Checks & Agents: - * 0060: cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches... - * 0061: cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... + * 0060 cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches... + * 0061 cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... Multisite: - * 0001: New filters for selecting several host/service-groups at once... - * 0050: New concept of favorite hosts and services plus matching filters and views... + * 0001 New filters for selecting several host/service-groups at once... + * 0050 New concept of favorite hosts and services plus matching filters and views... * 0043 FIX: LDAP: Improved error reporting during synchronisation... * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles... WATO: - * 0053: New rule for configuring the display_name of a service... + * 0053 New rule for configuring the display_name of a service... Reporting & Availability: - * 0051: Option for showing timeline directly in availability table... - * 0052: Visual colorization of availability according to levels... - * 0054: New labelling options for availability table... - * 0055: Allow grouping by host, host group or service group... + * 0051 Option for showing timeline directly in availability table... + * 0052 Visual colorization of availability according to levels... + * 0054 New labelling options for availability table... + * 0055 Allow grouping by host, host group or service group... Livestatus: * 0023 FIX: table statehist: code cleanup / minor performance improvements... @@ -28,11 +28,11 @@ * 0041 FIX: setup.py now handles non existing wwwuser gracefully... Checks & Agents: - * 0040: Add agent plugin to test local hostname resolving... + * 0040 Add agent plugin to test local hostname resolving... * 0020 FIX: Inventory problem with inventory_processes parameter... Multisite: - * 0000: Improved performance of LDAP sync by refactoring the group sync code + * 0000 Improved performance of LDAP sync by refactoring the group sync code WATO: * 0042 FIX: Removed debug outputs from service inventory... diff --git a/werk b/werk index 37b6036..499a913 100755 --- a/werk +++ b/werk @@ -161,12 +161,12 @@ def write_changelog_line(chn, werk): prefix = "" for classid, classname, p in classes: if werk["class"] == classid and p: - prefix = " " + p + prefix = " " + p + ":" if werk["description"]: omit = "..." else: omit = "" - chn.write(" * %04d%s: %s%s\n" % (werk["id"], prefix, werk["title"], omit)) + chn.write(" * %04d%s %s%s\n" % (werk["id"], prefix, werk["title"], omit)) if werk["class"].startswith("incomp"): chn.write(" NOTE: Please refer to the migration notes!\n") @@ -309,11 +309,18 @@ def list_werk(werk): bold = "" lines, cols = get_tty_size() title = werk["title"][:cols - 45] - sys.stdout.write("#%04d %-12s %-13s %s%s%s %-8s %s%s%s\n" % + sys.stdout.write("#%04d %-9s %s %-13s %s%s%s %-8s %s%s%s\n" % (int(werk["id"]), - werk["class"], werk["component"], tty_bold, werk["level"], tty_normal, + time.strftime("%F", time.localtime(int(werk["date"]))), + colored_class(werk["class"], 7), werk["component"], tty_bold, werk["level"], tty_normal, werk["version"], bold, title, tty_normal)) +def colored_class(classname, digits): + if classname == "fix": + return tty_bold + tty_red + ("%-" + str(digits) + "s") % classname + tty_normal + else: + return classname + def show_werk(werk): list_werk(werk) sys.stdout.write("\n%s\n" % werk["description"]) @@ -325,7 +332,7 @@ def main_list(args, format): # in one class are orred. Multiple types are anded. filters = {} - sort = lambda a,b: cmp(a['id'], b['id']) + sort = lambda a,b: cmp(a['date'], b['date']) reverse = False for a in args: @@ -364,7 +371,7 @@ def main_list(args, format): if not skip: newwerks.append(werk) werks = newwerks - + # Sort if sort: newwerks.sort(sort)