Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: check_mk.css: vertical center text in Perf-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a611b5ba00ae7dd5b7eff4626d025164f2976b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a611b5ba00ae7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 1 20:05:25 2011 +0200 check_mk.css: vertical center text in Perf-O-Meter --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 23fcf38..7835e1d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -718,7 +718,7 @@ td.perfometer div.content { td.perfometer div.title { position: relative; - top: 3px; + top: 5px; left: 0px; width: 120px; height: 0px;

13 years, 4 months

Check_MK Git: check_mk: check_mk.css: fix layout problem in Perf-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 304291865eb883e52d6aab3ab08ee90afec4d115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=304291865eb883… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 1 20:01:56 2011 +0200 check_mk.css: fix layout problem in Perf-O-Meter --- web/htdocs/check_mk.css | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1673660..23fcf38 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -749,12 +749,12 @@ td.perfometer table { height: 100%; } -td.perfometer td.inner { +table.data td.perfometer td.inner { padding: 0; margin: 0; border: none; height: 22px; - padding-left: 1px; + padding: 0px 0px 0px 1px; } td.perfometer a {

13 years, 4 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: 09689d6bb40381e53e325e7b91016056d9a12d69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09689d6bb40381… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 1 13:24:42 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Allow for displaying service data in host tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d37d093b44628e05c4338c5d51ac55fe7f999b1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d37d093b44628e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 1 13:24:37 2011 +0200 Allow for displaying service data in host tables This is still experimental. It allows you e.g. to display the CPU load and memory usage of hosts in the table of hosts --- ChangeLog | 1 + LIESMICH.servicepainter | 73 +++++++++++++++++++++++++++++++ web/htdocs/views.py | 109 ++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 162 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d37d093b44…

13 years, 4 months

Check_MK Git: check_mk: Fixed handling of embedded graphs to support the changed made in the PNP webservice

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5375a0746ca0382298c523fc34e24840eccf448c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5375a0746ca038… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:30:09 2011 +0200 Fixed handling of embedded graphs to support the changed made in the PNP webservice --- web/htdocs/js/check_mk.js | 7 ++++--- web/plugins/views/painters.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 4983831..75b11d5 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -161,7 +161,8 @@ function pnp_response_handler(data, code) { response = eval(code); for(var i in response) { var graph = response[i]; - create_graph(data, '&' + graph['image_url'].replace('&view=1', '')); + var view = data['view'] == '' ? '0' : data['view']; + create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); i = null; } } catch(e) { @@ -207,8 +208,8 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn 'pnp_url': pnp_url, 'site': site, 'host': host, 'service': service, 'with_link': with_link, 'view': pnpview}; - get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' + service + '&source=0', - pnp_response_handler, data, pnp_error_response_handler); + get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' + service + '&source=0&view=' + pnpview, + pnp_response_handler, data, pnp_error_response_handler); } // ---------------------------------------------------------------------------- diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 225122b..168816c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -77,7 +77,7 @@ import bi # needed for aggregation icon multisite_painter_options["pnpview"] = { "title" : "PNP Timerange", "default" : "1", - "values" : [ ("0", "4 Hours"), ("1", "25 Hours"), ("2", "One week"), ("3", "One Month"), ("4", "One Year"), ] + "values" : [ ("0", "4 Hours"), ("1", "25 Hours"), ("2", "One week"), ("3", "One Month"), ("4", "One Year"), ("", "All") ] } multisite_painter_options["ts_format"] = {

13 years, 4 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: c0aeb455882aa0791203fad4c3d0ed2c5acff7b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0aeb455882aa0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:32:46 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe57ad0da0934aeb850e645b000f517df3998aba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe57ad0da0934a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:32:41 2011 +0200 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index eafc253..d46ad59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar * FIX: ignore case when sorting groups in ...groups snapin + * FIX: Fixed handling of embedded graphs to support the changes made to + the PNP webservice * Added snmp_uptime, uptime and printer_supply perfometers BI:

13 years, 4 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: 4620d8d7f11f33f7c117c4e63c202a852219838c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4620d8d7f11f33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 15:08:49 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: find configuration file in subdirectories of conf. d also

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 23cb931b753c88d650c74c6d7195e07244795975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23cb931b753c88… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 15:05:56 2011 +0200 find configuration file in subdirectories of conf.d also --- ChangeLog | 1 + modules/check_mk.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index eafc253..22b3738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * --debug now implies -v * new option --debug: creates execution profile of check_mk itself * sped up use of stored snmp walks + * find configuration file in subdirectories of conf.d also Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/check_mk.py b/modules/check_mk.py index da09961..0066b10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3846,7 +3846,9 @@ def all_nonfunction_vars(): # Create list of all files to be included -list_of_files = glob.glob(check_mk_configdir + '/*.mk') +list_of_files = reduce(lambda a,b: a+b, + [ [ "%s/%s" % (d, f) for f in fs if f.endswith(".mk")] + for d, sb, fs in os.walk(check_mk_configdir) ], []) list_of_files.sort() list_of_files = [ check_mk_configfile ] + list_of_files final_mk = check_mk_basedir + "/final.mk"

13 years, 4 months

Check_MK Git: check_mk: Changed general bg_brighten class to individual code again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4ba00601f3365459da16701e0e3779b2d2ed3b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4ba00601f3365… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 12:14:43 2011 +0200 Changed general bg_brighten class to individual code again --- web/htdocs/check_mk.css | 15 ++++++++------- web/htdocs/permissions.py | 2 +- web/htdocs/views.py | 10 +++++----- web/htdocs/wato.py | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index bcc2895..1673660 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -45,13 +45,6 @@ div { padding: 0; } -/* Lightens up background colors of tables/divs and so on - * form_background.png is a fully transparent image */ -.bg_brighten { - background-image: url("images/form_background.png"); - background-repeat: repeat; -} - /* __ __ _ | \/ | __ _(_)_ __ @@ -1020,6 +1013,8 @@ h2.formcaption { } table.form { + background-image: url("images/form_background.png"); + background-repeat: repeat; border-collapse: collapse; empty-cells: show; border-spacing: 0px; @@ -1063,6 +1058,8 @@ table.form td.legend.border { border-right-style: solid; } table.form td.hilite { + background-image: url("images/form_background.png"); + background-repeat: repeat; margin: 10px; } @@ -1452,6 +1449,8 @@ div.columneditor { div.columneditor table { padding: 0; margin: 0; + background-image: url("images/form_background.png"); + background-repeat: repeat; border: 1px solid #fff; -moz-border-radius: 5px; width: 100%; @@ -1586,6 +1585,8 @@ table.add_snapin i { */ .wato table.auditlog { + background-image: url("images/form_background.png"); + background-repeat: repeat; border-collapse: collapse; margin-top: 3px; margin-bottom: 1em; diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index 7a2e219..1c5bb28 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -87,7 +87,7 @@ def page_edit_permissions(h): section_title = config.permission_sections[section] if section != current_section: current_section = section - html.write('<tr><td class="legend border hilite bg_brighten" colspan=%d><b>%s</b></td></tr>\n' % (len(config.roles) + 1, section_title)) + html.write('<tr><td class="legend border hilite" colspan=%d><b>%s</b></td></tr>\n' % (len(config.roles) + 1, section_title)) if current_section == None: title = "<b>%s</b><br><i>%s</i>" % (perm["title"], perm["description"]) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d5585e5..96a7aa7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -99,7 +99,7 @@ def show_filter_form(is_open, filters): html.begin_form("filter") html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") # sort filters according to title s = [(f.sort_index, f.title, f) for f in filters] s.sort() @@ -133,7 +133,7 @@ def show_painter_options(painter_options): html.begin_form("painteroptions") html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") for on in painter_options: opt = multisite_painter_options[on] html.write("<tr>") @@ -496,7 +496,7 @@ def page_edit_view(h): html.begin_form("view") html.hidden_field("back", html.var("back", "")) html.hidden_field("old_name", viewname) # safe old name in case user changes it - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") html.write("<tr><td class=legend>Title</td><td class=content>") html.text_input("view_title") @@ -677,7 +677,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 class=bg_brighten><tr>" % (var_prefix, n)) + html.write("<div class=columneditor id=%seditor_%d><table><tr>" % (var_prefix, n)) html.write('<td rowspan=3>') html.write('<img onclick="delete_view_column(this);" ' 'onmouseover=\"hilite_icon(this, 1)\" ' @@ -1543,7 +1543,7 @@ def show_action_form(is_open, datasource): html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") if what in [ "host", "service" ]: show_host_service_actions(what) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ddf44dd..b3034d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -242,7 +242,7 @@ def host_link(hostname): def render_audit_log(log, what, with_filename = False): - htmlcode = '<table class="wato auditlog bg_brighten">' + htmlcode = '<table class="wato auditlog">' even = "even" for t, filename, user, action, text in log: text = parse_host_names(text)

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits