Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: e94191bc99ce2b691436933485b1652736ee501c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94191bc99ce2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 16 18:46:12 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: FIX: EC: make hostname matching field optional.

by Mathias Kettner

Module: check_mk Branch: master Commit: beae4280174be1717cc9aac6dc88c886cd2309a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beae4280174be1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 15 11:41:41 2013 +0100 FIX: EC: make hostname matching field optional. Conflicts: ChangeLog --- ChangeLog | 3 +++ mkeventd/web/plugins/wato/mkeventd.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbcab31..4eb3415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,9 @@ * FIX: speedup for single host tables joined by hostname (BI-Boxes) * FIX: avoid closing BI subtree while tree is being loaded + Event Console: + * FIX: make hostname matching field optional. Otherwise a .* was + neccessary for the rule in order to match 1.2.2b4: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2776738..cd7fb7c 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -610,7 +610,8 @@ vs_mkeventd_rule = Dictionary( ), ], optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "set_text", "set_host", "set_application", "set_comment", + "match_facility", "match_sl", "match_host", "match_application", + "set_text", "set_host", "set_application", "set_comment", "set_contact", "cancel_priority", "match_ok" ], headers = [ ( _("General Properties"), [ "id", "description", "disabled" ] ),

11 years, 6 months

Check_MK Git: check_mk: notify.py: unique spoolfiles name no longer created with uuid

by Andreas Boesl

Module: check_mk Branch: master Commit: 2a2f9ebbb85b3788d118dac94c7f967eb1045382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a2f9ebbb85b37… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 15 11:14:58 2013 +0100 notify.py: unique spoolfiles name no longer created with uuid --- ChangeLog | 3 +++ modules/notify.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04de6e9..fbcab31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,9 @@ * mem.include: Linux memory check now includes size of page tables. This can be important e.g. on ORACLE systems with a lot of memory + Notifications: + * notify.py: unique spoolfiles name no longer created with uuid + Livestatus: * Table statehist: Improved detection of vanished hosts and services. Now able to detect and remove nonsense check plugin output diff --git a/modules/notify.py b/modules/notify.py index 28c100c..8dc5b80 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -34,7 +34,7 @@ # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s -import pprint, uuid +import pprint # Default settings notification_logdir = var_dir + "/notify" @@ -201,7 +201,7 @@ def create_spoolfile(data): target_dir = "%s/%s" % (notification_spooldir, contactname) if not os.path.exists(target_dir): os.makedirs(target_dir) - file_path = "%s/%0.2f_%s" % (target_dir, time.time(), uuid.uuid1()) + file_path = "%s/%0.8f" % (target_dir, time.time()) notify_log("Creating spoolfile: %s" % file_path) file(file_path,"w").write(pprint.pformat(data))

11 years, 6 months

Check_MK Git: check_mk: mem.include: Linux memory check now includes size of page tables.

by Mathias Kettner

Module: check_mk Branch: master Commit: 06097a430383ffa10039194d0e1da91c6ff53e52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06097a430383ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 11:34:54 2013 +0100 mem.include: Linux memory check now includes size of page tables. --- ChangeLog | 2 + checks/mem.include | 37 +++++++----- pnp-templates/check_mk-mem.used.php | 110 +++++++++++++++++++++------------- 3 files changed, 92 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index 163230d..bb510cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device * Linux agent: allow cached local/plugins checks (see docu) + * mem.include: Linux memory check now includes size of page tables. This + can be important e.g. on ORACLE systems with a lot of memory Livestatus: * Table statehist: Improved detection of vanished hosts and services. diff --git a/checks/mem.include b/checks/mem.include index f260a0a..ca361b7 100644 --- a/checks/mem.include +++ b/checks/mem.include @@ -28,13 +28,15 @@ memused_default_levels = (150.0, 200.0) mem_extended_perfdata = False def check_memory(params, meminfo): - try: - swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] - memused = meminfo['MemTotal'] - meminfo['MemFree'] - # Buffers and Cached are optional (not supported on Windows yet) - caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) - except: - return (3, "invalid output from plugin") + swapused = meminfo['SwapTotal'] - meminfo['SwapFree'] + memused = meminfo['MemTotal'] - meminfo['MemFree'] + # Buffers and Cached are optional (not supported on Windows yet) + caches = meminfo.get('Buffers', 0) + meminfo.get('Cached', 0) + # Size of Pagetable on Linux can be relevant e.g. on ORACLE + # servers with much memory, that do not use HugeTables. We account + # that for used + pagetables = meminfo.get('PageTables', 0) + pagetables_mb = pagetables / 1024.0 # Add extended memory performance data, if this is # enabled and the agent provides that information. @@ -50,18 +52,19 @@ def check_memory(params, meminfo): else: committed_as = 0 extended_perf = [ - ('mapped', str(mapped_mb) + 'MB', '', '', 0, ''), - ('committed_as', str(committed_as_mb) + 'MB', '', '', 0, ''), + ('mapped', str(mapped_mb) + 'MB'), + ('committed_as', str(committed_as_mb) + 'MB'), + ('pagetables', str(pagetables_mb) + 'MB'), ] extrainfo = ", %.1f GB mapped, %.1f GB committed" % \ (mapped_mb / 1024.0, committed_as_mb / 1024.0) - totalused_kb = (swapused + memused - caches) - totalused_mb = totalused_kb / 1024 + totalused_kb = (swapused + memused - caches + pagetables) + totalused_mb = totalused_kb / 1024.0 totalmem_kb = meminfo['MemTotal'] - totalmem_mb = totalmem_kb / 1024 + totalmem_mb = totalmem_kb / 1024.0 totalused_perc = 100 * (float(totalused_kb) / float(totalmem_kb)) - totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024 + totalvirt_mb = (meminfo['SwapTotal'] + meminfo['MemTotal']) / 1024.0 warn, crit = params perfdata = [ @@ -70,9 +73,13 @@ def check_memory(params, meminfo): # levels may be given either in int -> MB or in float -> percentages - infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + if pagetables > 0: + pgtext = " + %.2f GB Pagetables" % (pagetables_mb / 1024.0) + else: + pgtext = "" + infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP%s, this is %.1f%% of %.2f GB RAM)" % \ (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, - totalused_perc, totalmem_mb / 1024.0)) \ + pgtext, totalused_perc, totalmem_mb / 1024.0)) \ + extrainfo if type(warn) == float: diff --git a/pnp-templates/check_mk-mem.used.php b/pnp-templates/check_mk-mem.used.php index 4a28ba5..5432603 100644 --- a/pnp-templates/check_mk-mem.used.php +++ b/pnp-templates/check_mk-mem.used.php @@ -27,52 +27,78 @@ $opt[1] = "--vertical-label 'MEMORY(MB)' -X0 --upper-limit " . ($MAX[1] * 120 / $maxgb = sprintf("%.1f", $MAX[1] / 1024.0); -$def[1] = "DEF:ram=$RRDFILE[1]:$DS[1]:MAX " ; -$def[1] .= "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " ; -$def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " ; -$def[1] .= "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" "; -$def[1] .= "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" "; -$def[1] .= "HRULE:$WARN[3]#FFFF00:\"Warning\" "; -$def[1] .= "HRULE:$CRIT[3]#FF0000:\"Critical\" "; +# For the rest of the data we rather work with names instead +# of numbers +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} -$def[1] .= "'COMMENT:\\n' "; -$def[1] .= "AREA:ram#80ff40:\"RAM used \" " ; -$def[1] .= "GPRINT:ram:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:ram:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:ram:MAX:\"%6.0lf MB max\\n\" "; +$def[1] = "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " + . "DEF:ramx=$RRD[ramused] " + . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " + . "CDEF:ram=virt,swap,- " + ; -$def[1] .= "AREA:swap#008030:\"SWAP used \":STACK " ; -$def[1] .= "GPRINT:swap:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:swap:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:swap:MAX:\"%6.0lf MB max\\n\" " ; -$def[1] .= "LINE:virt#000000:\"RAM+SWAP used\" " ; -$def[1] .= "GPRINT:virt:LAST:\"%6.0lf MB last\" " ; -$def[1] .= "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " ; -$def[1] .= "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " ; +$def[1] .= "" + . "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" " + . "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" " + . "HRULE:$WARN[3]#FFFF00:\"Warning\" " + . "HRULE:$CRIT[3]#FF0000:\"Critical\" " + + . "'COMMENT:\\n' " + . "AREA:ram#80ff40:\"RAM used \" " + . "GPRINT:ram:LAST:\"%6.0lf MB last\" " + . "GPRINT:ram:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:ram:MAX:\"%6.0lf MB max\\n\" " + + . "AREA:swap#008030:\"SWAP used \":STACK " + . "GPRINT:swap:LAST:\"%6.0lf MB last\" " + . "GPRINT:swap:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:swap:MAX:\"%6.0lf MB max\\n\" " + ; + -/* HACK: Avoid error if RRD does not contain two data - sources which .XML file *does*. F..ck. This does not - work with multiple RRDs... */ -$retval = -1; -system("rrdtool info $RRDFILE[1] | fgrep -q 'ds[5]'", $retval); -if ($retval == 0) -{ - if (count($NAME) >= 4 and $NAME[4] == "mapped") { - $def[1] .= "DEF:mapped=$RRDFILE[4]:$DS[4]:MAX " ; - $def[1] .= "LINE2:mapped#8822ff:\"Memory mapped\" " ; - $def[1] .= "GPRINT:mapped:LAST:\"%6.0lf MB last\" " ; - $def[1] .= "GPRINT:mapped:AVERAGE:\"%6.0lf MB avg\" " ; - $def[1] .= "GPRINT:mapped:MAX:\"%6.0lf MB max\\n\" " ; - } +if (isset($RRD['pagetables'])) { + $def[1] .= "DEF:pagetables=$RRD[pagetables] " + . "AREA:pagetables#ff8800:\"Page tables \":STACK " + . "GPRINT:pagetables:LAST:\"%6.0lf MB last\" " + . "GPRINT:pagetables:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:pagetables:MAX:\"%6.0lf MB max\\n\" " + . "LINE:virt#000000:\"RAM+SWAP+PT used\" " + . "GPRINT:virt:LAST:\"%6.0lf MB last\" " + . "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " + ; +} - if (count($NAME) >= 5 and $NAME[5] == "committed_as") { - $def[1] .= "DEF:committed=$RRDFILE[5]:$DS[5]:MAX " ; - $def[1] .= "LINE2:committed#cc00dd:\"Committed \" " ; - $def[1] .= "GPRINT:committed:LAST:\"%6.0lf MB last\" " ; - $def[1] .= "GPRINT:committed:AVERAGE:\"%6.0lf MB avg\" " ; - $def[1] .= "GPRINT:committed:MAX:\"%6.0lf MB max\\n\" " ; - } - } +else { + $def[1] .= "LINE:virt#000000:\"RAM+SWAP used \" " + . "GPRINT:virt:LAST:\"%6.0lf MB last\" " + . "GPRINT:virt:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:virt:MAX:\"%6.0lf MB max\\n\" " + ; +} + +if (isset($RRD['mapped'])) { + $def[1] .= "DEF:mapped=$RRD[mapped] " + . "LINE2:mapped#8822ff:\"Memory mapped \" " + . "GPRINT:mapped:LAST:\"%6.0lf MB last\" " + . "GPRINT:mapped:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:mapped:MAX:\"%6.0lf MB max\\n\" " ; +} + +if (isset($RRD['committed_as'])) { + $def[1] .= "DEF:committed=$RRD[committed_as] " + . "LINE2:committed#cc00dd:\"Committed \" " + . "GPRINT:committed:LAST:\"%6.0lf MB last\" " + . "GPRINT:committed:AVERAGE:\"%6.0lf MB avg\" " + . "GPRINT:committed:MAX:\"%6.0lf MB max\\n\" " ; +} ?>

11 years, 6 months

Check_MK Git: check_mk: Fix PNP template for memory usage

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c9c2f6953f9d592429c38072b9834cfec1cd959 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c9c2f6953f9d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 13:01:25 2013 +0100 Fix PNP template for memory usage --- pnp-templates/check_mk-mem.used.php | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pnp-templates/check_mk-mem.used.php b/pnp-templates/check_mk-mem.used.php index 5432603..d0c6ca0 100644 --- a/pnp-templates/check_mk-mem.used.php +++ b/pnp-templates/check_mk-mem.used.php @@ -38,14 +38,20 @@ foreach ($NAME as $i => $n) { $MAX[$n] = $MAX[$i]; } -$def[1] = "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " - . "DEF:ramx=$RRD[ramused] " - . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " - . "CDEF:ram=virt,swap,- " - ; +$def[1] = ""; +if (isset($RRD['pagetables'])) { + $def[1] .= "DEF:pagetables=$RRD[pagetables] " + . "DEF:ram=$RRD[ramused] "; +} +else { + $def[1] .= "CDEF:pagetables=0 " + . "DEF:ram=$RRD[ramused] "; +} + +$def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:MAX " + . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX " -$def[1] .= "" . "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" " . "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" " . "HRULE:$WARN[3]#FFFF00:\"Warning\" " @@ -65,7 +71,7 @@ $def[1] .= "" if (isset($RRD['pagetables'])) { - $def[1] .= "DEF:pagetables=$RRD[pagetables] " + $def[1] .= "" . "AREA:pagetables#ff8800:\"Page tables \":STACK " . "GPRINT:pagetables:LAST:\"%6.0lf MB last\" " . "GPRINT:pagetables:AVERAGE:\"%6.0lf MB avg\" "

11 years, 6 months

Check_MK Git: check_mk: Update Manpage of mem check

by Mathias Kettner

Module: check_mk Branch: master Commit: c8cbe8456c6764ed9d149192d583a8ad37d0267d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8cbe8456c6764… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 13:03:57 2013 +0100 Update Manpage of mem check --- checkman/mem.used | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checkman/mem.used b/checkman/mem.used index d77810e..0421ef9 100644 --- a/checkman/mem.used +++ b/checkman/mem.used @@ -92,5 +92,6 @@ mem_extended_perfdata (boolean): If this variable is set to {True}, then the checks outputs additional performance data, if the agent provides that information. On Linux the amount of mapped and committed memory is output - (see {Mapped} and {Committed_AS} in {/proc/meminfo}). + (see {Mapped} and {Committed_AS} in {/proc/meminfo}) and + also the size used for page tables {Pagetables}.

11 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 25bddd7bece75d2acf3fc53ca5f4ff269c363d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25bddd7bece75d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 17:33:32 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: FIX: speedup for single host tables joined by hostname

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e1c25443e26021de1580a0e436ed8e9cdb24ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e1c25443e2602… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 14:49:03 2013 +0100 FIX: speedup for single host tables joined by hostname Conflicts: ChangeLog --- ChangeLog | 5 +++++ web/htdocs/bi.py | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb510cd..b383c3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,11 @@ * Quicksearch: allow searching for complete IP addresses and IP address prefixes + BI: + * FIX: fix exception with expansion level being 'None' + * FIX: speedup for single host tables joined by hostname (BI-Boxes) + + 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 74fc22d..a1c9ae2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1421,7 +1421,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, omit = omit_root and len(path) == 1 if not omit: h += '<span id="%d:%s" %s class="bibox_box %s %s state state%s%s">' % ( - expansion_level, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) + expansion_level or 0, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) if is_leaf: h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") else: @@ -1705,7 +1705,10 @@ def host_table(columns, add_headers, only_sites, limit, filters): return singlehost_table(columns, add_headers, only_sites, limit, filters, False) def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbyname): + log("--------------------------------------------------------------------\n") + log("* Starting to compute singlehost_table (joinbyname = %s)\n" % joinbyname) load_assumptions() # user specific, always loaded + log("* Assumptions are loaded.\n") # Create livestatus filter for filtering out hosts. We can # simply use all those filters since we have a 1:n mapping between @@ -1716,8 +1719,10 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam if not header.startswith("Sites:"): filter_code += header + log("* Getting status information about hosts...\n") host_columns = filter(lambda c: c.startswith("host_"), columns) hostrows = get_status_info_filtered(filter_code, only_sites, limit, host_columns, config.bi_precompile_on_demand) + log("* Got %d host rows\n" % len(hostrows)) # if limit: # views.check_limit(hostrows, limit) @@ -1733,9 +1738,11 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam only_groups = [ filt.selected_group() ] if config.bi_precompile_on_demand: + log("* Compiling forest on demand...\n") compile_forest(config.user_id, only_groups = only_groups, only_hosts = [ (h['site'], h['name']) for h in hostrows ]) else: + log("* Compiling forest...\n") compile_forest(config.user_id) # rows by site/host - needed for later cluster state gathering @@ -1744,12 +1751,44 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam rows = [] # Now compute aggregations of these hosts + log("* Assembling host rows...\n") + + # Special optimization for joinbyname + if joinbyname: + rows_by_host = {} + for hostrow in hostrows: + site = hostrow["site"] + host = hostrow["name"] + rows_by_host[(site, host)] = hostrow + for hostrow in hostrows: site = hostrow["site"] host = hostrow["name"] + # In case of joinbyname we deal with aggregations that bare the + # name of one host, but might contain states of multiple hosts. + # status_info cannot be filled from one row in that case. We + # try to optimize by assuming that all data that we need is being + # displayed in the same view and the information thus being present + # in some of the other hostrows. if joinbyname: + status_info = {} aggrs = g_user_cache["aggregations_by_hostname"].get(host, []) - status_info = None + # collect all the required host of all matching aggregations + for a in aggrs: + reqhosts = a[1]["reqhosts"] + for sitehost in reqhosts: + if sitehost not in rows_by_host: + # This one is missing. Darn. Cancel it. + status_info = None + break + else: + row = rows_by_host[sitehost] + status_info[sitehost] = [ + row["state"], + row["plugin_output"], + row["services_with_info"] ] + if status_info == None: + break else: aggrs = g_user_cache["host_aggregations"].get((site, host), []) status_info = { (site, host) : [ @@ -1781,6 +1820,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam return rows + log("* Assembled %d rows.\n" % len(rows)) return rows

11 years, 6 months

Check_MK Git: check_mk: FIX: avoid closing BI subtree while tree is being loaded

by Mathias Kettner

Module: check_mk Branch: master Commit: f04c78af0f0605353678689c1527ef6885ba6ea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04c78af0f0605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 14 15:55:50 2013 +0100 FIX: avoid closing BI subtree while tree is being loaded --- ChangeLog | 1 + web/htdocs/bi.py | 4 +++- web/htdocs/js/bi.js | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b383c3b..4fa25d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ BI: * FIX: fix exception with expansion level being 'None' * FIX: speedup for single host tables joined by hostname (BI-Boxes) + * FIX: avoid closing BI subtree while tree is being loaded 1.2.2b4: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index a1c9ae2..d8a0809 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1343,6 +1343,7 @@ def ajax_save_treestate(): def ajax_render_tree(): aggr_group = html.var("group") + reqhosts = [ tuple(sitehost.split('#')) for sitehost in html.var("reqhosts").split(',') ] aggr_title = html.var("title") omit_root = not not html.var("omit_root") boxes = not not html.var("boxes") @@ -1350,7 +1351,7 @@ def ajax_render_tree(): # Make sure that BI aggregates are available if config.bi_precompile_on_demand: - compile_forest(config.user_id, only_groups = [ aggr_group ]) + compile_forest(config.user_id, only_hosts = reqhosts, only_groups = [ aggr_group ]) else: compile_forest(config.user_id) @@ -1480,6 +1481,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, ( "omit_root", omit_root and "yes" or ""), ( "boxes", boxes and "yes" or ""), ( "only_problems", only_problems and "yes" or ""), + ( "reqhosts", ",".join('%s#%s' % sitehost for sitehost in affected_hosts) ), ]) htmlcode = '<div id="%s" class=bi_tree_container>' % htmllib.attrencode(url_id) + \ diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 5427f69..00f3a16 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -53,6 +53,10 @@ function bi_toggle_subtree(oImg, lazy) function bi_update_tree(oImg, code) { + // Deactivate clicking - the update can last a couple + // of seconds. In that time we must inhibit further clicking. + oImg.onclick = null; + // First find enclosding <div class=bi_tree_container> var oDiv = oImg; while (oDiv.className != "bi_tree_container") { @@ -73,6 +77,8 @@ function bi_toggle_box(oDiv, lazy) var do_open; if (oDiv.className.indexOf("open") >= 0) { + if (lazy) + return; // do not close in lazy mode oDiv.className = oDiv.className.replace(/open/, "closed"); url += "&state=closed"; do_open = false;

11 years, 6 months

Check_MK Git: check_mk: jolokia_metrics: fixed compatibility with python 2. 4

by Andreas Boesl

Module: check_mk Branch: master Commit: f2f45ff2587ee59cc3bfddeefa45026473b9712a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2f45ff2587ee5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 15:39:39 2013 +0100 jolokia_metrics: fixed compatibility with python 2.4 --- checks/jolokia_metrics | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 8a15000..ce2cd0e 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -206,8 +206,8 @@ def check_jolokia_metrics_mem(item, params, info): if params.get(what): if type(params[what][0]) == int: if what != "total": - warn_level = value_max - params[what][0] if value_max != "" else "" - crit_level = value_max - params[what][1] if value_max != "" else "" + warn_level = ("", value_max - params[what][0])[value_max != ""] + crit_level = ("", value_max - params[what][1])[value_max != ""] perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 @@ -219,8 +219,8 @@ def check_jolokia_metrics_mem(item, params, info): level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) else: if what != "total": - warn_level = value_max * params[what][0] / 100.0 if value_max != "" else "" - crit_level = value_max * params[what][1] / 100.0 if value_max != "" else "" + warn_level = ("", value_max * params[what][0] / 100.0)[value_max != ""] + crit_level = ("", value_max * params[what][1] / 100.0)[value_max != ""] perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 @@ -235,7 +235,7 @@ def check_jolokia_metrics_mem(item, params, info): perfdata.append((what, value, "", "", "", value_max)) - used_info = "/%.1f%% used" % (value / value_max * 100) if value_max != "" else "" + used_info = ("", "/%.1f%% used" % (value / value_max * 100))[value_max != ""] info_list.append("%s: %0.fMB%s%s" % (what.title(), value, used_info, level_info)) worst_state = max(param_state, worst_state)

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits