Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: Mobile hint is now a prefix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aeb8ea491c8edf0e30ee762c7bf8917b01bf7535 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb8ea491c8edf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 4 11:07:32 2012 +0200 Mobile hint is now a prefix --- .bugs/776 | 8 +++++++- web/htdocs/views.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/776 b/.bugs/776 index 04bc4c5..32bb77a 100644 --- a/.bugs/776 +++ b/.bugs/776 @@ -1,6 +1,6 @@ Title: Link for Column in view editor shows duplicate views Component: multisite -State: open +State: done Date: 2012-06-20 14:07:19 Targetversion: 1.2.0 Class: nastiness @@ -14,3 +14,9 @@ and put those at the bottom of the ist. Also Only show view that have at least on "hide"-Filter. Views without a context are not useful for linking. + +2012-07-04 11:06:55: changed state open -> done +has just been fixed + +2012-07-04 11:07:03: changed state done -> done +has just been fixed diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b0856ac..bc14920 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -434,7 +434,7 @@ def select_view(varname, only_with_hidden = False): for name, view in html.available_views.items(): if not only_with_hidden or len(view["hide_filters"]) > 0: if view.get('mobile', False): - title = view["title"] + _(' (Mobile)') + title = _('Mobile: ') + view["title"] else: title = view["title"] choices.append(("%s" % name, title))

12 years, 2 months

Check_MK Git: check_mk: FIX: ListOfString Textboxes (e.g.

by git＠mathias-kettner.de

parents of folders) do now extend in IE User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b68bc20ae452549e793ba0be9c4fd1a6747625eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b68bc20ae45254… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 4 10:49:28 2012 +0200 FIX: ListOfString Textboxes (e.g. parents of folders) do now extend in IE --- .bugs/713 | 7 +++++-- ChangeLog | 1 + web/htdocs/js/checkmk.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/713 b/.bugs/713 index 1a0c403..af89c1e 100644 --- a/.bugs/713 +++ b/.bugs/713 @@ -1,9 +1,12 @@ Title: IE 9.0.8.112... 64bit doesnt autoadd textboxes (i.e. for parents on folder) Component: wato -State: open +Class: bug +State: done Date: 2012-06-19 12:03:32 Targetversion: 1.2.0 -Class: bug IE 9 seems to have problems with auto-adding new textboxes once you filled one. Same thing works on Chrome / FF + +2012-07-04 10:48:37: changed state open -> done +Fixed error in JS. diff --git a/ChangeLog b/ChangeLog index a052e19..374af9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * Add variable CONTACTPAGER to allowed macros in notifications * FIX: fixed default setting if "Hide names of configuration variables" in WATO + * FIX: ListOfString Textboxes (e.g. parents of folders) do now extend in IE BI: * New iterators FOREACH_CHILD and FOREACH_PARENT diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index e89fa5e..3bae51f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1394,7 +1394,7 @@ function list_of_strings_extend(oInput, j) { one exceeding empty element. */ var oDiv = oInput.parentNode; - while (!oDiv.parentNode.classList.contains("listofstrings")) + while (oDiv.parentNode.classList && !oDiv.parentNode.classList.contains("listofstrings")) oDiv = oDiv.parentNode; var oContainer = oDiv.parentNode;

12 years, 2 months

Check_MK Git: check_mk: FIX: view editor shows "(Mobile)" hint in view titles when linking to views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06089c0105bdbd2d54836ee6e6291f7b7c164cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06089c0105bdbd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 4 11:00:35 2012 +0200 FIX: view editor shows "(Mobile)" hint in view titles when linking to views --- ChangeLog | 1 + web/htdocs/views.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 374af9d..7cb1750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * FIX: fixed exception when refering to a language which does not exist * FIX: Removing all downtimes of a host/service is now possible again * FIX: The refresh time in footer is updated now when changing the value + * FIX: view editor shows "(Mobile)" hint in view titles when linking to views WATO: * Main menu of ruleeditor (Host & Service Parameters) now has diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 2c3f7e2..b0856ac 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -433,7 +433,11 @@ def select_view(varname, only_with_hidden = False): choices = [("", "")] for name, view in html.available_views.items(): if not only_with_hidden or len(view["hide_filters"]) > 0: - choices.append(("%s" % name, view["title"])) + if view.get('mobile', False): + title = view["title"] + _(' (Mobile)') + else: + title = view["title"] + choices.append(("%s" % name, title)) html.sorted_select(varname, choices, "") # -------------------------------------------------------------------------

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0770, #0759

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4a761031e6390de04515e48d542fc5c4b364912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a761031e6390… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 4 10:59:50 2012 +0200 Updated bug entries #0770, #0759 --- .bugs/759 | 2 +- .bugs/770 | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bugs/759 b/.bugs/759 index 5a35e43..8d4200a 100644 --- a/.bugs/759 +++ b/.bugs/759 @@ -2,7 +2,7 @@ Title: Checkbox handling in views sometimes broken Component: multisite State: open Date: 2012-05-28 16:13:51 -Targetversion: 1.2.0 +Targetversion: future Class: bug The handling of the checkboxes in the views still has diff --git a/.bugs/770 b/.bugs/770 index b1ae05a..1f93b41 100644 --- a/.bugs/770 +++ b/.bugs/770 @@ -1,11 +1,14 @@ Title: View editor: view shown at "Link:" are duplicate Component: multisite -State: open +Class: bug +State: done Date: 2012-06-14 13:21:44 Targetversion: 1.2.0 -Class: bug The list of views selectable when linking contains duplicates. LM: The duplicate titles are in fact different views. The second views are the mobile views. + +2012-07-04 10:59:44: changed state open -> done +Added "(Mobile)" text to all mobile views to prevent duplicated entries

12 years, 2 months

Check_MK Git: check_mk: PostgreSQL plugin: Make compatible with 8. 3+ outputs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9209fd6fa459d5d13f8d5edb0efd824526965130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9209fd6fa459d5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 3 17:44:02 2012 +0200 PostgreSQL plugin: Make compatible with 8.3+ outputs --- agents/plugins/mk_postgres | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index 722f9dd..ab69fd1 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -4,6 +4,8 @@ if id postgres >/dev/null ; then echo '<<<postgres_sessions>>>' echo "select current_query = '<IDLE>', count(*) from pg_stat_activity group by (current_query = '<IDLE>');" | su - postgres -c "psql -A -t -F' '" echo '<<<postgres_stat_database>>>' - echo 'select *, pg_database_size(datname) "datsize" from pg_stat_database;' \ + # The following statement might change in future for better cross-version + # compatibility. + echo 'select *, pg_database_size(datname) as "datsize" from pg_stat_database;' \ | su - postgres -c "psql -A -F' '" | sed '$d' fi

12 years, 2 months

Check_MK Git: check_mk: Agent plugins for VxVM: Change default shell to / bin/sh for multi-OS support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88c24f3f813a2e9a1a7242e2c8979ceb29091d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88c24f3f813a2e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 3 15:34:29 2012 +0200 Agent plugins for VxVM: Change default shell to /bin/sh for multi-OS support --- agents/plugins/veritas/vxvm_multipath | 2 +- agents/plugins/veritas/vxvm_objstatus | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath index 2155b04..250586d 100755 --- a/agents/plugins/veritas/vxvm_multipath +++ b/agents/plugins/veritas/vxvm_multipath @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # DMPNODENAME ENCLR-NAME STATE[A] PATH-TYPE[M] # disk2057 emc1 ENABLED(A) - diff --git a/agents/plugins/veritas/vxvm_objstatus b/agents/plugins/veritas/vxvm_objstatus index 869e2a3..4ea69da 100755 --- a/agents/plugins/veritas/vxvm_objstatus +++ b/agents/plugins/veritas/vxvm_objstatus @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if type vxdg > /dev/null; then

12 years, 2 months

Check_MK Git: check_mk: Solaris agent: add missing fi

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eec68a08367a9c503abfb797403f718536714a6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec68a08367a9c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 3 15:07:42 2012 +0200 Solaris agent: add missing fi --- agents/check_mk_agent.solaris | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index a1bf441..f1e5dae 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -53,6 +53,7 @@ if type zonename > /dev/null 2>&1 ; then platform="global_zone" else platform="zone" + fi else # Otherwise we have a normal or hard-partitioned system platform="hardware"

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0777

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3725f0ad4622727cc4d21bcc59190fdc737aa8b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3725f0ad462272… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 14:06:36 2012 +0200 Updated bug entries #0777 --- .bugs/777 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.bugs/777 b/.bugs/777 index 6e8fc98..c1fb8d0 100644 --- a/.bugs/777 +++ b/.bugs/777 @@ -7,3 +7,8 @@ Class: bug In the role editor the section with the WATO permissions is displayed twice. + +LM: This does only happen when one defines a permission +for a section, e.g. wato.*, which has already been followed +by another section. +I have a fix for this but this is too big for a fix release.

12 years, 2 months

Check_MK Git: check_mk: FIX: The refresh time in footer is updated now when changing the value

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b37c052dd074317ee1dac75903844d359d3fd51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b37c052dd0743… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 13:33:36 2012 +0200 FIX: The refresh time in footer is updated now when changing the value --- .bugs/699 | 7 +++++-- .bugs/767 | 7 +++++-- .bugs/770 | 3 +++ .bugs/778 | 7 +++++-- .bugs/780 | 7 +++++-- ChangeLog | 2 ++ web/htdocs/htmllib.py | 4 ++-- web/htdocs/js/checkmk.js | 16 ++++++++++++++++ web/htdocs/views.css | 6 ++++-- web/htdocs/views.py | 4 ++-- web/plugins/views/commands.py | 2 +- 11 files changed, 50 insertions(+), 15 deletions(-) diff --git a/.bugs/699 b/.bugs/699 index 0bac86b..3dca62d 100644 --- a/.bugs/699 +++ b/.bugs/699 @@ -1,8 +1,11 @@ Title: "refresh: 30 secs" footer in views does not change on changed refreshed Component: multisite -State: open +Class: bug +State: done Date: 2012-06-19 15:28:47 Targetversion: future -Class: bug The code is only rendered once and not changed/updated when changing the update interval. + +2012-07-03 13:32:46: changed state open -> done +Added javascript code to update the value in footer diff --git a/.bugs/767 b/.bugs/767 index 5041025..7164748 100644 --- a/.bugs/767 +++ b/.bugs/767 @@ -1,11 +1,14 @@ Title: Remove all downtimes does not work Component: multisite -State: open +Class: bug +State: done Date: 2012-06-08 16:02:53 Targetversion: 1.2.0 -Class: bug The button "Remove all downtimes" in the host/services commands dialog is not yet implemented. One can remove downtimes in the downtimes table - but nicer would be to do it here - or remove the button. + +2012-07-03 13:18:33: changed state open -> done +Has been fixed before diff --git a/.bugs/770 b/.bugs/770 index 330a9dd..b1ae05a 100644 --- a/.bugs/770 +++ b/.bugs/770 @@ -6,3 +6,6 @@ Targetversion: 1.2.0 Class: bug The list of views selectable when linking contains duplicates. + +LM: The duplicate titles are in fact different views. The second +views are the mobile views. diff --git a/.bugs/778 b/.bugs/778 index 7cd0e9c..07a975a 100644 --- a/.bugs/778 +++ b/.bugs/778 @@ -1,10 +1,13 @@ Title: Button "Remove all" Downtimes not working Component: multisite -State: open +Class: bug +State: done Date: 2012-06-25 13:04:59 Targetversion: 1.2.0 -Class: bug In the Multisite views of hosts and services one cannot remove downtimes. The button is there, seems to work, but the downtimes are not being removed. + +2012-07-03 13:12:17: changed state open -> done +The timestamp was added twice to this command. diff --git a/.bugs/780 b/.bugs/780 index 26a7341..748682a 100644 --- a/.bugs/780 +++ b/.bugs/780 @@ -1,9 +1,9 @@ Title: Error when removing downtimes Component: multisite -State: open +Class: bug +State: done Date: 2012-06-28 12:22:44 Targetversion: 1.2.0 -Class: bug [1340871811] Warning: Unrecognized external command -> [1340871810] DEL_SVC_DOWNTIME;1 @@ -33,3 +33,6 @@ DEL_SVC_DOWNTIME;26 DEL_SVC_DOWNTIME;27 [1340871811] Warning: Unrecognized external command -> [1340871810] DEL_SVC_DOWNTIME;28 + +2012-07-03 13:12:34: changed state open -> done +Duplicate of 778. Has been fixed. diff --git a/ChangeLog b/ChangeLog index 467439e..2635658 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ * FIX: fixed several localization problems in view/command processing * FIX: fixed duplicated settings in WATO when using localisation * FIX: fixed exception when refering to a language which does not exist + * FIX: Removing all downtimes of a host/service is now possible again + * FIX: The refresh time in footer is updated now when changing the value WATO: * Main menu of ruleeditor (Host & Service Parameters) now has diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7f9adf3..deffebd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -850,8 +850,8 @@ class html: if self.req.header_sent: self.bottom_focuscode() corner_text = "" - if self.browser_reload: - corner_text += _("refresh: %s secs") % self.browser_reload + corner_text += '<div id=foot_refresh>%s</div>' % \ + _("refresh: <div id=foot_refresh_time>%s</div> secs") % self.browser_reload if self.render_headfoot: si = self.render_status_icons() self.write("<table class=footer><tr>" diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7d94a05..e89fa5e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -651,6 +651,21 @@ function toggleRefreshButton(s, enable) { o = null; } +function toggleRefreshFooter(s) { + var o = document.getElementById('foot_refresh'); + var o2 = document.getElementById('foot_refresh_time'); + if(o) { + if(s == 0) { + o.style.display = 'none'; + } else { + o.style.display = 'inline-block'; + if(o2) { + o2.innerHTML = s; + } + } + } + o = null; +} // When called with one or more parameters parameters it reschedules the // timer to the given interval. If the parameter is 0 the reload is stopped. @@ -666,6 +681,7 @@ function setReload(secs, url) { } toggleRefreshButton(secs, true); + toggleRefreshFooter(secs); if (secs !== 0) { gReloadTime = secs; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index e6c4f57..56c0cb7 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -32,6 +32,10 @@ body.main.dashlet { padding: 0px; } +div#foot_refresh, div#foot_refresh_time { + display: inline-block; +} + /*-------------------------------------------------------------------------. | _____ _ ___ ___ _ _ | | |_ _|_ _| |__ ___ ( _ ) / _ \ _ __ | |_(_) ___ _ __ ___ | @@ -491,5 +495,3 @@ table.views td.buttons { vertical-align: middle; background-color: #8EAEB8; } - - diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ee9841e..2c3f7e2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2067,8 +2067,8 @@ def core_command(what, row): if not commands: raise MKUserError(None, _("Sorry. This command is not implemented.")) - # Some commands return lists of complete command lines, others - # just return one basic command without timestamp. Convert those + # Some commands return lists of commands, others + # just return one basic command. Convert those if type(commands) != list: commands = [commands] diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index f27d8c4..4ad52c4 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -357,7 +357,7 @@ def command_downtime(cmdtag, spec, row): downtime_ids.append(int(id)) commands = [] for dtid in downtime_ids: - commands.append("[%d] DEL_%s_DOWNTIME;%d\n" % (int(time.time()), cmdtag, dtid)) + commands.append("DEL_%s_DOWNTIME;%d\n" % (cmdtag, dtid)) title = _("<b>remove all scheduled downtimes</b> of ") return commands, title

12 years, 2 months

Check_MK Git: check_mk: FIX: fixed exception when refering to a language which does not exist

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ef81c702d2903fba286a18e10bd3e6972dd1862 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ef81c702d2903… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 12:58:59 2012 +0200 FIX: fixed exception when refering to a language which does not exist --- .bugs/781 | 7 +++++-- ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/781 b/.bugs/781 index efd7c29..807a4f2 100644 --- a/.bugs/781 +++ b/.bugs/781 @@ -1,9 +1,9 @@ Title: Setting default_language = "de" in multisite.mk breaks all Component: multisite -State: open +Class: bug +State: done Date: 2012-07-02 13:55:03 Targetversion: 1.2.0 -Class: bug Try: set default_language = "de" in multisite.mk. But do not provide a language file. The result is an exception: @@ -20,3 +20,6 @@ Traceback (most recent call last): NameError: global name 'config' is not defined [URL to this frame] [URL to this page including sidebar] + +2012-07-03 12:57:56: changed state open -> done +The inline comment was correct, but the code was wrong. Fixed it. diff --git a/ChangeLog b/ChangeLog index 93837a1..467439e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * FIX: fix problem in showing exceptions (due to help function) * FIX: fixed several localization problems in view/command processing * FIX: fixed duplicated settings in WATO when using localisation + * FIX: fixed exception when refering to a language which does not exist WATO: * Main menu of ruleeditor (Host & Service Parameters) now has diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f1298fc..5b8c253 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -193,7 +193,7 @@ def load_language(lang): except IOError, e: # Fallback to non localized multisite # I'd prefer to fallback to multisite default language but can not import config module here - __builtin__.current_language = config.default_language + __builtin__.current_language = None else: # Replace the _() function to disable i18n again __builtin__._ = lambda x: x

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits