Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64158 discussions

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: 33b5a52b4e472c9de4e4d0bdd0879aba2c0bed36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33b5a52b4e472c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 17:03:01 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Perf-O-Meters are now aware if there really is a PNP graph

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3213a9c973d6cbeac016b902fe9ea67b28777ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3213a9c973d6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 17:02:54 2011 +0200 Perf-O-Meters are now aware if there really is a PNP graph --- .bugs/112 | 7 ++++++- ChangeLog | 1 + web/plugins/views/perfometer.py | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.bugs/112 b/.bugs/112 index ca50fe4..0204532 100644 --- a/.bugs/112 +++ b/.bugs/112 @@ -1,6 +1,6 @@ Title: PNP-Links in Perf-O-Meter should be intelligent Component: multisite -State: open +State: done Class: cleanup Date: 2011-01-28 09:34:33 Benefit: 1 @@ -9,3 +9,8 @@ Fun: 0 If there is no PNP database the perfometer should not contain a hlink to PNP. We can use the same logic as in the intelligent PNP icon. + +2011-08-24 17:02:17: changed state open -> done +If no information avaiable, then the link is always displayed (-1) +This is the case if the user has not configured a rrdpath when load +ing livestatus. diff --git a/ChangeLog b/ChangeLog index e18efdf..333f278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * Added several missing i18n strings in view editor * Views can now be sorted by the users by clicking on the table headers. The user sort options are not persisted. + * Perf-O-Meters are now aware if there really is a PNP graph WATO: * Show error message in case of empty inventory due to agent error diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 126512b..78fec0f 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -155,7 +155,9 @@ def paint_perfometer(row): content += '<div class=title>%s</div>' % title content += '<img class=glass src="images/perfometer-bg.png">' - if 'X' in html.display_options: + # pnpgraph_present: -1 means unknown (path not configured), 0: no, 1: yes + if 'X' in html.display_options and \ + row["service_pnpgraph_present"] != 0: return "perfometer", ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content)) else: return "perfometer", content @@ -169,7 +171,8 @@ def paint_perfometer(row): multisite_painters["perfometer"] = { "title" : _("Service Perf-O-Meter"), "short" : _("Perf-O-Meter"), - "columns" : [ "service_perf_data", "service_state", "service_check_command" ], + "columns" : [ "service_perf_data", "service_state", + "service_check_command", "service_pnpgraph_present" ], "paint" : paint_perfometer }

13 years

Check_MK Git: check_mk: Fixed log_date sorter

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a58fb32bb127fb888aab5b89e8059d3401ba280f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a58fb32bb127fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 16:37:26 2011 +0200 Fixed log_date sorter --- web/plugins/views/sorters.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index b2a3836..9e6f87a 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -250,7 +250,22 @@ declare_1to1_sorter("log_type", cmp_simple_string) declare_1to1_sorter("log_contact_name", cmp_simple_string) declare_1to1_sorter("log_time", cmp_simple_number) declare_1to1_sorter("log_lineno", cmp_simple_number) -declare_1to1_sorter("log_date", cmp_simple_number) + +import time +def get_day_start_timestamp(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 cmp_date(column, r1, r2): + # need to calculate with the timestamp of the day. Using 00:00:00 at the given day. + # simply calculating with 86400 does not work because of timezone problems + r1_date = get_day_start_timestamp(r1[column]) + r2_date = get_day_start_timestamp(r2[column]) + return cmp(r2_date, r1_date) + +declare_1to1_sorter("log_date", cmp_date) # Alert statistics declare_simple_sorter("alerts_ok", _("Number of recoveries"), "alerts_ok", cmp_simple_number)

13 years

Check_MK Git: check_mk: Fixed wato log daily rotation

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b29ce71d6a70132734204247b06132eb0471de1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b29ce71d6a7013… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 17:00:41 2011 +0200 Fixed wato log daily rotation --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fa6f837..f4f0f3f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1548,13 +1548,13 @@ def paged_log(log): next_log_time = int(log[index - 1][0]) elif t < start_time and last_log_index is None: - last_log_index = index - 1 + last_log_index = index # This is the next log after this day previous_log_time = int(log[index][0]) # Finished! break - if not last_log_index: + if last_log_index is None: last_log_index = len(log) - 1 return log[first_log_index:last_log_index], (start_time, end_time, previous_log_time, next_log_time)

13 years

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: baefdb3e72826b26554c62beefe4b9765ba0e325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baefdb3e72826b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 17:01:56 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49503e2f5b579b7f5a58ac9f5914f5b895ca82eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49503e2f5b579b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 16:33:12 2011 +0200 Updated bug entries --- .bugs/342 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/342 b/.bugs/342 new file mode 100644 index 0000000..46fcee8 --- /dev/null +++ b/.bugs/342 @@ -0,0 +1,11 @@ +Title: Enable sounds per default +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2011-08-24 16:32:16 +Class: cleanup + +Enable the sound configuration in config.py per default. Change +the comments in the example multisite.mk or remove that part +completely. Update the documentation.

13 years

Check_MK Git: check_mk: Fixed minor layout bug in check man pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30b4231898e7468e4b63dba16b59f4b90d38fb94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30b4231898e746… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 16:28:43 2011 +0200 Fixed minor layout bug in check man pages --- .bugs/148 | 10 +++++++--- ChangeLog | 1 + modules/check_mk.py | 26 ++++++++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.bugs/148 b/.bugs/148 index 072a7de..6e8d847 100644 --- a/.bugs/148 +++ b/.bugs/148 @@ -1,10 +1,14 @@ Title: cmk -M: nasty white lines in parameters section Component: core +State: done +Class: nastiness +Date: 2011-02-17 13:47:36 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-17 13:47:36 -Class: nastiness +Fun: 0 The the section CHECK PARAMETERS the empty lines between the subsections must be filled with the background color until the line end. + +2011-08-24 16:28:29: changed state open -> done +Fixed layout algorithm diff --git a/ChangeLog b/ChangeLog index b32ea2c..e18efdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * Remove 'Agent version (unknown)' for SNMP-only hosts * Options --version, --help, --man, --list-checks and --packager now work even with errors in the configuration files + * Minor layout fix in check man-pages Checks & Agents: * FIX: hr_mem: take into account cache and buffers diff --git a/modules/check_mk.py b/modules/check_mk.py index 71e3f62..642449b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2394,7 +2394,8 @@ def get_tty_size(): def all_manuals(): entries = dict([(fn, check_manpages_dir + "/" + fn) for fn in os.listdir(check_manpages_dir)]) if local_check_manpages_dir and os.path.exists(local_check_manpages_dir): - entries.update(dict([(fn, local_check_manpages_dir + "/" + fn) for fn in os.listdir(local_check_manpages_dir)])) + entries.update(dict([(fn, local_check_manpages_dir + "/" + fn) + for fn in os.listdir(local_check_manpages_dir)])) return entries def list_all_manuals(): @@ -2564,6 +2565,21 @@ def show_check_manual(checkname): netto = re.sub("\033[^m]+m", "", netto) return len(netto) + # only used for debugging + def remove_ansi(line): + newline = "" + ci = 0 + while ci < len(line): + c = line[ci] + if c == '\033': + while line[ci] != 'm' and ci < len(line): + ci += 1 + else: + newline += c + ci += 1 + + return newline + def justify(line, width): need_spaces = float(width - print_len(line)) spaces = float(line.count(' ')) @@ -2575,7 +2591,7 @@ def show_check_manual(checkname): for word in words[1:]: newline += ' ' x += 1.0 - if s/x < need_spaces / spaces: + while s/x < need_spaces / spaces: newline += ' ' s += 1 newline += word @@ -2595,7 +2611,7 @@ def show_check_manual(checkname): if word == '<br>': if line != "": wrapped.append(fillup(line, width)) - wrapped.append("") + wrapped.append(fillup("", width)) line = "" col = 0 else: @@ -2645,7 +2661,9 @@ def show_check_manual(checkname): ags = [] for agent in header['agents'].split(","): agent = agent.strip() - ags.append({ "vms" : "VMS", "linux":"Linux", "aix": "AIX", "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP"}.get(agent, agent.upper())) + ags.append({ "vms" : "VMS", "linux":"Linux", "aix": "AIX", + "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP"} + .get(agent, agent.upper())) print_splitline(header_color_left, "Supported Agents: ", header_color_right, ", ".join(ags)) empty_line()

13 years

Check_MK Git: check_mk: df: enabled trend_perfdata per default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b6fe33d4620094608699ec709fa907105b9af64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6fe33d462009… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 15:59:36 2011 +0200 df: enabled trend_perfdata per default --- .bugs/341 | 10 +++++++--- ChangeLog | 2 ++ checkman/df | 8 +++++--- checks/df.include | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.bugs/341 b/.bugs/341 index 2044812..25a7514 100644 --- a/.bugs/341 +++ b/.bugs/341 @@ -1,9 +1,13 @@ Title: Enable performance data for fs trends per default Component: checks +State: done +Class: cleanup +Date: 2011-08-23 17:49:06 Benefit: 1 -State: open Cost: 1 -Date: 2011-08-23 17:49:06 -Class: cleanup +Fun: 0 Also describe this in the migration notes. + +2011-08-24 15:56:58: changed state open -> done +Enabled now. diff --git a/ChangeLog b/ChangeLog index 15c370f..b32ea2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,8 @@ * hr_mem: added Perf-O-Meter * Renamed all temperature checks to "Temperature %s". Please read the migration notes! + * df and friends: enabled trend performance data per default. Please + carefully read the migration notes! MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/checkman/df b/checkman/df index 97b7c0a..a5392e6 100644 --- a/checkman/df +++ b/checkman/df @@ -54,8 +54,8 @@ examples: # alternative[2]: Just change the default partially filesystem_default_levels["magic"] = 0.8 - # Make df output trend performance data (beware of exsting RRDs) - filesystem_default_levels["trend_perfdata"] = True + # Disable trend performance data (beware of exsting RRDs) + filesystem_default_levels["trend_perfdata"] = False # Override warning/critical levels for all checks where @@ -88,7 +88,9 @@ perfdata: levels in MB are provided. If you set the parameter {"trend_perfdata" : True}, then two additional values are output: the change of the usage in MB per range since the last check (e.g. in MB per 24 hours) and the averaged change (so called trend), - also in MB per range. This can done globally in {main.mk} by {filesystem_default_levels["trend_perfdata"] = True}. + also in MB per range. Please note, that as of version 1.1.11i3, performance data for + trends is enabled per default. You can globally disable that in {main.mk} + with {filesystem_default_levels["trend_perfdata"] = False}. Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios - changing the parameter {"trend_perfdata"} will stop all updates to diff --git a/checks/df.include b/checks/df.include index a620b63..c338d02 100644 --- a/checks/df.include +++ b/checks/df.include @@ -50,7 +50,7 @@ factory_settings["filesystem_default_levels"] = { "magic_normsize" : 20, # Standard size if 20 GB "levels_low" : (50, 60), # Never move warn level below 50% due to magic factor "trend_range" : 24, - "trend_perfdata" : False, # do not send performance data for trends + "trend_perfdata" : True, # do send performance data for trends } # Users might have set filesystem_default_levels to old format like (80, 90)

13 years

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: e927bdb9c68be610a500739f2d08c2e0a5d107c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e927bdb9c68be6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 15:55:28 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Better confirmation message for logwatch deletion

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5954ce1781a6254e95a6d038354f960ab7541a3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5954ce1781a625… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 24 15:54:56 2011 +0200 Better confirmation message for logwatch deletion --- .bugs/149 | 10 +++++++--- web/htdocs/page_logwatch.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/149 b/.bugs/149 index 48a46fd..e8f5938 100644 --- a/.bugs/149 +++ b/.bugs/149 @@ -1,9 +1,13 @@ Title: Logfile Acknowledge: rename button to Delete? Component: checks +State: done +Class: cleanup +Date: 2011-02-17 15:02:35 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-17 15:02:35 -Class: cleanup +Fun: 0 For some people this is confusing... + +2011-08-24 15:54:44: changed state open -> done +In the confirmation dialog now the deletion is clearly outlined. diff --git a/web/htdocs/page_logwatch.py b/web/htdocs/page_logwatch.py index ac4c7ad..1a7001a 100644 --- a/web/htdocs/page_logwatch.py +++ b/web/htdocs/page_logwatch.py @@ -155,7 +155,7 @@ def do_log_ack(host, filename): html.header("Acknowledge logfile %s" % file_display) html.write("<a class=navi href=\"logwatch.py?host=%s\">All logfiles of %s</a>\n" % tuple([htmllib.urlencode(host)] * 2)) ack = html.var('ack') - if not html.confirm("Please confirm the deletion of the message from <tt>%s</tt>" % filename): + if not html.confirm(_("Do you really want to acknowledge the log file <tt>%s</tt> by <b>deleting</b> all stored messages?") % filename): html.footer() return

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits