Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: tcp_conn_stats: add metrics declarations and graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 90e8225fde82703ee0c9c60c08ab6dde61a920cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e8225fde8270… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 26 22:00:25 2015 +0100 tcp_conn_stats: add metrics declarations and graphs --- web/htdocs/metrics.py | 2 +- web/plugins/metrics/check_mk.py | 184 +++++++++++++++++++++++++++------------ 2 files changed, 129 insertions(+), 57 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 57cdfb3..0f12db9 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -966,7 +966,7 @@ def page_show_graph(): try: # Currently always displaying 24h graph end_time = time.time() - start_time = end_time - 24 * 3600 + start_time = end_time - 8 * 3600 htmlcode = render_svc_time_graph(row, start_time, end_time, size=(30, 10), show_legend=False) if htmlcode: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b4558fb..ce606f2 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -467,6 +467,12 @@ metric_info["process_creations"] = { "color" : "#ff8020", } +metric_info["threads"] = { + "title" : _("Number of running threads"), + "unit" : "count", + "color" : "#8040f0", +} + metric_info["fs_used"] = { "title" : _("Used filesystem space"), "unit" : "bytes", @@ -934,6 +940,74 @@ metric_info["if_out_non_unicast"] = { "unit" : "1/s", "color" : "#0080c0", } + +metric_info["tcp_established"] = { + "title" : _("State %s") % "ESTABLISHED", + "unit" : "count", + "color" : "#00f040", +} + +metric_info["tcp_syn_sent"] = { + "title" : _("State %s") % "SYN_SENT", + "unit" : "count", + "color" : "#a00000", +} + +metric_info["tcp_syn_recv"] = { + "title" : _("State %s") % "SYN_RECV", + "unit" : "count", + "color" : "#ff4000", +} + +metric_info["tcp_last_ack"] = { + "title" : _("State %s") % "LAST_ACK", + "unit" : "count", + "color" : "#c060ff", +} + +metric_info["tcp_close_wait"] = { + "title" : _("State %s") % "CLOSE_WAIT", + "unit" : "count", + "color" : "#f000f0", +} + +metric_info["tcp_time_wait"] = { + "title" : _("State %s") % "TIME_WAIT", + "unit" : "count", + "color" : "#00b0b0", +} + +metric_info["tcp_closed"] = { + "title" : _("State %s") % "CLOSED", + "unit" : "count", + "color" : "#ffc000", +} + +metric_info["tcp_closing"] = { + "title" : _("State %s") % "CLOSING", + "unit" : "count", + "color" : "#ffc080", +} + +metric_info["tcp_fin_wait1"] = { + "title" : _("State %s") % "FIN_WAIT1", + "unit" : "count", + "color" : "#cccccc", +} + +metric_info["tcp_fin_wait2"] = { + "title" : _("State %s") % "FIN_WAIT2", + "unit" : "count", + "color" : "#888888", +} + +metric_info["tcp_bound"] = { + "title" : _("State %s") % "BOUND", + "unit" : "count", + "color" : "#4060a0", +} + + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -1006,6 +1080,20 @@ check_metrics["check_mk-mem.linux"] = { "vmalloc_chunk" : { "name" : "mem_lnx_vmalloc_chunk", }, } +check_metrics["check_mk-tcp_conn_stats"] = { + "SYN_SENT" : { "name": "tcp_syn_sent" }, + "SYN_RECV" : { "name": "tcp_syn_recv" }, + "ESTABLISHED" : { "name": "tcp_established" }, + "TIME_WAIT" : { "name": "tcp_time_wait" }, + "LAST_ACK" : { "name": "tcp_last_ack" }, + "CLOSE_WAIT" : { "name": "tcp_close_wait" }, + "CLOSED" : { "name": "tcp_closed" }, + "CLOSING" : { "name": "tcp_closing" }, + "FIN_WAIT1" : { "name": "tcp_fin_wait1" }, + "FIN_WAIT2" : { "name": "tcp_fin_wait2" }, + "BOUND" : { "name": "tcp_bound" }, +} + df_translation = { 0 : { "name" : "fs_used", "scale" : MB }, "fs_size" : { "scale" : MB }, @@ -1352,11 +1440,27 @@ perfometer_info.append({ # | Definitions of time series graphs | # '----------------------------------------------------------------------' -graph_info.append({ - "metrics" : [ - ( "execution_time", "area" ) - ] -}) +def define_generic_graph(metric_name): + graph_info.append({ + "metrics" : [ + ( metric_name, "area" ), + ], + "scalars" : [ + metric_name + ":warn", + metric_name + ":crit", + ] + }) + +define_generic_graph("context_switches") +define_generic_graph("major_page_faults") +define_generic_graph("process_creations") +define_generic_graph("threads") +define_generic_graph("runtime") +define_generic_graph("execution_time") +define_generic_graph("uptime") +define_generic_graph("temp") +define_generic_graph("time_offset") + graph_info.append({ "title" : _("Used CPU Time"), @@ -1368,36 +1472,6 @@ graph_info.append({ ], }) -graph_info.append({ - "metrics" : [ - ( "uptime", "area" ), - ] -}) - -graph_info.append({ - "metrics" : [ - ( "context_switches", "area" ), - ] -}) - -graph_info.append({ - "metrics" : [ - ( "major_page_faults", "area" ), - ] -}) - -graph_info.append({ - "metrics" : [ - ( "process_creations", "area" ), - ] -}) - -graph_info.append({ - "title" : _("Process Runtime"), - "metrics" : [ - ( "runtime", "area" ), - ] -}) graph_info.append({ "title" : _("CPU Load - %(load1:max@count) CPU Cores"), @@ -1441,22 +1515,8 @@ graph_info.append({ "range" : (0, 0), }) -graph_info.append({ - "metrics" : [ - ( "inodes_used", "area" ), - ], - "scalars" : [ - "inodes_used:warn", - "inodes_used:crit", - ], -}) - +define_generic_graph("inodes_used") -graph_info.append({ - "metrics" : [ - ( "temp", "area" ), - ] -}) graph_info.append({ "title" : _("CPU utilization"), @@ -1471,12 +1531,6 @@ graph_info.append({ }) graph_info.append({ - "metrics" : [ - ( "time_offset", "area" ), - ] -}) - -graph_info.append({ "title" : _("Wasted space of tables and indexes"), "metrics" : [ ( "tablespace_wasted", "area" ), @@ -1781,3 +1835,21 @@ graph_info.append({ ("mem_lnx_vmalloc_chunk", "stack"), ], }) + +graph_info.append({ + "title" : _("TCP Connection States"), + "metrics" : [ + ( "tcp_syn_sent", "stack"), + ( "tcp_syn_recv", "stack"), + ( "tcp_established", "stack"), + ( "tcp_time_wait", "stack"), + ( "tcp_last_ack", "stack"), + ( "tcp_close_wait", "stack"), + ( "tcp_closed", "stack"), + ( "tcp_closing", "stack"), + ( "tcp_fin_wait1", "stack"), + ( "tcp_fin_wait2", "stack"), + ( "tcp_bound", "stack"), + ], + "omit_zero_metrics" : True, +})

9 years, 6 months

Check_MK Git: check_mk: Minor styling changes for graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: f3faf445c8de261c54c4355fb6c370566fd1d79e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3faf445c8de26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 25 18:03:23 2015 +0100 Minor styling changes for graphs --- web/htdocs/check_mk.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index acfeeb4..bfeab96 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -552,6 +552,7 @@ table.graph { background-color: #f8f4f0; padding: 8px 16px 4px 8px; margin-bottom: 5px; + position: relative; } table.graph td.title { @@ -559,6 +560,24 @@ table.graph td.title { font-weight: bold; } +table.graph td.freepos div.time { + position: absolute; + top: 10px; + right: 18px; + text-align: right; + color: #808080; +} + +table.graph td.freepos img.resize { + position: absolute; + bottom: 3px; + right: 3px; + width: 12px; + height: 12px; + cursor: se-resize; +} + + table.graph canvas { margin: 0px; }

9 years, 6 months

Check_MK Git: check_mk: Added new graph defintions for check_mk-mem.linux

by Mathias Kettner

Module: check_mk Branch: master Commit: a56dc2996934cf196e73e7bc5cb391c0e0e3ddff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a56dc2996934cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 26 18:25:40 2015 +0100 Added new graph defintions for check_mk-mem.linux --- web/htdocs/metrics.py | 8 + web/plugins/metrics/check_mk.py | 422 +++++++++++++++++++++++++++++++++++---- 2 files changed, 394 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a56dc29969…

9 years, 6 months

Check_MK Git: check_mk: Renamed metrics labels of execution time

by Mathias Kettner

Module: check_mk Branch: master Commit: 615ab8d1f88779f915d7008fabd50da68a897d37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615ab8d1f88779… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 25 18:03:41 2015 +0100 Renamed metrics labels of execution time --- web/plugins/metrics/check_mk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ca746ca..c7ffd01 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -645,25 +645,25 @@ metric_info["execution_time"] = { } metric_info["user_time"] = { - "title" : _("CPU time spent in user space"), + "title" : _("CPU time in user space"), "unit" : "s", "color" : "#60f020", } metric_info["system_time"] = { - "title" : _("CPU time spent in system space"), + "title" : _("CPU time in system space"), "unit" : "s", "color" : "#ff6000", } metric_info["children_user_time"] = { - "title" : _("CPU time of childs in user space"), + "title" : _("Child time in user space"), "unit" : "s", "color" : "#aef090", } metric_info["children_system_time"] = { - "title" : _("CPU time of childs in system space"), + "title" : _("Child time in system space"), "unit" : "s", "color" : "#ffb080", }

9 years, 6 months

Check_MK Git: check_mk: metrics: better output of percentages

by Mathias Kettner

Module: check_mk Branch: master Commit: 06890782873b05c64b16db2be314f3e11d22fde7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06890782873b05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 24 17:37:28 2015 +0100 metrics: better output of percentages --- web/htdocs/lib.py | 16 ++++++++++++---- web/plugins/metrics/check_mk.py | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index df64ec7..9e6616a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -481,11 +481,8 @@ def num_split(s): # exp -= 1 # return mantissa, exp -def logb(x, base): - return math.log(x) / math.log(base) - def frexpb(x, base): - exp = int(logb(x, base)) + exp = int(math.log(x, base)) mantissa = x / base**exp if mantissa < 1: mantissa *= base @@ -578,6 +575,17 @@ def number_human_readable(n, precision=1, unit="B"): return (f + "%s") % (n, unit) +def percent_human_redable(perc, precision=2, drop_zeroes=True): + if perc > 0: + perc_precision = max(1, 2 - int(round(math.log(perc, 10)))) + else: + perc_precision = 1 + text = "%%.%df" % perc_precision % perc + if drop_zeroes: + text = text.rstrip("0").rstrip(".") + return text + "%" + + def age_human_readable(secs, min_only=False): if secs < 0: return "- " + age_human_readable(-secs, min_only) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 217fd96..ca746ca 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -55,7 +55,7 @@ unit_info["count"] = { unit_info["%"] = { "title" : _("%"), "symbol" : _("%"), - "render" : lambda v: "%s%%" % drop_dotzero(v), + "render" : lambda v: percent_human_redable(v, 3), } # Similar as %, but value ranges from 0.0 ... 1.0 @@ -63,7 +63,7 @@ unit_info["ratio"] = { "title" : _("%"), "symbol" : _("%"), "render_scale" : 100.0, # Scale by this before rendering if "render" not being used - "render" : lambda v: "%s%%" % drop_dotzero(100.0 * v), + "render" : lambda v: percent_human_redable(v, 3), } unit_info["s"] = {

9 years, 6 months

Check_MK Git: check_mk: Implement metrics definitions of interface checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b5c81c47ff3d21854f68134b2510be86863edcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b5c81c47ff3d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 25 22:44:42 2015 +0100 Implement metrics definitions of interface checks still there is the problem with bits vs. octets --- web/htdocs/lib.py | 2 +- web/htdocs/metrics.py | 11 +++ web/plugins/metrics/check_mk.py | 180 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 186 insertions(+), 7 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index caedd88..9d11009 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -508,7 +508,7 @@ def frexp10(x): # down to the precision of the actual number def physical_precision(v, precision, unit_symbol): if v == 0: - return "%%.%df" % (precision - 1) % v + return "%%.%df %%s" % (precision - 1) % (v, unit_symbol) elif v < 0: return "-" + physical_precision(-v, precision, unit_symbol) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 0e05b5c..098e816 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -229,9 +229,20 @@ def evaluate(expression, translated_metrics): expression, explicit_color = expression.rsplit("#", 1) # drop appended color information else: explicit_color = None + + if "@" in expression: + expression, explicit_unit_name = expression.rsplit("@", 1) # appended unit name + else: + explicit_unit_name = None + value, unit, color = evaluate_rpn(expression, translated_metrics) + if explicit_color: color = "#" + explicit_color + + if explicit_unit_name: + unit = unit_info[explicit_unit_name] + return value, unit, color diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c7ffd01..2c7fa95 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -46,9 +46,10 @@ unit_info[""] = { } unit_info["count"] = { - "title" : _("Count"), - "symbol" : "", - "render" : lambda v: "%d" % v, + "title" : _("Count"), + "symbol" : "", + "render" : lambda v : "%d" % v, + "stepping" : "integer", # for vertical graph labels } # value ranges from 0.0 ... 100.0 @@ -93,6 +94,12 @@ unit_info["bytes/s"] = { "stepping" : "binary", # for vertical graph labels } +unit_info["bits/s"] = { + "title" : _("Bits per second"), + "symbol" : _("bits/s"), + "render" : lambda v: physical_precision(v, 3, _("bit/s")), +} + # Output in bytes/days, value is in bytes/s unit_info["bytes/d"] = { "title" : _("Bytes per day"), @@ -668,7 +675,71 @@ metric_info["children_system_time"] = { "color" : "#ffb080", } +metric_info["printer_queue"] = { + "title" : _("Printer queue length"), + "unit" : "count", + "color" : "#a63df2", +} + +metric_info["if_in_octets"] = { + "title" : _("Input Octets"), + "unit" : "bytes/s", + "color" : "#00e060", +} + +metric_info["if_out_octets"] = { + "title" : _("Output Octets"), + "unit" : "bytes/s", + "color" : "#0080e0", +} + +metric_info["if_in_discards"] = { + "title" : _("Input Discards"), + "unit" : "1/s", + "color" : "#ff8000", +} + +metric_info["if_in_errors"] = { + "title" : _("Input Errors"), + "unit" : "1/s", + "color" : "#ff0000", +} + +metric_info["if_out_discards"] = { + "title" : _("Output Dicards"), + "unit" : "1/s", + "color" : "#ff8080", +} + +metric_info["if_out_errors"] = { + "title" : _("Output Errors"), + "unit" : "1/s", + "color" : "#ff0080", +} + +metric_info["if_in_unicast"] = { + "title" : _("Input unicast packets"), + "unit" : "1/s", + "color" : "#00ffc0", +} + +metric_info["if_in_non_unicast"] = { + "title" : _("Input non-unicast packets"), + "unit" : "1/s", + "color" : "#00c080", +} + +metric_info["if_out_unicast"] = { + "title" : _("Output unicast packets"), + "unit" : "1/s", + "color" : "#00c0ff", +} +metric_info["if_out_non_unicast"] = { + "title" : _("Output non-unicast packets"), + "unit" : "1/s", + "color" : "#0080c0", +} #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -729,6 +800,35 @@ check_metrics["check_mk-fast_lta_silent_cubes.capacity"] = df_translation check_metrics["check_mk-fast_lta_volumes"] = df_translation check_metrics["check_mk-libelle_business_shadow.archive_dir"] = df_translation +# in=0;;;0; inucast=0;;;; innucast=0;;;; indisc=0;;;; inerr=0;0.01;0.1;; out=0;;;0; outucast=0;;;; outnucast=0;;;; outdisc=0;;;; outerr=0;0.01;0.1;; outqlen=0;;;0; +if_translation = { + "in" : { "name": "if_in_octets" }, + "out" : { "name": "if_out_octets" }, + "indisc" : { "name": "if_in_discards" }, + "inerr" : { "name": "if_in_errors" }, + "outdisc" : { "name": "if_out_discards" }, + "outerr" : { "name": "if_out_errors" }, + "inucast" : { "name": "if_in_unicast" }, + "innucast" : { "name": "if_in_non_unicast" }, + "outucast" : { "name": "if_out_unicast" }, + "outnucast" : { "name": "if_out_non_unicast" }, +} +check_metrics["check_mk-esx_vsphere_counters"] = if_translation +check_metrics["check_mk-fritz"] = if_translation +check_metrics["check_mk-hitachi_hnas_fc_if"] = if_translation +check_metrics["check_mk-if64"] = if_translation +check_metrics["check_mk-if64_tplink"] = if_translation +check_metrics["check_mk-if_lancom"] = if_translation +check_metrics["check_mk-if"] = if_translation +check_metrics["check_mk-lnx_if"] = if_translation +check_metrics["check_mk-mcdata_fcport"] = if_translation +check_metrics["check_mk-netapp_api_if"] = if_translation +check_metrics["check_mk-statgrab_net"] = if_translation +check_metrics["check_mk-ucs_bladecenter_if"] = if_translation +check_metrics["check_mk-vms_if"] = if_translation +check_metrics["check_mk-winperf_if"] = if_translation + + check_metrics["check_mk-diskstat"] = {} check_metrics["check_mk-apc_symmetra_ext_temp"] = {} @@ -839,6 +939,8 @@ check_metrics["check_mk-db2_tablespaces"] = {} check_metrics["check_mk-siemens_plc.temp"] = {} check_metrics["check_mk-siemens_plc.hours"] = {} +check_metrics["check_mk-cups_queues"] = { "jobs" : { "name" : "printer_queue" } } + #. # .--Perf-O-Meters-------------------------------------------------------. # | ____ __ ___ __ __ _ | @@ -995,6 +1097,13 @@ perfometer_info.append(("dual", [ ( "logarithmic", ( "disk_write_throughput", 5000000, 10)), ])) +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "printer_queue", + "half_value" : 10, + "exponent" : 2, +}) + #. # .--Graphs--------------------------------------------------------------. # | ____ _ | @@ -1212,6 +1321,10 @@ graph_info.append({ "legend_scale" : MB, }) +# TODO: Warum ist hier überall line? Default ist Area. +# Kann man die hit ratios nicht schön stacken? Ist +# nicht total die Summe der anderen? + graph_info.append({ "title" : _("Bufferpool Hitratios"), "metrics" : [ @@ -1222,6 +1335,8 @@ graph_info.append({ ], }) +# TODO: Warum sind die in einem Graphen? Kann man +# die irgendwie addieren? graph_info.append({ "metrics" : [ ( "deadlocks", "line" ), @@ -1231,14 +1346,67 @@ graph_info.append({ graph_info.append({ "metrics" : [ - ( "sort_overflow", "line" ), + ( "sort_overflow", "area" ), + ], +}) + +# TODO: Warum auch hier line? Sollte mit +# areas arbeiten. Habe das mal umgestellt, aber noch +# nicht getestet. +graph_info.append({ + "metrics" : [ + ( "tablespace_used", "area" ), + ( "tablespace_size", "area" ), ], }) graph_info.append({ "metrics" : [ - ( "tablespace_size", "line" ), - ( "tablespace_used", "line" ), + ( "printer_queue", "area" ) ], + "range" : (0, 10), }) +# Networking + +graph_info.append({ + "title" : _("Bandwidth"), + "metrics" : [ + ( "if_in_octets,8,*@bits/s", "area", _("Input bandwidth") ), + ( "if_out_octets,8,*@bits/s", "-area", _("Output bandwidth") ), + ], +}) + +# TODO: show this graph instead of Bandwidth if this is configured +# in the check's parameters. But is this really a good solution? +# We could use a condition on if_in_octets:min. But if this value +# is missing then evaluating the condition will fail. Solution +# could be using 0 for bits and 1 for octets and making sure that +# this value is not used anywhere. +# graph_info.append({ +# "title" : _("Octets"), +# "metrics" : [ +# ( "if_in_octets", "area" ), +# ( "if_out_octets", "-area" ), +# ], +# }) + +graph_info.append({ + "title" : _("Packets"), + "metrics" : [ + ( "if_in_unicast", "area" ), + ( "if_in_non_unicast", "stack" ), + ( "if_out_unicast", "-area" ), + ( "if_out_non_unicast", "-stack" ), + ], +}) + +graph_info.append({ + "title" : _("Errors"), + "metrics" : [ + ( "if_in_errors", "area" ), + ( "if_in_discards", "stack" ), + ( "if_out_errors", "-area" ), + ( "if_out_discards", "-stack" ), + ], +})

9 years, 6 months

Check_MK Git: check_mk: #2141 FIX Fix computation of explicit time ranges with time of day

by Mathias Kettner

Module: check_mk Branch: master Commit: 953090378d6c24b2116d624a8f7da842ab3527bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953090378d6c24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 08:24:51 2015 +0100 #2141 FIX Fix computation of explicit time ranges with time of day When you entered an explicit time range (e.g. in the options for the graph time range) and selected Explicit time... then 24 hours would be added to the end time. This has been fixed. Note: the adding of one day is still being done when selecting Explicit date..., so that if you select the same start and end date the span is exactly 24 hours. --- .werks/2141 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/2141 b/.werks/2141 new file mode 100644 index 0000000..26f7428 --- /dev/null +++ b/.werks/2141 @@ -0,0 +1,15 @@ +Title: Fix computation of explicit time ranges with time of day +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427440971 + +When you entered an explicit time range (e.g. in the options for the +graph time range) and selected Explicit time... then 24 hours +would be added to the end time. This has been fixed. Note: the adding +of one day is still being done when selecting Explicit date..., +so that if you select the same start and end date the span is exactly +24 hours. diff --git a/ChangeLog b/ChangeLog index f1bf387..d612ee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -345,6 +345,7 @@ * 2150 FIX: Reworked internal logging mechanism... * 1953 FIX: Fixed processing of html processing in input fields... * 2157 FIX: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) + * 2141 FIX: Fix computation of explicit time ranges with time of day... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f523626..70e58be 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2205,11 +2205,13 @@ class Timerange(CascadingDropdown): until_time = now title = _("The last ") + Age().value_to_text(rangespec[1]) return (from_time, until_time), title + elif rangespec[0] in [ 'date', 'time' ]: from_time, until_time = rangespec[1] if from_time > until_time: raise MKUserError("avo_rangespec_9_0_year", _("The end date must be after the start date")) - until_time += 86400 # Consider *end* of this day + if rangespec[0] == 'date': + until_time += 86400 # Consider *end* of this day title = AbsoluteDate().value_to_text(from_time) + " ... " + \ AbsoluteDate().value_to_text(until_time) return (from_time, until_time), title

9 years, 6 months

Check_MK Git: check_mk: Small optical update for graph pages

by Mathias Kettner

Module: check_mk Branch: master Commit: 3cbd2e2402dc20445b642e73f13a95c00833c7c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cbd2e2402dc20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 09:12:21 2015 +0100 Small optical update for graph pages --- web/plugins/views/builtin.py | 55 ++++++++++++------------------------------ 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 0d0c818..7fcfae7 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1290,7 +1290,7 @@ multisite_builtin_views.update({ 'servicedescpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('PNP graphs for all Services with a certain description'), + 'description': _('Graphs for all Services with a certain description'), 'group_painters': [('host', 'hostpnp')], 'hard_filters': [], 'hard_filtervars': [('host', ''), @@ -1317,7 +1317,7 @@ multisite_builtin_views.update({ 'sorters': [('svcstate', False), ('site', False), ('site_host', False)], - 'title': _('PNP Graphs of services with description:'), + 'title': _('Graphs of services with description:'), 'topic': _('Other')}, 'servicegroup': {'browser_reload': 30, 'column_headers': 'pergroup', @@ -1547,41 +1547,19 @@ multisite_builtin_views.update({ 'searchpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('Search for services and display PNP graphs'), + 'description': _('Search for services and display their graphs'), 'group_painters': [('sitealias', 'sitehosts'), ('host', 'host'), ('service_description', 'service'), - ('svc_plugin_output', None)], + ], 'hard_filters': ['service_process_performance_data', 'has_performance_data', 'summary_host'], - 'hard_filtervars': [('is_service_in_notification_period', - '-1'), - ('is_service_process_performance_data', - '1'), - ('optservicegroup', ''), - ('is_service_notifications_enabled', - '-1'), - ('is_host_in_notification_period', '-1'), - ('is_has_performance_data', '1'), - ('is_service_scheduled_downtime_depth', - '-1'), - ('is_service_acknowledged', '-1'), - ('host', ''), - ('is_service_active_checks_enabled', - '-1'), - ('is_summary_host', '0'), - ('service', ''), - ('check_command', ''), - ('st0', 'on'), - ('st1', 'on'), - ('st2', 'on'), - ('st3', 'on'), - ('stp', ''), - ('opthostgroup', ''), - ('is_in_downtime', '-1'), - ('service_output', ''), - ('is_service_is_flapping', '-1')], + 'hard_filtervars': [ + ('is_service_process_performance_data', '1'), + ('is_has_performance_data', '1'), + ('is_summary_host', '0'), + ], 'hidden': False, 'hide_filters': [], 'icon' : 'pnp', @@ -1610,17 +1588,16 @@ multisite_builtin_views.update({ 'service_is_flapping'], 'sorters': [('site', False), ('site_host', False), - ('svcdescr', False)], + ('svcdescr', False) + ], 'title': _('Search Graphs'), 'topic': _('Addons')}, 'hostpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('All PNP performance graphs for a certain host.'), - 'group_painters': [('sitealias', 'sitehosts'), - ('host', 'host'), - ('service_description', 'service'), - ('svc_plugin_output', None)], + 'description': _('All graphs for a certain host.'), + 'group_painters': [ ('service_description', 'service'), + ], 'hard_filters': ['service_process_performance_data', 'has_performance_data', 'svcstate'], @@ -1650,8 +1627,8 @@ multisite_builtin_views.update({ ('site_host', False), ('svcdescr', False)], 'linktitle': _('Graphs'), - 'title': _('PNP graphs for host'), - 'topic': _('PNP4Nagios')}, + 'title': _('Graphs for host'), + }, 'recentsvc': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'services',

9 years, 6 months

Check_MK Git: check_mk: Smaller graph updates

by Mathias Kettner

Module: check_mk Branch: master Commit: 0bac1a3243a5b8160754f16cd4a9c51a960df5f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bac1a3243a5b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 08:59:59 2015 +0100 Smaller graph updates --- web/plugins/metrics/check_mk.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 75a513d..df9897a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -520,7 +520,7 @@ metric_info["temp"] = { metric_info["threads"] = { "title" : _("Number of threads"), "unit" : "count", - "color" : "#aa44ff", + "color" : "#9a77ee", } metric_info["user"] = { @@ -1775,18 +1775,18 @@ graph_info.append({ graph_info.append({ "title" : _("RAM + Swap overview"), "metrics" : [ - ("mem_total", "area"), + ("mem_total", "area"), ("swap_total", "stack"), - ("mem_used", "area"), - ("swap_used", "stack"), + ("mem_used", "area"), + ("swap_used", "stack"), ], }) graph_info.append({ "title" : _("Swap"), "metrics" : [ - ("swap_total", "area"), - ("swap_used", "area"), + ("swap_total", "area"), + ("swap_used", "area"), ("swap_cached", "stack"), ], }) @@ -1794,10 +1794,10 @@ graph_info.append({ graph_info.append({ "title" : _("Caches"), "metrics" : [ - ("mem_lnx_cached", "area"), + ("mem_lnx_slab", "stack"), + ("swap_cached", "stack"), ("mem_lnx_buffers", "stack"), - ("swap_cached", "stack"), - ("mem_lnx_slab", "stack"), + ("mem_lnx_cached", "stack"), ], })

9 years, 6 months

Check_MK Git: check_mk: livestatus_status: added Perf-O-Meter and new graph template

by Mathias Kettner

Module: check_mk Branch: master Commit: 33d2593dabd8bb3ed80dfc717b2313bb8a639448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33d2593dabd8bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 08:56:17 2015 +0100 livestatus_status: added Perf-O-Meter and new graph template --- web/plugins/metrics/check_mk.py | 138 +++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 35 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ce606f2..75a513d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -209,7 +209,7 @@ metric_info["database_size"] = { metric_info["mem_total"] = { "title" : _("RAM installed"), - "color": "#f0f0f0", + "color": "#f0f0f0", "unit" : "bytes", } @@ -220,14 +220,14 @@ metric_info["mem_free"] = { } metric_info["mem_used"] = { - "color": "#80ff40", + "color": "#80ff40", "title" : _("RAM used"), "unit" : "bytes", } metric_info["swap_total"] = { "title" : _("Swap installed"), - "color": "#e0e0e0", + "color": "#e0e0e0", "unit" : "bytes", } @@ -239,13 +239,13 @@ metric_info["swap_free"] = { metric_info["swap_used"] = { "title" : _("Swap used"), - "color": "#408f20", + "color": "#408f20", "unit" : "bytes", } metric_info["swap_cached"] = { "title" : _("Swap cached"), - "color": "#5bebc9", + "color": "#5bebc9", "unit" : "bytes", } @@ -258,169 +258,169 @@ metric_info["caches"] = { metric_info["mem_lnx_cached"] = { "title" : _("File contents"), - "color": "#91cceb", + "color": "#91cceb", "unit" : "bytes", } metric_info["mem_lnx_buffers"] = { "title" : _("Filesystem structure"), - "color": "#5bb9eb", + "color": "#5bb9eb", "unit" : "bytes", } metric_info["mem_lnx_slab"] = { "title" : _("Slab (Various smaller caches)"), - "color": "#af91eb", + "color": "#af91eb", "unit" : "bytes", } metric_info["mem_lnx_active_anon"] = { "title" : _("Active (anonymous)"), - "color": "#ff4040", + "color": "#ff4040", "unit" : "bytes", } metric_info["mem_lnx_active_file"] = { "title" : _("Active (files)"), - "color": "#ff8080", + "color": "#ff8080", "unit" : "bytes", } metric_info["mem_lnx_inactive_anon"] = { "title" : _("Inactive (anonymous)"), - "color": "#377cab", + "color": "#377cab", "unit" : "bytes", } metric_info["mem_lnx_inactive_file"] = { "title" : _("Inactive (files)"), - "color": "#4eb0f2", + "color": "#4eb0f2", "unit" : "bytes", } metric_info["mem_lnx_active"] = { "title" : _("Active"), - "color": "#ff4040", + "color": "#ff4040", "unit" : "bytes", } metric_info["mem_lnx_inactive"] = { "title" : _("Inactive"), - "color": "#4040ff", + "color": "#4040ff", "unit" : "bytes", } metric_info["mem_lnx_dirty"] = { "title" : _("Dirty disk blocks"), - "color": "#f2904e", + "color": "#f2904e", "unit" : "bytes", } metric_info["mem_lnx_writeback"] = { "title" : _("Currently being written"), - "color": "#f2df40", + "color": "#f2df40", "unit" : "bytes", } metric_info["mem_lnx_nfs_unstable"] = { "title" : _("Modified NFS data"), - "color": "#c6f24e", + "color": "#c6f24e", "unit" : "bytes", } metric_info["mem_lnx_bounce"] = { "title" : _("Bounce buffers"), - "color": "#4ef26c", + "color": "#4ef26c", "unit" : "bytes", } metric_info["mem_lnx_writeback_tmp"] = { "title" : _("Dirty FUSE data"), - "color": "#4eeaf2", + "color": "#4eeaf2", "unit" : "bytes", } metric_info["mem_lnx_total_total"] = { "title" : _("Total virtual memory"), - "color": "#f0f0f0", + "color": "#f0f0f0", "unit" : "bytes", } metric_info["mem_lnx_committed_as"] = { "title" : _("Committed memory"), - "color": "#40a080", + "color": "#40a080", "unit" : "bytes", } metric_info["mem_lnx_commit_limit"] = { "title" : _("Commit limit"), - "color": "#e0e0e0", + "color": "#e0e0e0", "unit" : "bytes", } metric_info["mem_lnx_shmem"] = { "title" : _("Shared memory"), - "color": "#bf9111", + "color": "#bf9111", "unit" : "bytes", } metric_info["mem_lnx_kernel_stack"] = { "title" : _("Kernel stack"), - "color": "#7192ad", + "color": "#7192ad", "unit" : "bytes", } metric_info["mem_lnx_page_tables"] = { "title" : _("Page tables"), - "color": "#71ad9f", + "color": "#71ad9f", "unit" : "bytes", } metric_info["mem_lnx_mlocked"] = { "title" : _("Locked mmap() data"), - "color": "#a671ad", + "color": "#a671ad", "unit" : "bytes", } metric_info["mem_lnx_huge_pages_total"] = { "title" : _("Total"), - "color": "#f0f0f0", + "color": "#f0f0f0", "unit" : "bytes", } metric_info["mem_lnx_huge_pages_free"] = { "title" : _("Free"), - "color": "#f0a0f0", + "color": "#f0a0f0", "unit" : "bytes", } metric_info["mem_lnx_huge_pages_rsvd"] = { "title" : _("Reserved part of Free"), - "color": "#40f0f0", + "color": "#40f0f0", "unit" : "bytes", } metric_info["mem_lnx_huge_pages_surp"] = { "title" : _("Surplus"), - "color": "#90f0b0", + "color": "#90f0b0", "unit" : "bytes", } metric_info["mem_lnx_vmalloc_total"] = { "title" : _("Total address space"), - "color": "#f0f0f0", + "color": "#f0f0f0", "unit" : "bytes", } metric_info["mem_lnx_vmalloc_used"] = { "title" : _("Allocated space"), - "color": "#aaf76f", + "color": "#aaf76f", "unit" : "bytes", } metric_info["mem_lnx_vmalloc_chunk"] = { "title" : _("Largest free chunk"), - "color": "#c6f7e9", + "color": "#c6f7e9", "unit" : "bytes", } @@ -1007,6 +1007,35 @@ metric_info["tcp_bound"] = { "color" : "#4060a0", } +metric_info["host_check_rate"] = { + "title" : _("Host check rate"), + "unit" : "1/s", + "color" : "#884422", +} + +metric_info["service_check_rate"] = { + "title" : _("Service check rate"), + "unit" : "1/s", + "color" : "#ffbb66", +} + +metric_info["livestatus_connect_rate"] = { + "title" : _("Livestatus connects"), + "unit" : "1/s", + "color" : "#556677", +} + +metric_info["livestatus_request_rate"] = { + "title" : _("Livestatus requests"), + "unit" : "1/s", + "color" : "#bbccdd", +} + +metric_info["log_message_rate"] = { + "title" : _("Log messages"), + "unit" : "1/s", + "color" : "#aa44cc", +} #. # .--Checks--------------------------------------------------------------. @@ -1037,7 +1066,7 @@ check_metrics["check_mk-statgrab_load"] = {} check_metrics["check_mk-hpux_cpu"] = {} check_metrics["check_mk-blade_bx_load"] = {} -check_metrics["check_mk-kernel"] = { +check_metrics["check_mk-kernel"] = { "ctxt" : { "name": "context_switches" }, "pgmajfault" : { "name": "major_page_faults" }, "processes" : { "name": "process_creations" }, @@ -1258,6 +1287,15 @@ check_metrics["check_mk-siemens_plc.hours"] = {} check_metrics["check_mk-cups_queues"] = { "jobs" : { "name" : "printer_queue" } } +check_metrics["check_mk-livestatus_status"] = { + "host_checks" : { "name" : "host_check_rate" }, + "service_checks" : { "name" : "service_check_rate" }, + "connections" : { "name" : "livestatus_connect_rate" }, + "requests" : { "name" : "livestatus_request_rate" }, + "log_messages" : { "name" : "log_message_rate" }, +} + + #. # .--Perf-O-Meters-------------------------------------------------------. # | ____ __ ___ __ __ _ | @@ -1428,6 +1466,12 @@ perfometer_info.append({ "exponent" : 2, }) +perfometer_info.append(("stacked", [ + ( "logarithmic", ( "host_check_rate", 50, 5)), + ( "logarithmic", ( "service_check_rate", 200, 5)), +])) + + #. # .--Graphs--------------------------------------------------------------. # | ____ _ | @@ -1637,7 +1681,7 @@ graph_info.append({ }) # TODO: Warum ist hier überall line? Default ist Area. -# Kann man die hit ratios nicht schön stacken? Ist +# Kann man die hit ratios nicht schön stacken? Ist # nicht total die Summe der anderen? graph_info.append({ @@ -1853,3 +1897,27 @@ graph_info.append({ ], "omit_zero_metrics" : True, }) + +graph_info.append({ + "title" : _("Host and Service Checks"), + "metrics" : [ + ( "host_check_rate", "stack" ), + ( "service_check_rate", "stack" ), + ], +}) + +graph_info.append({ + "title" : _("Livestatus Connects and Requests"), + "metrics" : [ + ( "livestatus_request_rate", "area" ), + ( "livestatus_connect_rate", "area" ), + ], +}) + +graph_info.append({ + "title" : _("Livestatus Requests per Connection"), + "metrics" : [ + ( "livestatus_request_rate,livestatus_connect_rate,/#88aa33", "area", + _("Averate requests per connection")), + ], +})

9 years, 6 months

← Newer
1
2
3
4
5
6
7
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015