Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64329 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: d8d8bad39ab7b84a153cdf4fbc7a31f752d53a9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8d8bad39ab7b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:22:48 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Table snapshots: fix HTML tag order

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 821c571c46e63808c14cf24144bd7d10583b94d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=821c571c46e638… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 21:48:30 2012 +0200 Table snapshots: fix HTML tag order --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 36a1a98..0cbf419 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4987,8 +4987,8 @@ def mode_snapshot(phase): if len(snapshots) == 0: html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") else: - html.write('<table class=data>') html.write('<h3>' + _("Snapshots") + '</h3>') + html.write('<table class=data>') html.write("<tr>") html.write("<th>%s</th>" % _("Actions")) html.write("<th>%s</th>" % _("Filename"))

12 years, 4 months

Check_MK Git: check_mk: new ValueSpec MonitoringState removes reduntant code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c05b8ed51cab545d6946d70db554ffc3cae5669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c05b8ed51cab5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 12:35:46 2012 +0200 new ValueSpec MonitoringState removes reduntant code --- web/htdocs/valuespec.py | 10 ++++++++++ web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 21 +++++---------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5e3e858..1a5c77d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -772,6 +772,16 @@ class DropdownChoice(ValueSpec): ", ".join([v for (v,t) in self._choices])) +# Special conveniance variant for monitoring states +class MonitoringState(DropdownChoice): + def __init__(self, **kwargs): + choices = [ ( 0, _("OK")), + ( 1, _("WARN")), + ( 2, _("CRIT")), + ( 3, _("UNKNOWN")) ] + kwargs.setdefault("default_value", 0) + DropdownChoice.__init__(self, choices=choices, **kwargs) + # A Dropdown choice where the elements are ValueSpecs. # The currently selected ValueSpec will be displayed. # The text representations of the ValueSpecs will be used as texts. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4aa2ce..36a1a98 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9944,7 +9944,7 @@ def mode_edit_rule(phase): forms.section("") for posneg, img in [ ("positive", "yes"), ("negative", "no")]: val = img == "yes" - html.write('<img align=top src="images/rule_%s.png"> ' % img) + html.write('<img class=ruleyesno align=top src="images/rule_%s.png"> ' % img) html.radiobutton("value", img, value == val, _("Make the outcome of the ruleset <b>%s</b><br>") % posneg) # Conditions diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d06f2fa..bcaadcf 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1176,16 +1176,10 @@ checkgroups.append(( ( "auto", _("auto") ), ( "unknown", _("unknown (old agent)") ), ]), - DropdownChoice( + MonitoringState( title = _("Resulting state"), - default_value = 0, - choices = [ - ( 0, _("OK")), - ( 1, _("WARN")), - ( 2, _("CRIT")), - ( 3, _("UNKNWON")), - ]), - ], + ), + ], default_value = ( "running", "auto", 0)), title = _("Services states"), help = _("You can specify a separate monitoring state for each possible " @@ -1193,15 +1187,10 @@ checkgroups.append(( "this parameter, then only running/auto will be assumed to be OK."), )), ( "else", - DropdownChoice( + MonitoringState( title = _("State if no entry matches"), default_value = 2, - choices = [ - ( 0, _("OK")), - ( 1, _("WARN")), - ( 2, _("CRIT")), - ( 3, _("UNKNWON")), - ]), + ), ),] ), TextAscii(

12 years, 4 months

Check_MK Git: check_mk: Fix folding when special chars are contained in titles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9888d3fac20654dac7bd585ea32fbd4e1407f6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9888d3fac2065… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:22:02 2012 +0200 Fix folding when special chars are contained in titles --- web/htdocs/forms.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 8d71bb2..8151ea9 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -98,7 +98,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, # New functions for painting forms def strip_bad_chars(x): - return "".join([c for c in x if c > ' ' and c < 'z' and c not in ["'", '"']]) + return "".join([c for c in x if c > ' ' and c < 'z']).translate(None, "'&;<>\"") def header(title, isopen = True, table_id = ""): global g_header_open

12 years, 4 months

Check_MK Git: check_mk: Fixed layout nastiness in binary rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05d27978a528fcb5183360d19f87b0c3f893ae48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05d27978a528fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 12:35:30 2012 +0200 Fixed layout nastiness in binary rules --- web/htdocs/wato.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 00ef5ab..46c844c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -512,7 +512,8 @@ table.validationerror img { width: 20px; height: 20px; } -.wato table.ruleeditor img { +.wato table.ruleeditor img, +.wato img.ruleyesno { width: 22px; height: 22px; position: relative;

12 years, 4 months

Check_MK Git: check_mk: Minor styling fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7050407748c635077bf5bdc91c2a6cbf93364426 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7050407748c635… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:21:43 2012 +0200 Minor styling fix --- web/htdocs/sidebar.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 18b9372..b11f718 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -156,7 +156,7 @@ div.snapin div.head.closed { /* close button on header */ div.snapin div.closesnapin { float: right; - margin-right: 10px; + margin-right: 12px; margin-top: 11px; line-height: 0px; height: 8px;

12 years, 4 months

Check_MK Git: check_mk: ValueSpec DropdownChoice: understand label

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2eab34abfbc813f959f5111c89d62d29f36da6a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eab34abfbc813… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 21:08:59 2012 +0200 ValueSpec DropdownChoice: understand label --- web/htdocs/valuespec.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cde37d2..d00b6ff 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -730,11 +730,14 @@ class DropdownChoice(ValueSpec): ValueSpec.__init__(self, **kwargs) self._choices = kwargs["choices"] self._help_separator = kwargs.get("help_separator") + self._label = kwargs.get("label") def canonical_value(self): return self._choices[0][0] def render_input(self, varprefix, value): + if self._label: + html.write("%s " % self._label) # Convert values from choices to keys defval = "0" options = []

12 years, 4 months

Check_MK Git: check_mk: Minor styling update in single dataset layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f98a5f13c57886fb3d547068d71aa4a1cd07b5ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f98a5f13c57886… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 15:20:49 2012 +0200 Minor styling update in single dataset layout --- web/htdocs/views.css | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index cbfe9de..e27e3d0 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -338,14 +338,15 @@ table.data.single { padding: 0; border-collapse: collapse; empty-cells: show; - width: auto; } table.data.single tr.data td { padding-bottom: 4px; - padding: 2px 5px 2px 5px; + padding: 4px 5px 2px 5px; text-align: left; - vertical-align: middle; + height: 16px; + line-height: 14px; + vertical-align: top; } table.data.single tr.data td.left { width: 10%;

12 years, 4 months

Check_MK Git: check_mk: Fixed typos

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d6cfdf4c7136928fafed773917c2f998bab549f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d6cfdf4c71369… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 29 09:38:14 2012 +0200 Fixed typos --- web/plugins/views/builtin.py | 2 +- web/plugins/views/datasources.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3360473..b673523 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -230,7 +230,7 @@ multisite_builtin_views.update({ }, 'downtimes': {'column_headers': 'pergroup', 'datasource': 'downtimes', - 'description': 'All host- und service-downtimes', + 'description': 'All host- and service-downtimes', 'group_painters': [('downtime_what', None)], 'hard_filters': [], 'hard_filtervars': [('is_service_scheduled_downtime_depth', diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 81d28a1..1357c39 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -113,7 +113,7 @@ multisite_datasources["merged_servicegroups"] = { } multisite_datasources["comments"] = { - "title" : _("Host- und Servicecomments"), + "title" : _("Host- and Servicecomments"), "table" : "comments", "infos" : [ "comment", "host", "service" ], "keys" : [ "comment_id", "comment_type" ],

12 years, 4 months

Check_MK Git: check_mk: Mini layout fix in single view layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c4d8aa8fa76bf32470a902f3acffa046768ac88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c4d8aa8fa76bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 16:54:07 2012 +0200 Mini layout fix in single view layout --- web/htdocs/views.css | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 4303b74..cbfe9de 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -339,7 +339,6 @@ table.data.single { border-collapse: collapse; empty-cells: show; width: auto; - box-shadow: 1px 1px 3px #000000; } table.data.single tr.data td {

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits