Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: ps: fix for include function and minor code cleanup

by Goetz Golla

Module: check_mk Branch: master Commit: 9b1c6b4c4037068ccf73da27b58f29d986dcab88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b1c6b4c403706… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 14 16:04:15 2014 +0200 ps: fix for include function and minor code cleanup --- checks/ps | 6 +++--- checks/ps.include | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/ps b/checks/ps index 5746a94..919fcbb 100644 --- a/checks/ps +++ b/checks/ps @@ -154,14 +154,14 @@ def inventory_ps_perf(info): def check_ps(item, params, info, with_perfdata): cpu_cores, info = ps_parse_info(info) # parse windows wmic information - return check_ps_common("processes", item, params, info, with_perfdata = with_perfdata, cpu_cores = cpu_cores) + return check_ps_common(item, params, info, with_perfdata = with_perfdata, cpu_cores = cpu_cores ) check_info['ps'] = { "check_function" : lambda i,p,n: check_ps(i,p,n,False), "inventory_function" : inventory_ps, "service_description" : "proc_%s", - "includes" : "ps.include", + "includes" : [ "ps.include" ], "has_perfdata" : False, "node_info" : True, # add first column with actual host name "group" : "ps", @@ -171,7 +171,7 @@ check_info['ps.perf'] = { "check_function" : lambda i,p,n: check_ps(i,p,n,True), "inventory_function" : inventory_ps_perf, "service_description" : "proc_%s", - "includes" : "ps.include", + "includes" : [ "ps.include" ], "has_perfdata" : True, "node_info" : True, # add first column with actual host name "group" : "ps", diff --git a/checks/ps.include b/checks/ps.include index 28f6d11..f8b162c 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -198,7 +198,7 @@ def process_matches(ps, procname, l_user): # "warnmax" : 1, # } -def check_ps_common(what, item, params, info, with_perfdata = False, cpu_cores = 1): +def check_ps_common(item, params, info, with_perfdata = False, cpu_cores = 1, info_name = "processes" ): now = time.time() if type(params) in (list, tuple): if len(params) == 5: @@ -308,7 +308,7 @@ def check_ps_common(what, item, params, info, with_perfdata = False, cpu_cores = else: perfdata = [] - infotext = "%d %s" % (count, what) + infotext = "%d %s" % (count, info_name) if running_on: infotext += " [running on %s]" % ", ".join(running_on)

9 years, 11 months

Check_MK Git: check_mk: #1186 RBN: It' s now possible to Filter for contactgroups

by Bastian Kuhn

Module: check_mk Branch: master Commit: b5d86821a4275b795e309b9b55502eb282de2f19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5d86821a4275b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 14 16:00:27 2014 +0200 #1186 RBN: It's now possible to Filter for contactgroups This feature only works with cmc (Check_MK Microcore) because Nagios doesn't have the needed context information. --- .werks/1186 | 10 ++++++++++ ChangeLog | 1 + modules/notify.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1186 b/.werks/1186 new file mode 100644 index 0000000..5845669 --- /dev/null +++ b/.werks/1186 @@ -0,0 +1,10 @@ +Title: RBN: It's now possible to Filter for contactgroups +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1413295156 +Class: feature + +This feature only works with cmc (Check_MK Microcore) because Nagios doesn't have the needed context information. + diff --git a/ChangeLog b/ChangeLog index b6584a9..2f4fb96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 1394 HTML notifications have a new content field for debugging variables... * 1400 Added example notification script for Pushover to doc/treasures/notifications... * 1123 Rule based notifications: New condition "Match Service Groups" + * 1186 RBN: It's now possible to Filter for contactgroups... * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message diff --git a/modules/notify.py b/modules/notify.py index ec09c31..3299cb1 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -699,7 +699,7 @@ def rbn_match_servicegroups(rule, context): def rbn_match_contactgroups(rule, context): required_groups = rule.get("match_contactgroups") if context["WHAT"] != "SERVICE": - cgn = context.get("SERVICECONTACTS") + cgn = context.get("SERVICECONTACTGROUPNAMES") else: cgn = context.get("HOSTCONTACTGROUPNAMES")

9 years, 11 months

Check_MK Git: check_mk: ps: check has been split into a check file and an include file ps. include to enable other checks to make use it

by Goetz Golla

Module: check_mk Branch: master Commit: b27061d06853fb8f72989344a2eb53dbe7aed0f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b27061d06853fb… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 14 15:39:24 2014 +0200 ps: check has been split into a check file and an include file ps.include to enable other checks to make use it --- checks/ps | 345 +------------------------------------------------- checks/ps.include | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 371 insertions(+), 339 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b27061d068…

9 years, 11 months

Check_MK Git: check_mk: RBN: Prepare support for Contact Group Filter. Only works with CMC, Nagios don't have all needed informations

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9936c652b78901eda9d930e21014f29fad7e648d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9936c652b78901… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 14 15:37:44 2014 +0200 RBN: Prepare support for Contact Group Filter. Only works with CMC, Nagios don't have all needed informations --- modules/notify.py | 26 ++++++++++++++++++++++++++ web/htdocs/wato.py | 14 +++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 276b11a..ec09c31 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -627,6 +627,7 @@ def rbn_match_rule(rule, context): rbn_match_hosttags(rule, context) or \ rbn_match_hostgroups(rule, context) or \ rbn_match_servicegroups(rule, context) or \ + rbn_match_contactgroups(rule, context) or \ rbn_match_hosts(rule, context) or \ rbn_match_exclude_hosts(rule, context) or \ rbn_match_services(rule, context) or \ @@ -695,6 +696,31 @@ def rbn_match_servicegroups(rule, context): return "The service is only in the groups %s, but %s is required" % ( sgn, " or ".join(required_groups)) +def rbn_match_contactgroups(rule, context): + required_groups = rule.get("match_contactgroups") + if context["WHAT"] != "SERVICE": + cgn = context.get("SERVICECONTACTS") + else: + cgn = context.get("HOSTCONTACTGROUPNAMES") + + if required_groups != None: + if cgn == None: + notify_log("Warning: No information about contact groups in the context. " \ + "Seams that you don't use the Check_MK Microcore. ") + return + if cgn: + contactgroups = cgn.split(",") + else: + return "The object is in no group, but %s is required" % ( + " or ".join(required_groups)) + + for group in required_groups: + if group in contactgroups: + return + + return "The object is only in the groups %s, but %s is required" % ( + cgn, " or ".join(required_groups)) + def rbn_match_hostgroups(rule, context): required_groups = rule.get("match_hostgroups") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b0fea5a..80ce88e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8301,7 +8301,15 @@ def vs_notification_rule(userid = None): ( "match_servicegroups", GroupChoice("service", title = _("Match Service Groups"), - help = _("The host must be in one of the selected service groups"), + help = _("The service must be in one of the selected service groups"), + allow_empty = False, + ) + ), + ( "match_contactgroups", + GroupChoice("contact", + title = _("Match Contact Groups (cmc only)"), + help = _("The host/ service must be in one of the selected contact groups. Only works with Check_MK Microcore. " \ + "If you don't use the CMC, that filter will not apply"), allow_empty = False, ) ), @@ -8555,7 +8563,7 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_contactgroups", "match_exclude_services", "match_plugin_output", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], @@ -8565,7 +8573,7 @@ def vs_notification_rule(userid = None): + contact_headers + [ ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_contactgroups", "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec" ] ),

9 years, 11 months

Check_MK Git: check_mk: Ignore non-compatible views created by intermediate GIT versions

by Mathias Kettner

Module: check_mk Branch: master Commit: 585408bdde72e7ffd550b1e261db3942717076c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=585408bdde72e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 13:43:18 2014 +0200 Ignore non-compatible views created by intermediate GIT versions --- web/htdocs/views.py | 64 +++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8ebe806..b174883 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -103,36 +103,40 @@ def transform_old_views(): # This tries to map the datasource and additional settings of the # views to get the correct view context if 'single_infos' not in view: - hide_filters = view.get('hide_filters') - - if 'service' in hide_filters and 'host' in hide_filters: - view['single_infos'] = ['service', 'host'] - elif 'service' in hide_filters and 'host' not in hide_filters: - view['single_infos'] = ['service'] - elif 'host' in hide_filters: - view['single_infos'] = ['host'] - elif 'hostgroup' in hide_filters: - view['single_infos'] = ['hostgroup'] - elif 'servicegroup' in hide_filters: - view['single_infos'] = ['servicegroup'] - elif 'aggr_service' in hide_filters: - view['single_infos'] = ['service'] - elif 'aggr_name' in hide_filters: - view['single_infos'] = ['aggr'] - elif 'log_contact_name' in hide_filters: - view['single_infos'] = ['contact'] - elif 'event_host' in hide_filters: - view['single_infos'] = ['host'] - elif hide_filters == ['event_id', 'history_line']: - view['single_infos'] = ['history'] - elif 'event_id' in hide_filters: - view['single_infos'] = ['event'] - elif 'aggr_hosts' in hide_filters: - view['single_infos'] = ['host'] - else: - # For all other context types assume the view is showing multiple objects - # and the datasource can simply be gathered from the datasource - view['single_infos'] = [] + try: + hide_filters = view.get('hide_filters') + + if 'service' in hide_filters and 'host' in hide_filters: + view['single_infos'] = ['service', 'host'] + elif 'service' in hide_filters and 'host' not in hide_filters: + view['single_infos'] = ['service'] + elif 'host' in hide_filters: + view['single_infos'] = ['host'] + elif 'hostgroup' in hide_filters: + view['single_infos'] = ['hostgroup'] + elif 'servicegroup' in hide_filters: + view['single_infos'] = ['servicegroup'] + elif 'aggr_service' in hide_filters: + view['single_infos'] = ['service'] + elif 'aggr_name' in hide_filters: + view['single_infos'] = ['aggr'] + elif 'log_contact_name' in hide_filters: + view['single_infos'] = ['contact'] + elif 'event_host' in hide_filters: + view['single_infos'] = ['host'] + elif hide_filters == ['event_id', 'history_line']: + view['single_infos'] = ['history'] + elif 'event_id' in hide_filters: + view['single_infos'] = ['event'] + elif 'aggr_hosts' in hide_filters: + view['single_infos'] = ['host'] + else: + # For all other context types assume the view is showing multiple objects + # and the datasource can simply be gathered from the datasource + view['single_infos'] = [] + except: # Exceptions can happen for views saved with certain GIT versions + if config.debug: + raise # Convert from show_filters, hide_filters, hard_filters and hard_filtervars # to context construct

9 years, 11 months

Check_MK Git: check_mk: Remove debug output, fix DST in prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: 48a7c863afad23f8ebf301d6272b5b5cf0886d04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a7c863afad23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 13:12:19 2014 +0200 Remove debug output, fix DST in prediction --- web/htdocs/prediction.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 1cda8d8..fdef24e 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -138,14 +138,13 @@ def page_graph(): from_time, until_time = timegroup["range"] now = time.time() if now >= from_time and now <= until_time: - rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) - render_curve(rrd_data, "#0000ff", 2) if time.daylight: tz_offset = time.altzone else: tz_offset = time.timezone + rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) + render_curve(rrd_data, "#0000ff", 2) if current_value != None: - html.debug(now, tz_offset, timegroup["slice"]) rel_time = (now - tz_offset) % timegroup["slice"] render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff")

9 years, 11 months

Check_MK Git: check_mk: #1078 FIX Fix compensation for daylight safing time in prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: 209639ca739776749a0a7c69ac8c54e8a3c269ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=209639ca739776… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 13:11:32 2014 +0200 #1078 FIX Fix compensation for daylight safing time in prediction --- .werks/1078 | 9 ++++++++ ChangeLog | 1 + modules/prediction.py | 54 ++++++++++++++++++++++++++++++---------------- web/htdocs/prediction.py | 8 +++++-- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/.werks/1078 b/.werks/1078 new file mode 100644 index 0000000..a5bf6bf --- /dev/null +++ b/.werks/1078 @@ -0,0 +1,9 @@ +Title: Fix compensation for daylight safing time in prediction +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1413285066 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0fd0eaa..b6584a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * 1122 FIX: windows agent: unicode logfile monitoring: now able to detect incomplete written lines... * 1184 FIX: cisco_power: Fixed detection of item. In some cases the status information was part of the item... NOTE: Please refer to the migration notes! + * 1078 FIX: Fix compensation for daylight safing time in prediction Multisite: * 1066 Implemented Dashboard Designer... diff --git a/modules/prediction.py b/modules/prediction.py index 238a70d..fdfe641 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -113,42 +113,54 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime daynames = [ "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"] +# Check wether a certain time stamp lies with in daylight safing time (DST) +def is_dst(timestamp): + return time.localtime(timestamp).tm_isdst + +# Returns the timezone *including* DST shift at a certain point of time +def timezone_at(timestamp): + if is_dst(timestamp): + return time.altzone + else: + return time.timezone + def group_by_wday(t): wday = time.localtime(t).tm_wday - day_of_epoch, rel_time = divmod(t - time.timezone, 86400) + day_of_epoch, rel_time = divmod(t - timezone_at(t), 86400) return daynames[wday], rel_time def group_by_day(t): - return "everyday", (t - time.timezone) % 86400 + return "everyday", (t - timezone_at(t)) % 86400 def group_by_day_of_month(t): broken = time.localtime(t) mday = broken[2] - return str(mday), (t - time.timezone) % 86400 + return str(mday), (t - timezone_at(t)) % 86400 def group_by_everyhour(t): - return "everyhour", (t - time.timezone) % 3600 + return "everyhour", (t - timezone_at(t)) % 3600 + prediction_periods = { "wday" : { - "slice" : 86400, # 7 slices - "groupby" : group_by_wday, - "valid" : 7, + "slice" : 86400, # 7 slices + "groupby" : group_by_wday, + "valid" : 7, }, "day" : { - "slice" : 86400, # 31 slices - "groupby" : group_by_day_of_month, - "valid" : 28, + "slice" : 86400, # 31 slices + "groupby" : group_by_day_of_month, + "valid" : 28, }, "hour" : { - "slice" : 86400, # 1 slice - "groupby" : group_by_day, - "valid" : 1, + "slice" : 86400, # 1 slice + "groupby" : group_by_day, + "valid" : 1, }, "minute" : { - "slice" : 3600, # 1 slice - "groupby" : group_by_everyhour, - "valid" : 24, + "slice" : 3600, # 1 slice + "groupby" : group_by_everyhour, + "valid" : 24, }, } @@ -168,10 +180,16 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn begin = from_time slices = [] absolute_begin = from_time - params["horizon"] * 86400 - # The resolution of the different time ranges differs. We interpolate + + # The resolutions of the different time ranges differ. We interpolate # to the best resolution. We assume that the youngest slice has the - # finest resolution. We also assume, that step step is always dividable + # finest resolution. We also assume, that each step is always dividable # by the smallest step. + + # Note: due to the f**king DST, we can have several shifts between + # DST and non-DST during are computation. We need to compensate for + # those. DST swaps within slices are being ignored. The DST flag + # is checked against the beginning of the slice. smallest_step = None while begin >= absolute_begin: tg, fr, un, rel = get_prediction_timegroup(begin, period_info) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index e35238f..1cda8d8 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -140,9 +140,13 @@ def page_graph(): if now >= from_time and now <= until_time: rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) render_curve(rrd_data, "#0000ff", 2) - + if time.daylight: + tz_offset = time.altzone + else: + tz_offset = time.timezone if current_value != None: - rel_time = (time.time() - time.timezone) % timegroup["slice"] + html.debug(now, tz_offset, timegroup["slice"]) + rel_time = (now - tz_offset) % timegroup["slice"] render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") html.footer()

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1074

by Mathias Kettner

Module: check_mk Branch: master Commit: 719ebc501affc6ae686ef285e6a0ae2bbee676e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=719ebc501affc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 13:11:00 2014 +0200 Updated bug entries #1074 --- .bugs/1074 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/1074 b/.bugs/1074 index 2a23b0b..f0221b9 100644 --- a/.bugs/1074 +++ b/.bugs/1074 @@ -1,11 +1,15 @@ Title: Predictive monitoring does not take into account DST Component: checks -State: open +Class: bug +State: done Date: 2013-10-16 21:43:31 Targetversion: future -Class: bug The predictive monitoring appearantly does not handle daylight saving time correctly. This is really hard to fix. + +2014-10-14 13:10:58: changed state open -> done +We simply shift each beginning of a period according to the current +timezone in that particular period of time. Seems to fix the problem.

9 years, 11 months

Check_MK Git: check_mk: statgrab_mem: Added Wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6579c24c81a63a7e15d9b57611fee35b3e9ae690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6579c24c81a63a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 14 13:09:20 2014 +0200 statgrab_mem: Added Wato configuration --- checks/statgrab_mem | 11 ++++++----- web/plugins/wato/check_parameters.py | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/checks/statgrab_mem b/checks/statgrab_mem index f3465e8..2d1a3ed 100644 --- a/checks/statgrab_mem +++ b/checks/statgrab_mem @@ -30,7 +30,7 @@ def inventory_statgrab_mem(info): if len(info) > 0: return [(None, 'memused_default_levels')] -def check_statgrab_mem(item, params, info): +def check_statgrab_mem(_no_item, params, info): for var, value in info: if var == 'mem.used': memused_kb = int(value) / 1024 elif var == 'mem.total': totalmem_kb = int(value) / 1024 @@ -79,8 +79,9 @@ def check_statgrab_mem(item, params, info): check_info["statgrab_mem"] = { - 'check_function': check_statgrab_mem, - 'inventory_function': inventory_statgrab_mem, - 'service_description': 'Memory used', - 'has_perfdata': True, + 'check_function' : check_statgrab_mem, + 'inventory_function' : inventory_statgrab_mem, + 'service_description' : 'Memory used', + 'has_perfdata' : True, + 'group' : "statgrab_mem", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a8f7f27..88a4371 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2393,6 +2393,32 @@ register_check_parameters( register_check_parameters( subgroup_os, + "statgrab_mem", + _("Statgrab Memory Usage"), + Alternative( + elements = [ + Tuple( + title = _("Specify levels in percentage of total RAM"), + elements = [ + Percentage(title = _("Warning at a usage of"), unit = _("% of RAM"), maxvalue = None), + Percentage(title = _("Critical at a usage of"), unit = _("% of RAM"), maxvalue = None) + ] + ), + Tuple( + title = _("Specify levels in absolute usage values"), + elements = [ + Integer(title = _("Warning if above"), unit = _("MB")), + Integer(title = _("Critical if above"), unit = _("MB")) + ] + ), + ] + ), + None, + "first" +) + +register_check_parameters( + subgroup_os, "cisco_mem", _("Cisco Memory Usage"), Alternative(

9 years, 11 months

Check_MK Git: check_mk: Omit blue current value curve in prediction for non-current timeranges

by Mathias Kettner

Module: check_mk Branch: master Commit: a5bf5940b0fa011c15fba5ecb691aeea5c6705d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5bf5940b0fa01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 12:36:09 2014 +0200 Omit blue current value curve in prediction for non-current timeranges This curves do not make much sense and are wrong sometimes --- web/htdocs/prediction.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index b1a1059..e35238f 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -136,12 +136,14 @@ def page_graph(): # Try to get current RRD data and render it also from_time, until_time = timegroup["range"] - rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) - render_curve(rrd_data, "#0000ff", 2) - - if current_value != None: - rel_time = (time.time() - time.timezone) % timegroup["slice"] - render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") + now = time.time() + if now >= from_time and now <= until_time: + rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) + render_curve(rrd_data, "#0000ff", 2) + + if current_value != None: + rel_time = (time.time() - time.timezone) % timegroup["slice"] + render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") html.footer()

9 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014