Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: WATO: use <label> for checkboxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb1603fc0bba72bd9d1e98bd2c5b803e62aa76e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb1603fc0bba72… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 14:46:58 2011 +0100 WATO: use <label> for checkboxes --- web/htdocs/wato.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 705f253..8c50e3b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4449,9 +4449,7 @@ class Checkbox(ValueSpec): return False def render_input(self, varprefix, value): - html.checkbox(varprefix, value) - if self._label: - html.write(" %s" % self._label) + html.checkbox(varprefix, value, label = self._label) def value_to_text(self, value): return value and _("on") or _("off")

12 years, 9 months

Check_MK Git: check_mk: FIX: smart check now actually checks thresholds

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7ead88d23eafc910dc251c9ef4df04c02e67f7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7ead88d23eafc… Author: Bernhard Schmidt <bschmidt(a)teleport-iabg.de> Date: Thu Nov 24 22:49:36 2011 +0000 FIX: smart check now actually checks thresholds --- ChangeLog | 1 + checks/smart | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed9ab64..c99cd86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * FIX: netapp_*: scan functions now detect IBM versions of firmware * FIX: bluecoat_diskcpu: repair scan function * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) + * FIX: smart: make levels work (thanks to Bernhard Schmidt) 1.1.12p4: Multisite: diff --git a/checks/smart b/checks/smart index 76cd9df..42aa556 100644 --- a/checks/smart +++ b/checks/smart @@ -102,10 +102,10 @@ def check_smart_stats(item, params, info): if line[4] == lab: warn, crit, cur_status, thresh_out = None, None, 0, '' - if thresh and thresh + '_crit' in params and value >= params[thresh][1]: + if thresh in params and value >= params[thresh][1]: cur_status = 2 thresh_out = '(!!)' - elif thresh and thresh + '_warn' in params and value >= params[thresh][0]: + elif thresh in params and value >= params[thresh][0]: cur_status = 1 thresh_out = '(!)'

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

12 years, 9 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: 94ad35962607cd63f5a3d70db89354985f99bdaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94ad35962607cd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 14:14:25 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Add: Wato check definitions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 998527873818d8185aa25a8a6320d0ec373250ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=998527873818d8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 14:14:18 2011 +0100 Add: Wato check definitions --- web/plugins/wato/check_parameters.py | 131 ++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2cdf56a..cfc9ee3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -239,6 +239,137 @@ checkgroups.append(( "first" )) +checkgroups.append(( + "systemtime", + _("System time offset"), + Tuple( + title = _("Time offset"), + elements = [ + Integer(title = _("Warning at"), unit = _("Seconds")), + Integer(title = _("Critical at"), unit = _("Seconds")), + ] + ), + None, + "first" +)) + +checkgroups.append(( + "tcp_conn_stats", + ("TCP connection stats"), + Dictionary( + elements = [ + ( "ESTABLISHED", + Tuple( + title = _("ESTABLISHED"), + help = _("connection up and passing data"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "SYN_SENT", + Tuple( + title = _("SYN_SENT"), + help = _("session has been requested by us; waiting for reply from remote endpoint"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "SYN_RECV", + Tuple( + title = _("SYN_RECV"), + help = _("session has been requested by a remote endpoint " + "for a socket on which we were listening"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "LAST_ACK", + Tuple( + title = _("LAST_ACK"), + help = _("our socket is closed; remote endpoint has also shut down; " + " we are waiting for a final acknowledgement"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "CLOSE_WAIT", + Tuple( + title = _("CLOSE_WAIT"), + help = _("remote endpoint has shut down; the kernel is waiting " + "for the application to close the socket"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "TIME_WAIT", + Tuple( + title = _("TIME_WAIT"), + help = _("socket is waiting after closing for any packets left on the network"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "CLOSED", + Tuple( + title = _("CLOSED"), + help = _("socket is not being used"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "CLOSING", + Tuple( + title = _("CLOSING"), + help = _("our socket is shut down; remote endpoint is shut down; " + "not all data has been sent"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "FIN_WAIT1", + Tuple( + title = _("FIN_WAIT1"), + help = _("our socket has closed; we are in the process of " + "tearing down the connection"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ( "FIN_WAIT2", + Tuple( + title = _("FIN_WAIT2"), + help = _("the connection has been closed; our socket is waiting " + "for the remote endpoint to shutdown"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), + ] + ), + None, + "first" +)) + checkgroups.append(( "filesystem", _("Filesystems (used space and growth)"),

12 years, 9 months

Check_MK Git: check_mk: Make wato_max_snapshots configurable via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50636f6776e12cb20de11721ac40a9e08f86a70c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50636f6776e12c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:35:46 2011 +0100 Make wato_max_snapshots configurable via WATO --- web/plugins/wato/check_mk_configuration.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 04fc6a3..076e3d8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -141,6 +141,15 @@ register_configvar(group, default_value = True), domain = "multisite") +register_configvar(group, + "wato_max_snapshots", + Integer(title = _("Number of configuration snapshots to keep"), + help = _("Whenever you successfully activate changes a snapshot of the configuration " + "will be created. You can also create snapshots manually. WATO will delete old " + "snapshots when the maximum number of snapshots is reached."), + minvalue = 1, + default_value = 50), + domain = "multisite") group = _("Operation mode of Check_MK")

12 years, 9 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: 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, 9 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, 9 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, 9 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, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits