Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Removed host and service state abbr painter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e18ab186eab38e7b434dadcb6215238c723ea4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e18ab186eab38… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 09:50:53 2012 +0100 Removed host and service state abbr painter --- web/plugins/views/mobile.py | 10 +++++----- web/plugins/views/painters.py | 24 ++---------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 347e36e..17075f5 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -366,7 +366,7 @@ multisite_builtin_views.update({ 'mustsearch': True, 'num_columns': 2, 'painters': [ - ('host_state_appr', None), + ('host_state', None), ('host', 'mobile_host'), ('host_plugin_output', None), ], @@ -383,7 +383,7 @@ multisite_builtin_views.update({ #List all host problems 'mobile_hostproblems': mobile_view({ 'datasource': 'hosts', - 'group_painters': [('host_state_appr', None)], + 'group_painters': [('host_state', None)], 'hard_filters': ['host_scheduled_downtime_depth', 'summary_host'], 'hard_filtervars': [ ('is_host_scheduled_downtime_depth', '0'), @@ -403,7 +403,7 @@ multisite_builtin_views.update({ 'name': 'hostproblems', 'num_columns': 2, 'painters': [ - ('host_state_appr', None), + ('host_state', None), ('host', 'mobile_host'), ('host_plugin_output', None), ], @@ -423,7 +423,7 @@ multisite_builtin_views.update({ #List unhandled host problems 'mobile_hostproblems_unack': mobile_view({ 'datasource': 'hosts', - 'group_painters': [('host_state_appr', None)], + 'group_painters': [('host_state', None)], 'hard_filters': ['host_scheduled_downtime_depth', 'summary_host', 'host_acknowledged'], 'hard_filtervars': [ ('is_host_scheduled_downtime_depth', '0'), @@ -442,7 +442,7 @@ multisite_builtin_views.update({ 'name': 'hostproblems', 'num_columns': 2, 'painters': [ - ('host_state_appr', None), + ('host_state', None), ('host', 'mobile_host'), ('host_plugin_output', None), ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 3cebe3f..2aa0991 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -261,18 +261,16 @@ multisite_painters["sitealias"] = { # |____/ \___|_| \_/ |_|\___\___||___/ # -def paint_service_state_short(row, char=False): +def paint_service_state_short(row ): if row["service_has_been_checked"] == 1: state = row["service_state"] name = nagios_short_state_names[row["service_state"]] else: state = "p" name = "PEND" - if char: - name = name[0:3] return "state svcstate state%s" % state, name -def paint_host_state_short(row, char=False): +def paint_host_state_short(row): # return None, str(row) if row["host_has_been_checked"] == 1: state = row["host_state"] @@ -280,8 +278,6 @@ def paint_host_state_short(row, char=False): else: state = "p" name = "PEND" - if char: - name = name[0:3] return "state hstate hstate%s" % state, name multisite_painters["service_nagios_link"] = { @@ -299,14 +295,6 @@ multisite_painters["service_state"] = { "sorter" : 'svcstate', } -multisite_painters["service_state_appr"] = { - "title" : _("Service state (first character)"), - "short" : _("State"), - "columns" : ["service_has_been_checked","service_state"], - "paint" : lambda row: paint_service_state_short(row, True), - "sorter" : 'svcstate', -} - multisite_painters["site_icon"] = { "title" : _("Icon showing the site"), @@ -771,14 +759,6 @@ multisite_painters["host_state"] = { "sorter" : 'hoststate', } -multisite_painters["host_state_appr"] = { - "title" : _("Host state"), - "short" : _("state"), - "columns" : ["host_has_been_checked","host_state"], - "paint" : lambda row: paint_host_state_short(row, True), - "sorter" : 'hoststate', -} - multisite_painters["host_state_onechar"] = { "title" : _("Host state (first character)"), "short" : _("S."),

12 years, 5 months

Check_MK Git: check_mk: MobileUI Fixed Bug on Index Page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5d0fb076d88e10a93fd10b07452c0edcf05a094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5d0fb076d88e1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 23 10:09:33 2012 +0100 MobileUI Fixed Bug on Index Page --- web/htdocs/mobile.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 560e334..a5bdfd2 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -178,7 +178,7 @@ def page_login(): def page_index(): title = "Check_MK Mobile" mobile_html_head(title) - jqm_page_header(title, left_button=("logout.py", "Logout", "delete"),right_button=("javascript:document.location.reload();", _("Reload"), "refresh")) + jqm_page_header(title, left_button=("logout.py", "Logout", "delete"),right_button=("javascript:document.location.reload();", _("Reload"), "refresh"),id="data") views.load_views() items = [] for view_name, view in html.available_views.items(): @@ -196,7 +196,6 @@ def page_index(): html.write('<ul data-role="listview" data-theme="b" data-inset="true">\n') html.write('<li><a data-ajax="false" data-transition="fade" href="%s">%s</a></li>\n' % ("index.py?mobile=", _("Classical web GUI"))) html.write('</ul>\n') - jqm_page_footer() mobile_html_foot() def page_view():

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1e4ea1c6f408e7f7c8ab57acab8b8f40fba1e3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1e4ea1c6f408e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jan 22 23:36:13 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: More benchmark results. :)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33db38cca42f6278e9983ab757cee860520b6b3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33db38cca42f62… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jan 22 23:35:23 2012 +0100 More benchmark results. :) --- doc/opt/benchmark/bench.cfg | 16 ++++++++++------ doc/opt/benchmark/cmkbench.sh | 16 ++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg index 8a6a483..e4e5845 100644 --- a/doc/opt/benchmark/bench.cfg +++ b/doc/opt/benchmark/bench.cfg @@ -1,16 +1,18 @@ # Config datei fuer Check_MK benchmark # pingonly deaktiviert "services" -_pingonly="no" +_pingonly="yes" _livecheck="yes" _livecheck_helpers=30 _central="zentrale" -_sites=8 -_hosts=800 +_sites=20 +_hosts=1600 _pnp="off" _delay_precompile=False +# Hosts is "Hosts per Site!" + # E5640 stats pingonly, livecheck # CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s # E5640 ~30% 6 800 4800 80 4890 @@ -19,6 +21,8 @@ _delay_precompile=False # E5640 ~35% 3 3200 9220 160 9500 # E5640 ~50% 3 6400 8000 320 8100 # E5640 ~90% 12 1600 17500 320 17800 +#2x6172 ~50% 12 1600 13600 336 13884 +#2x6172 20 1600 10250 590 11400 # E5640 stats tcp services, livecheck + 17check_mk checks + 1 extra active check @@ -28,7 +32,7 @@ _delay_precompile=False # E5640 32% 8 400 730/s 83/s 192/s # E5640 40% 8 500 930/s 104/s 239/s -# E5640 stats tcp services, livecheck + 10check_mk checks (all OK) +# stats tcp services, livecheck + 10check_mk checks (all OK) # CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s -E5640 62% 8 800 1070/s 105/s 212/s - +#E5640 62% 8 800 1070/s 105/s 212/s +#2x6172 50% 16 800 2140/s 210/s 430/s diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index b7a779a..7849db6 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -168,11 +168,11 @@ EOF cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk extra_service_conf["normal_check_interval"] = [ # ( "0.0166", ALL_HOSTS, [ "Dummy" ] ), -# ( "0.0166", ALL_HOSTS, [ "Ping" ] ), + ( "0.0166", ALL_HOSTS, [ "Ping" ] ), ] legacy_checks += [ # (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), -# (( "check-mk-ping", "Ping", True), ALL_HOSTS), + (( "check-mk-ping", "Ping", True), ALL_HOSTS), ] extra_nagios_conf += r""" define command { @@ -194,14 +194,14 @@ checks += [ (ALL_HOSTS, "cpu.threads", None, threads_default_levels), (ALL_HOSTS, "df", '/', {}), (ALL_HOSTS, "df", '/opt', {}), -# (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), -# (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), -# (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), -# (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), + (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), + (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), + (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), + (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), (ALL_HOSTS, "kernel.util", None, kernel_util_default_levels), (ALL_HOSTS, "mem.used", None, memused_default_levels), -# (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), -# (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), + (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), + (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), (ALL_HOSTS, "omd_status", 'zentrale', None), (ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels), (ALL_HOSTS, "uptime", None, None),

12 years, 5 months

Check_MK Git: check_mk: initial version of JasperReports livestatus plugin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7e2680bff12549ef9ea202db81f40c306a9ed94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e2680bff1254… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Jan 22 23:04:52 2012 +0100 initial version of JasperReports livestatus plugin --- doc/jasperreports/Makefile | 6 + doc/jasperreports/README.jasperreports-livestatus | 68 ++++++++ .../classes/livestatus/LivestatusDatasource.class | Bin 0 -> 3658 bytes .../livestatus/LivestatusFieldsProvider.class | Bin 0 -> 3304 bytes .../livestatus/LivestatusQueryExecuter.class | Bin 0 -> 5356 bytes .../LivestatusQueryExecuterFactory.class | Bin 0 -> 847 bytes doc/jasperreports/libs/com-jaspersoft-ireport.jar | Bin 0 -> 8959460 bytes doc/jasperreports/libs/jasperreports.jar | Bin 0 -> 2930970 bytes doc/jasperreports/livestatus.jar | Bin 0 -> 7609 bytes doc/jasperreports/src/LivestatusDatasource.java | 88 ++++++++++ .../src/LivestatusFieldsProvider.java | 107 ++++++++++++ doc/jasperreports/src/LivestatusQueryExecuter.java | 180 ++++++++++++++++++++ .../src/LivestatusQueryExecuterFactory.java | 23 +++ 13 files changed, 472 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7e2680bff…

12 years, 5 months

Check_MK Git: check_mk: Add more benchmark results.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32b2c078c89231d5d7de04877458e12395bad4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32b2c078c89231… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jan 22 21:54:47 2012 +0100 Add more benchmark results. --- doc/opt/benchmark/bench.cfg | 33 ++++++++++++++++++++++----------- doc/opt/benchmark/cmkbench.sh | 16 ++++++++-------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg index 54d3632..8a6a483 100644 --- a/doc/opt/benchmark/bench.cfg +++ b/doc/opt/benchmark/bench.cfg @@ -1,23 +1,34 @@ # Config datei fuer Check_MK benchmark # pingonly deaktiviert "services" -_pingonly="yes" +_pingonly="no" _livecheck="yes" _livecheck_helpers=30 _central="zentrale" -_sites=12 -_hosts=1800 +_sites=8 +_hosts=800 _pnp="off" _delay_precompile=False # E5640 stats pingonly, livecheck -# Sites: 6H800 = 4800serv/s 80host/s 4890live/s - sched rate: 8080/s -# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s ScheduledCheck/s -# E5640 ~30% 6 800 4800 80 4890 8080 -# E5640 ~30% 12 400 4800 80 4880 8080 -# E5640 ~40% 6 1600 9650 160 9819 16160 -# E5640 ~35% 3 3200 9220 160 9500 16160 -# E5640 ~50% 3 6400 8000 320 8100 32000 +# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s +# E5640 ~30% 6 800 4800 80 4890 +# E5640 ~30% 12 400 4800 80 4880 +# E5640 ~40% 6 1600 9650 160 9819 +# E5640 ~35% 3 3200 9220 160 9500 +# E5640 ~50% 3 6400 8000 320 8100 # E5640 ~90% 12 1600 17500 320 17800 -# + + +# E5640 stats tcp services, livecheck + 17check_mk checks + 1 extra active check +# 2 services != OK +# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s +# E5640 70% 8 800 1450/s 135/s 350/s +# E5640 32% 8 400 730/s 83/s 192/s +# E5640 40% 8 500 930/s 104/s 239/s + +# E5640 stats tcp services, livecheck + 10check_mk checks (all OK) +# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s +E5640 62% 8 800 1070/s 105/s 212/s + diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 7849db6..b7a779a 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -168,11 +168,11 @@ EOF cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk extra_service_conf["normal_check_interval"] = [ # ( "0.0166", ALL_HOSTS, [ "Dummy" ] ), - ( "0.0166", ALL_HOSTS, [ "Ping" ] ), +# ( "0.0166", ALL_HOSTS, [ "Ping" ] ), ] legacy_checks += [ # (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), - (( "check-mk-ping", "Ping", True), ALL_HOSTS), +# (( "check-mk-ping", "Ping", True), ALL_HOSTS), ] extra_nagios_conf += r""" define command { @@ -194,14 +194,14 @@ checks += [ (ALL_HOSTS, "cpu.threads", None, threads_default_levels), (ALL_HOSTS, "df", '/', {}), (ALL_HOSTS, "df", '/opt', {}), - (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), - (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), - (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), - (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), +# (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), +# (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), +# (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), +# (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), (ALL_HOSTS, "kernel.util", None, kernel_util_default_levels), (ALL_HOSTS, "mem.used", None, memused_default_levels), - (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), - (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), +# (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), +# (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), (ALL_HOSTS, "omd_status", 'zentrale', None), (ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels), (ALL_HOSTS, "uptime", None, None),

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90d2fafe3f9350eecc60e12d7674a4fa41c572e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d2fafe3f9350… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jan 22 21:55:34 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: ValueSpec: fixed spelling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0dcd2c1bca365273eed1948b12ded2b595a56a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0dcd2c1bca365… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 22 12:35:30 2012 +0100 ValueSpec: fixed spelling --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index fc547ad..a3ab022 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -786,7 +786,7 @@ class RelativeDate(OptionalDropdownChoice): def value_to_text(self, value): reldays = (round_date(value) - today()) / seconds_per_day if reldays == -1: - return _("Yesterday") + return _("yesterday") elif reldays == -2: return _("two days ago") elif reldays < 0:

12 years, 5 months

Check_MK Git: check_mk: ValueSpec: fixed in RelativeDate and Alternative

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db9f18c06d7ac20dcb1a5ba53af43546c49e9273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db9f18c06d7ac2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 21 21:38:38 2012 +0100 ValueSpec: fixed in RelativeDate and Alternative --- web/htdocs/valuespec.py | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5067b51..fc547ad 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -753,7 +753,6 @@ weekdays = { } class RelativeDate(OptionalDropdownChoice): - def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._choices = [ @@ -772,10 +771,13 @@ class RelativeDate(OptionalDropdownChoice): self._choices.append((w + 7, weekdays[wd] + title)) self._explicit = Integer() self._otherlabel = _("in ... days") - + if "default_days" in kwargs: + self._default_value = kwargs["default_days"] * seconds_per_day + today() + else: + self._default_value = today() def canonical_value(self): - return today() + return self._default_value def render_input(self, varprefix, value): reldays = (round_date(value) - today()) / seconds_per_day @@ -907,14 +909,17 @@ class Alternative(ValueSpec): else: checked = vs == mvs - html.radiobutton(varprefix + "_use", str(nr), checked, vs.title()) - html.write("<ul>") + title = vs.title() + html.radiobutton(varprefix + "_use", str(nr), checked, title) + if title: + html.write("<ul>") if vs == mvs: val = value else: val = vs.canonical_value() vs.render_input(varprefix + "_%d" % nr, val) - html.write("</ul>\n") + if title: + html.write("</ul>\n") def set_focus(self, varprefix): # TODO: Set focus to currently active option

12 years, 5 months

Check_MK Git: check_mk: New valuespec for relative date

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe0bc46c04819af37a81c5c1608f3be71ccfa0b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe0bc46c04819a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 21 19:02:09 2012 +0100 New valuespec for relative date --- web/htdocs/valuespec.py | 104 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b7bca58..5067b51 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -165,6 +165,7 @@ class Age(ValueSpec): if type(value) != int: raise MKUserError(varprefix, _("The value has type %s, but must be of type int") % (type(value))) + # Editor for a single integer class Integer(ValueSpec): def __init__(self, **kwargs): @@ -729,6 +730,83 @@ class OptionalDropdownChoice(ValueSpec): self._explicit.validate_datatype(self, value, varprefix + "_ex") +# Input of date with optimization for nearby dates +# in the future. Useful for example for alarms. The +# date is represented by a UNIX timestamp where the +# seconds are silently ignored. +def round_date(t): + return int(t) / seconds_per_day * seconds_per_day + +def today(): + return round_date(time.time()) + +seconds_per_day = 86400 + +weekdays = { + 0: _("Monday"), + 1: _("Tuesday"), + 2: _("Wednesday"), + 3: _("Thursday"), + 4: _("Friday"), + 5: _("Saturday"), + 6: _("Sunday"), +} + +class RelativeDate(OptionalDropdownChoice): + + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._choices = [ + (0, _("today")), + (1, _("tomorrow"))] + weekday = time.localtime(today()).tm_wday + for w in range(2, 7): + wd = (weekday + w) % 7 + self._choices.append((w, weekdays[wd])) + for w in range(0, 7): + wd = (weekday + w) % 7 + if w < 2: + title = _(" next week") + else: + title = _(" in %d days") % (w + 7) + self._choices.append((w + 7, weekdays[wd] + title)) + self._explicit = Integer() + self._otherlabel = _("in ... days") + + + def canonical_value(self): + return today() + + def render_input(self, varprefix, value): + reldays = (round_date(value) - today()) / seconds_per_day + OptionalDropdownChoice.render_input(self, varprefix, reldays) + + def value_to_text(self, value): + reldays = (round_date(value) - today()) / seconds_per_day + if reldays == -1: + return _("Yesterday") + elif reldays == -2: + return _("two days ago") + elif reldays < 0: + return _("%d days ago") % -reldays + elif reldays < len(self._choices): + return self._choices[reldays][1] + else: + return _("in %d days") % reldays + + def from_html_vars(self, varprefix): + reldays = OptionalDropdownChoice.from_html_vars(self, varprefix) + return today() + reldays * seconds_per_day + + def validate_datatype(self, value, varprefix): + if type(value) not in [ float, int ]: + raise MKUserError(varprefix, _("Date must be a number value")) + + def validate_value(self, value, varprefix): + pass + + + # Make a configuration value optional, i.e. it may be None. # The user has a checkbox for activating the option. Example: @@ -751,31 +829,35 @@ class Optional(ValueSpec): checked = html.get_checkbox(varprefix + "_use") else: checked = self._negate != (value != None) - html.write("<div style=\"float: none;\">") - html.checkbox(varprefix + "_use" , checked, - onclick="valuespec_toggle_option(this, %r, %r)" % - (div_id, self._negate and 1 or 0)) + html.write("<span>") + if self._label: - html.write(self._label) + label = self._label elif self.title(): - html.write(_(self.title())) + label = _(self.title()) elif self._negate: - html.write(_(" Ignore this option")) + label = _(" Ignore this option") else: - html.write(_(" Activate this option")) + label = _(" Activate this option") + + html.checkbox(varprefix + "_use" , checked, + onclick="valuespec_toggle_option(this, %r, %r)" % + (div_id, self._negate and 1 or 0), + label = label) + if self._sameline: html.write(" ") else: html.write("<br><br>") - html.write("</div>") - html.write('<div id="%s" style="float: left; display: %s">' % ( + html.write("</span>") + html.write('<span id="%s" display: %s">' % ( div_id, checked == self._negate and "none" or "")) if value == None: value = self._valuespec.default_value() if self._valuespec.title(): html.write(self._valuespec.title() + " ") self._valuespec.render_input(varprefix + "_value", value) - html.write('</div>\n') + html.write('</span>\n') def value_to_text(self, value): if value == None:

12 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012