Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: d5008918678125a244040f5686b047132c899982 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5008918678125… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:35:49 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: FIX: Removed double "/" from pnp graph image urls in views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc05dce2a5f183840d710bef7701e6aa755f4358 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc05dce2a5f183… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 12:28:14 2011 +0100 FIX: Removed double "/" from pnp graph image urls in views --- ChangeLog | 1 + web/htdocs/dashboard.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92239e8..ed9ab64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * Repair layout of Perf-O-Meter in single dataset layout * FIX: Fixed duplicate view plugin loading when using localized multisite * FIX: Host-/Servicegroup snapin: Showing group names when no alias is available + * FIX: Removed double "/" from pnp graph image urls in views BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 4d2e991..7ba5637 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -580,7 +580,7 @@ def render_pnpgraph(site, host, service=None, source=0): base_url = defaults.url_prefix else: base_url = html.site_status[site]["site"]["url_prefix"] - base_url += "/pnp4nagios/index.php/" + base_url += "pnp4nagios/index.php/" var_part = "?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ (pnp_cleanup(host), pnp_cleanup(service), source, int(time.time()))

12 years, 6 months

Check_MK Git: check_mk: Frame/ Frameset links on bottom of page link to _top now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 138bc1a707845f851f6da9bd48bb464ee0e892b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=138bc1a707845f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:26:49 2011 +0100 Frame/Frameset links on bottom of page link to _top now --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/wato.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9c0d0ca..743d170 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -726,9 +726,9 @@ class html: def render_status_icons(self): h = "" if True: # self.req.method == "GET": - h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_frameurl.png" title="URL to this frame"></a>\n' % \ + h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="URL to this frame"></a>\n' % \ self.makeuri([]) - h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_pageurl.png" title="URL to this page including sidebar"></a>\n' % \ + h += '<a target="_top" href="%s"><img class=statusicon src="images/status_pageurl.png" title="URL to this page including sidebar"></a>\n' % \ ("index.py?" + urlencode_vars([("start_url", self.makeuri([]))])) for img, tooltip in self.status_icons.items(): h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fc83eca..705f253 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8564,9 +8564,9 @@ def mode_rulesets(phase): if phase == "title": if only_host: - return _("Rule sets for for hosts %s") % only_host + return _("Rulesets for for hosts %s") % only_host else: - return _("Rule sets for hosts and services") + return _("Rulesets for hosts and services") elif phase == "buttons": if only_host:

12 years, 6 months

Check_MK Git: check_mk: Drop shadow for PNP graphs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7dffc0cbafc73c95e2ab688148885eefb647c167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dffc0cbafc73c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:21:50 2011 +0100 Drop shadow for PNP graphs --- web/htdocs/status.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 6469c1d..de392ae 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -325,7 +325,8 @@ table.data tr.data td.pnpgraph { tr.data td.pnpgraph img { border: 1px solid #888; - margin: 7px 3px 3px 0px; + margin: 4px 4px 4px 4px; + box-shadow: 1px 1px 3px #000000; } /*

12 years, 6 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: 27395e28fbc60cfc9d4cd4c2ccdd58b05a7b64e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27395e28fbc60c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:22:16 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Drop shadow for all elements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57048567016534fbdb02a4aebdf5c4a34588635e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57048567016534… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:21:50 2011 +0100 Drop shadow for all elements --- web/htdocs/status.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 6469c1d..de392ae 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -325,7 +325,8 @@ table.data tr.data td.pnpgraph { tr.data td.pnpgraph img { border: 1px solid #888; - margin: 7px 3px 3px 0px; + margin: 4px 4px 4px 4px; + box-shadow: 1px 1px 3px #000000; } /*

12 years, 6 months

Check_MK Git: check_mk: FIX: quote # in PNP image links also

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 719af387b776151e645ca50201e0fe1c3e07941e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=719af387b77615… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:17:30 2011 +0100 FIX: quote # in PNP image links also --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf6d929..92239e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * FIX: fix row highlight after status page reload * FIX: single dataset layout honors column header settings * FIX: quote '#' in PNP links (when # is contained in services) + * FIX: quote '#' in PNP image links also Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 6e9aae2..f0ff5e3 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -347,7 +347,7 @@ function pnp_response_handler(data, code) { response = eval(code); for(var i = 0; i < response.length; i++) { var view = data['view'] == '' ? '0' : data['view']; - create_graph(data, '&' + response[i]['image_url'].replace('&view='+view, '')); + create_graph(data, '&' + response[i]['image_url'].replace('#', '%23').replace('&view='+view, '')); } view = null; i = null; @@ -395,8 +395,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&view=' + pnpview, - pnp_response_handler, data, pnp_error_response_handler); + get_url(pnp_url + 'index.php/json?&host=' + encodeURIComponent(host) + '&srv=' + encodeURIComponent(service) + '&source=0&view=' + pnpview, + pnp_response_handler, data, pnp_error_response_handler); } // ----------------------------------------------------------------------------

12 years, 6 months

Check_MK Git: check_mk: FIX: quote # in PNP links

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 51243d0612e0bb036ed31b34105e2fd1f136a8d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51243d0612e0bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:10:55 2011 +0100 FIX: quote # in PNP links --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d30bb09..cf6d929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * FIX: fix row highlight in status GUI on IE 7/8 * FIX: fix row highlight after status page reload * FIX: single dataset layout honors column header settings + * FIX: quote '#' in PNP links (when # is contained in services) Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6535038..9c0d0ca 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -116,7 +116,7 @@ def urlencode(value): for c in value: if c == " ": c = "+" - elif ord(c) <= 32 or ord(c) > 127 or c in [ '+', '"', "'", "=", "&", ":", "%" ]: + elif ord(c) <= 32 or ord(c) > 127 or c in [ '#', '+', '"', "'", "=", "&", ":", "%" ]: c = "%%%02x" % ord(c) ret += c return ret

12 years, 6 months

Check_MK Git: check_mk: Added PNP template and P-O-M for oracle_asm_diskgroup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f694ffcb09952eaea301657d8a290c9293a6713 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f694ffcb09952… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:56:53 2011 +0100 Added PNP template and P-O-M for oracle_asm_diskgroup --- pnp-templates/check_mk-oracle_asm_diskgroup.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk-oracle_asm_diskgroup.php b/pnp-templates/check_mk-oracle_asm_diskgroup.php new file mode 120000 index 0000000..28b85a4 --- /dev/null +++ b/pnp-templates/check_mk-oracle_asm_diskgroup.php @@ -0,0 +1 @@ +check_mk-df.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 55565c6..7ffb1e4 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -67,6 +67,7 @@ perfometers["check_disk"] = perfometer_check_mk_df perfometers["check_mk-df_netapp"] = perfometer_check_mk_df perfometers["check_mk-df_netapp32"] = perfometer_check_mk_df perfometers["check_mk-hr_fs"] = perfometer_check_mk_df +perfometers["check_mk-oracle_asm_diskgroup"] = perfometer_check_mk_df def perfometer_check_mk_kernel_util(row, check_command, perf_data):

12 years, 6 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: ca78df327bcf1a65bfba2aeee45361fc10ffe2b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca78df327bcf1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:56:57 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

← Newer
1
...
11
12
13
14
15
16
17
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011