Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: 2nd step to make service to host view join work in the view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7d34b52ccf874bb82283fbd97c9efc7c13ca865 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d34b52ccf874… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 13:05:14 2011 +0200 2nd step to make service to host view join work in the view editor --- web/htdocs/js/check_mk.js | 14 ++++++-- web/htdocs/views.py | 72 +++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 1b7826a..dcce65c 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -421,13 +421,19 @@ function move_column_down(oImg) { } function toggle_join_fields(prefix, n, obj) { + var r1 = document.getElementById(prefix + 'join_index_row' + n); + var r2 = document.getElementById(prefix + 'title_row' + n) if(obj.options[obj.selectedIndex].text.substr(0, 8) == 'SERVICE:') { - document.getElementById(prefix + 'join_index_row' + n).style.display = ''; - document.getElementById(prefix + 'title_row' + n).style.display = ''; + r1.style.display = ''; + r2.style.display = ''; } else { - document.getElementById(prefix + 'join_index_row' + n).style.display = 'none'; - document.getElementById(prefix + 'title_row' + n).style.display = 'none'; + r1.style.display = 'none'; + r2.style.display = 'none'; + r1.childNodes[1].firstChild.value = ''; + r2.childNodes[1].firstChild.value = ''; } + r1 = null; + r2 = null; } // ---------------------------------------------------------------------------- diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c8d2264..31a6ad7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -618,8 +618,8 @@ function toggle_section(nr, oImg) { allowed = allowed_for_datasource(data, datasourcename) joined = [] - if var_prefix == 'col_' and ds_joined(datasourcename): - joined = allowed_for_datasource(data, multisite_datasources[datasourcename]['join'][0]) + if var_prefix == 'col_': + joined = allowed_for_joined_datasource(data, datasourcename) section_header(id, title) # make sure, at least 3 selection boxes are free for new columns @@ -681,15 +681,10 @@ function toggle_section(nr, oImg) { html.footer() def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): - def sort_list(l): - # Sort the lists but don't mix them up - swapped = [ (disp, key) for key, disp in l ] - swapped.sort() - return [ (key, disp) for disp, key in swapped ] - collist = sort_list([ ("", "") ] + [ (name, p["title"]) for name, p in allowed.items() ]) + collist = [ ("", "") ] + collist_of_collection(allowed) if joined: - collist += [ ("-", "---") ] + sort_list([ (name, 'SERVICE: ' + p["title"]) for name, p in joined.items() if (name, p["title"]) not in collist]) + collist += [ ("-", "---") ] + collist_of_collection(joined, collist) html.write("<div class=columneditor id=%seditor_%d><table><tr>" % (var_prefix, n)) html.write('<td class="cebuttons" rowspan=5>') @@ -712,11 +707,7 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): html.write('</td>') html.write('<td id="%slabel_%d" class=celeft>Column %d:</td><td>' % (var_prefix, n, n)) html.select("%s%d" % (var_prefix, n), collist, "", "toggle_join_fields('%s', %d, this)" % (var_prefix, n)) - display = 'none' - if joined: - selected_label = [ label for name, label in collist if name == html.var("%s%d" % (var_prefix, n), '') ][0] - if selected_label[:8] == 'SERVICE:': - display = '' + display = joined and not is_joined_value(collist, "%s%d" % (var_prefix, n)) and 'none' or '' html.write("</td></tr><tr id='%sjoin_index_row%d' style='display:%s'><td class=celeft>of Service:</td><td>" % (var_prefix, n, display)) html.text_input("%sjoin_index_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>Link:</td><td>") @@ -742,13 +733,13 @@ def ajax_get_edit_column(h): allowed = allowed_for_datasource(multisite_painters, html.var('ds')) joined = [] - if html.var('pre') == 'col_' and ds_joined(html.var('ds')): - joined = allowed_for_datasource(multisite_painters, multisite_datasources[html.var('ds')]['join'][0]) + if html.var('pre') == 'col_': + joined = allowed_for_joined_datasource(multisite_painters, html.var('ds')) num = int(html.var('num', 0)) html.form_vars = [] - view_edit_column(num, html.var('pre'), num + 1, allowed) + view_edit_column(num, html.var('pre'), num + 1, allowed, joined) # Called by edit function in order to prefill HTML form def load_view_into_html_vars(view): @@ -813,7 +804,7 @@ def load_view_into_html_vars(view): viewname = entry[1] tooltip = len(entry) > 2 and entry[2] or None join_index = len(entry) > 3 and entry[3] or None - title = len(entry) > 4 and entry[4] or None + col_title = len(entry) > 4 and entry[4] or None html.set_var("col_%d" % n, name) if viewname: html.set_var("col_link_%d" % n, viewname) @@ -821,8 +812,8 @@ def load_view_into_html_vars(view): html.set_var("col_tooltip_%d" % n, tooltip) if join_index: html.set_var("col_join_index_%d" % n, join_index) - if title: - html.set_var("col_title_%d" % n, title) + if col_title: + html.set_var("col_title_%d" % n, col_title) n += 1 # Make sure, checkboxes with default "on" do no set "on". Otherwise they @@ -920,11 +911,22 @@ def create_view(): viewname = html.var("col_link_%d" % n) tooltip = html.var("col_tooltip_%d" % n) join_index = html.var('col_join_index_%d' % n) - title = html.var('col_title_%d' % n) + col_title = html.var('col_title_%d' % n) if pname: if viewname not in html.available_views: viewname = None - painternames.append((pname, viewname, tooltip, join_index, title)) + + allowed_cols = collist_of_collection(allowed_for_datasource(multisite_painters, datasourcename)) + joined_cols = collist_of_collection(allowed_for_joined_datasource(multisite_painters, datasourcename), allowed_cols) + if is_joined_value(joined_cols, "col_%d" % n) and not join_index: + raise MKUserError('col_join_index_%d' % n, "Please specify the service to show the data for") + + if join_index != '' and col_title != '': + painternames.append((pname, viewname, tooltip, join_index, col_title)) + elif join_index != '': + painternames.append((pname, viewname, tooltip, join_index)) + else: + painternames.append((pname, viewname, tooltip)) return { "name" : name, @@ -1600,14 +1602,26 @@ def allowed_for_datasource(collection, datasourcename): allowed[name] = item return allowed -#def joined_datasource(c -# joined = multisite_datasources[datasource['join'][0]] -# infos_available.update(set(joined['infos'])) -# add_columns += joined.get("add_columns", []) -# html.write(repr(set(collection))) +def allowed_for_joined_datasource(collection, datasourcename): + if 'join' not in multisite_datasources[datasourcename]: + return [] + return allowed_for_datasource(collection, multisite_datasources[datasourcename]['join'][0]) -def ds_joined(datasourcename): - return 'join' in multisite_datasources[datasourcename] +def is_joined_value(collection, varname): + selected_label = [ label for name, label in collection if name == html.var(varname, '') ] + return selected_label and selected_label[0][:8] == 'SERVICE:' + +def collist_of_collection(collection, join_target = []): + def sort_list(l): + # Sort the lists but don't mix them up + swapped = [ (disp, key) for key, disp in l ] + swapped.sort() + return [ (key, disp) for disp, key in swapped ] + + if not join_target: + return sort_list([ (name, p["title"]) for name, p in collection.items() ]) + else: + return sort_list([ (name, 'SERVICE: ' + p["title"]) for name, p in collection.items() if (name, p["title"]) not in join_target ]) # ----------------------------------------------------------------------------- # _ _ _

13 years, 2 months

Check_MK Git: check_mk: Catching minus value in column selection

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ce302ed725faf3915b2bc6031ed8ff281151febf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce302ed725faf3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 13:13:05 2011 +0200 Catching minus value in column selection --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 31a6ad7..9446541 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -912,7 +912,7 @@ def create_view(): tooltip = html.var("col_tooltip_%d" % n) join_index = html.var('col_join_index_%d' % n) col_title = html.var('col_title_%d' % n) - if pname: + if pname and pname != '-': if viewname not in html.available_views: viewname = None

13 years, 2 months

Check_MK Git: check_mk: Cleaned up internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c49cb1208372cc5a22cdb1c384c05c4e5dd75bda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c49cb1208372cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 10:06:24 2011 +0200 Cleaned up internal doku --- LIESMICH.servicepainter | 73 ----------------------------------------------- 1 files changed, 0 insertions(+), 73 deletions(-) diff --git a/LIESMICH.servicepainter b/LIESMICH.servicepainter deleted file mode 100644 index 4995d46..0000000 --- a/LIESMICH.servicepainter +++ /dev/null @@ -1,73 +0,0 @@ -Beim Zusammenbauen der Daten haue ich in die geholte Tabelle zu jeder Zeile -zusätzliche Daten rein, und zwar eine neue Spalte, die "JOIN" heißt und -ein Dictionary von Dictionaries trägt. Der Schlüssel des Dictionaries -ist das Argument des Join-Painters (z.B. CPU load). Der Wert ist der -Datensatz aus der Livestatus-Tabelle. - -Zum Holen der Servicestabelle brauche ich: - -Spalten: - - Der Schlüssel der Haupttabelle (woher bekomme ich den? In meinem Fall - ist es "host_name". Evtl. einfach als Argument in die Datasources - aufnehmen unter dem Argument "joinkey". - - Der Schlüssel der Nebentabelle (woher bekomme ich den? In meinem Fall - ist es "service_description" - - alle Spalten, die die Nebenpainter brauchen. Dazu muss ich eine Hilfsfunktion - einführen (wenn es die nicht schon gibt) - -Filter: - - alle Filter-Header von der Haupttabelle (vom Host) - - *kein* Limit-Filter! - - ein Zusatzfilter, der die Services auswählt: - - Filter: service_description = CPU load - Filter: service_description = CPU utilization - Or: 2 - - Hier brauche ich wieder den Schlüssel der Nebentabelle. - -Jetzt die Tabelle holen. Ich bekomme dann eine Liste von Einträgen. Diese -müssen jetzt gruppiert werden, nach dem Schlüssel der Haupttabelle (zzgl. "site"). -Ich gehe also die Liste Zeile für Zeile durch und baue parallel dazu ein -dictionary join_information {} auf, beim dem der Schlüssel der Join-Key ist. - -Beispiel: - -join_information = { - ( "muc", "zbghlnx04" ) : { - "CPU load" : { "service_description" : ...", ... }, - "CPU utilization" : { "service_description" : ...", ... }, - } -} - -Jetzt gehe ich die Hosts-Tabelle nochmal durch und baue diese join-Information -als eigene Spalte unter dem Namen "JOIN" ein. - -Wenn dann später die Painter aufgerufen werden und die Spalte malen sollen, -dann müssen sie mit einer row aufgerufen werden, die aus diesem dictionary -kommt. Als Titel für die Spalte muss der Join-Key genommen werden (z.B. CPU load). -Alternativ kann man einen Titel konfigurieren. - -====================================================== -Was jetzt noch fehlt: - -* View-Editor: Editieren der neuen Spaltentypen. Hier muss man mehrstufig vorgehen. - Evtl. macht man einen Reiter mit zwei Varianten: Hostspalte, Servicespalte. Bei - Hostspalte kommt der Dialog von bisher. Bei Servicespalte kommt zusätzlich das - Feld "Service", in welchem man die Servicedescription einträgt. Außerdem kommt - anstelle der Spalten für den Host hier die Spalten für die Services. - Oder: Man macht nur eine Ansicht und zeigt gleich in der Spaltenliste auch die - Painter für die Services (am Ende, nach einem Trenner). Dann - wenn man einen Servicepainter - auswählt - poppt noch ein Textfeld auf, in dem man die Servicebeschreibung angeben - kann. Alternativ kommt eine Dropdownliste. Diese hat allerdings den Nachteil, dass - sie recht groß und langsam werden kann. Wahrscheinlich hat das so nicht hin. - - Wenn man einen Service ausgewählt hat, kann man bei den Tootips auch Daten des - Services anzeigen. Frage ist, ob man das in Javascript irgendwie managen kann. - -Was aktuell noch nicht geht, ist die Daten im Group-Painter zu verwenden. Ich würde -das auch einfach ausschließen. Oder gibt es hier sinnvolle Anwendungen? Z.B. Hosts -danach zu gruppieren nach dem Status eines Filesystems?? Wenn ja, ist hier noch -ein Bug zu beheben. - -

13 years, 2 months

Check_MK Git: check_mk: Multisite: custom title for join columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd94aa09d1a042781ac5ecc1e185420ff3ae2d51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd94aa09d1a042… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 10:01:43 2011 +0200 Multisite: custom title for join columns --- web/htdocs/views.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b12c406..2768d0f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1299,7 +1299,8 @@ def do_table_join(master_ds, master_rows, master_filters, join_painters, join_co # Create additional filters join_filter = "" - for paintfunc, linkview, title, join_key in join_painters: + for entry in join_painters: + paintfunc, linkview, title, join_key = entry[:4] join_filter += "Filter: %s = %s\n" % (join_slave_column, join_key ) join_filter += "Or: %d\n" % len(join_painters) query = master_filters + join_filter @@ -2013,7 +2014,10 @@ def paint(p, row): def paint_header(p): painter = p[0] if len(p) >= 4: # join column - t = p[3] + if len(p) >= 5 and p[4]: + t = p[4] + else: + t = p[3] else: t = painter.get("short", painter["title"]) html.write("<th>%s</th>" % t)

13 years, 2 months

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: 91dcbc86847f01a3746d16d9e72dbc204b77bdf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91dcbc86847f01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 10:01:45 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 2 months

Check_MK Git: check_mk: Added downtimes/acks to nagstamon views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7c4b2d673d5075b0c896816d02fc174844a956e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7c4b2d673d507… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 09:32:09 2011 +0200 Added downtimes/acks to nagstamon views --- web/plugins/views/builtin.py | 4 ++++ web/plugins/views/painters.py | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 53ac888..87ecaae 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1841,6 +1841,8 @@ multisite_builtin_views = { ('host_in_downtime', None, ''), ('host_acknowledged', None, ''), ('host_address', None, ''), + ('host_in_downtime', None, ''), + ('host_acknowledged', None, ''), ('sitename_plain', None, '')], 'play_sounds': False, 'public': True, @@ -1898,6 +1900,8 @@ multisite_builtin_views = { ('svc_flapping', None, ''), ('svc_notifications_enabled', None, ''), ('svc_is_active', None, ''), + ('svc_in_downtime', None, ''), + ('svc_acknowledged', None, ''), ('sitename_plain', None, ''), ('host_address', None, ''), ('svc_check_command', None, '')], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 168816c..60ad7f6 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -653,7 +653,12 @@ multisite_painters["svc_comments"] = { "paint" : lambda row: paint_comments("service_", row) } - +multisite_painters["svc_acknowledged"] = { + "title" : "Service problem acknowledged", + "short" : "Ack", + "columns" : ["service_acknowledged"], + "paint" : lambda row: paint_nagiosflag(row, "service_acknowledged", False) +} def notes_matching_pattern_entries(dirs, item):

13 years, 2 months

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: 025b226e95930cb7a38d1a424abbb261ef0458cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=025b226e95930c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 09:33:59 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 2 months

Check_MK Git: check_mk: fixed width of columns in view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42eec32cccfd74e7e7b8a0306881e1bb4cf2f43d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42eec32cccfd74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 09:23:49 2011 +0200 fixed width of columns in view editor --- web/htdocs/check_mk.css | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 7835e1d..a9d14c1 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1456,6 +1456,9 @@ div.columneditor table { width: 100%; } +div.columneditor td.cebuttons { + width: 33px; +} div.columneditor td.celeft { width: 60px; }

13 years, 2 months

Check_MK Git: check_mk: Multisite: minor code cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b00d32e7c2ac08e60b354984c4ee4687939d2d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b00d32e7c2ac0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 09:25:04 2011 +0200 Multisite: minor code cleanup --- web/htdocs/views.py | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 31f2e4d..b12c406 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -678,7 +678,7 @@ function toggle_section(nr, oImg) { def view_edit_column(n, var_prefix, maxnum, allowed): collist = [ ("", "") ] + [ (name, p["title"]) for name, p in allowed.items() ] html.write("<div class=columneditor id=%seditor_%d><table><tr>" % (var_prefix, n)) - html.write('<td rowspan=3>') + html.write('<td class="cebuttons" rowspan=3>') html.write('<img onclick="delete_view_column(this);" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\" ' @@ -698,6 +698,9 @@ def view_edit_column(n, var_prefix, maxnum, allowed): html.write('</td>') html.write('<td id="%slabel_%d" class=celeft>Column %d:</td><td>' % (var_prefix, n, n)) html.sorted_select("%s%d" % (var_prefix, n), collist) + # html.write('<div style="display: yes;">of Service: ') + # html.text_input("%s_svc%d" % (var_prefix, n), "") + # html.write('</div>') html.write("</td></tr><tr><td class=celeft>Link:</td><td>") select_view("%slink_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>Tooltip:</td><td>") @@ -1547,17 +1550,6 @@ def filters_allowed_for_datasource(datasourcename): allowed[fname] = filt return allowed -def painters_allowed_for_datasource(datasourcename): - return allowed_for_datasource(multisite_painters, datasourcename) - -def sorters_allowed_for_datasource(datasourcename): - return allowed_for_datasource(multisite_sorters, datasourcename) - -def list_in_list(a, b): - for ele in a: - if ele not in b: - return False - return True # Filters a list of sorters or painters and decides which of # those are available for a certain data source

13 years, 2 months

Check_MK Git: check_mk: Multisite: better implementation of table joins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10dc693fdca823a68347c6a76aaba750975a576b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10dc693fdca823… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 1 20:06:19 2011 +0200 Multisite: better implementation of table joins --- web/htdocs/views.py | 14 ++++++-------- web/plugins/views/datasources.py | 3 +++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0f70304..31f2e4d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1086,7 +1086,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Now add join information, if there are join columns if len(join_painters) > 0: - do_table_join(rows, filterheaders, join_painters, join_columns, only_sites) + do_table_join(datasource, rows, filterheaders, join_painters, join_columns, only_sites) else: rows = [] @@ -1289,12 +1289,10 @@ def view_options(viewname): config.save_user_file("viewoptions", vo) return v -def do_table_join(master_rows, master_filters, join_painters, join_columns, only_sites): - # TODO: Do not hard code this values, put it into the datasource? - join_table = "services" # TODO: detect / lookup - join_master_column = "host_name" - join_slave_column = "service_description" - datasource = multisite_datasources[join_table] +def do_table_join(master_ds, master_rows, master_filters, join_painters, join_columns, only_sites): + join_table, join_master_column = master_ds["join"] + slave_ds = multisite_datasources[join_table] + join_slave_column = slave_ds["joinkey"] # Create additional filters join_filter = "" @@ -1302,7 +1300,7 @@ def do_table_join(master_rows, master_filters, join_painters, join_columns, only join_filter += "Filter: %s = %s\n" % (join_slave_column, join_key ) join_filter += "Or: %d\n" % len(join_painters) query = master_filters + join_filter - rows = query_data(datasource, [join_master_column, join_slave_column] + join_columns, [], query, only_sites, None) + rows = query_data(slave_ds, [join_master_column, join_slave_column] + join_columns, [], query, only_sites, None) per_master_entry = {} current_key = None current_entry = None diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 894b556..5179c91 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -39,6 +39,7 @@ multisite_datasources["hosts"] = { "table" : "hosts", "infos" : [ "host" ], "keys" : [ "host_name", "host_downtimes" ], + "join" : ( "services", "host_name" ), } multisite_datasources["hostsbygroup"] = { @@ -46,6 +47,7 @@ multisite_datasources["hostsbygroup"] = { "table" : "hostsbygroup", "infos" : [ "host", "hostgroup" ], "keys" : [ "host_name", "host_downtimes" ], + "join" : ( "services", "host_name" ), } multisite_datasources["services"] = { @@ -53,6 +55,7 @@ multisite_datasources["services"] = { "table" : "services", "infos" : [ "service", "host" ], "keys" : [ "host_name", "service_description", "service_downtimes" ], + "joinkey" : "service_description", } multisite_datasources["servicesbygroup"] = {

13 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011