Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64206 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: a10ef496df33c66c78c0fcf73a3e7e2376cc6b78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a10ef496df33c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 10 15:01:31 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Fixed foldertree styling in chrome; Changed title of WATO foldertree snapin to "Foldertree"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5bbb30da4521532b8cd81e18b29fa0c873244c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bbb30da452153… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 11:20:01 2012 +0100 Fixed foldertree styling in chrome; Changed title of WATO foldertree snapin to "Foldertree" --- web/plugins/sidebar/wato.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 9ed84c9..39885ae 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -212,8 +212,8 @@ def render_tree_folder(f): html.write("</ul>") sidebar_snapins['wato_foldertree'] = { - 'title' : _('WATO Foldertree'), - 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by theWATO folder.'), + 'title' : _('Foldertree'), + 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder.'), 'author' : 'Lars Michelsen', 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], @@ -222,14 +222,20 @@ sidebar_snapins['wato_foldertree'] = { float: right; padding: 0; width: 190px; + height: 19px; margin-bottom: 2px; background-color: #8EAEB8; color: #fff; } +#snapin_wato_foldertree select option { + background-color: #8EAEB8; +} #snapin_wato_foldertree span { + text-align: middle; + margin-top: 1px; display: block; color: #ffffff; - height: 21px; + height: 20px; } """ }

12 years, 7 months

Check_MK Git: check_mk: Chrome: Fixed styling problem of foldertree snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f3b4a98bd7e1ce1820da794f08ef3385e71f60e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f3b4a98bd7e1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 11:20:39 2012 +0100 Chrome: Fixed styling problem of foldertree snapin --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a307a6..c7feb79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * Added several missing localization stringsw * IE: Fixed problem with clicking SELECT fields in the new wato foldertree snapin * Fixed problem when trying to visit dashboards from new wato foldertree snapin + * Chrome: Fixed styling problem of foldertree snapin * Views: Only show the commands and row selection options for views where commands are possible

12 years, 7 months

Check_MK Git: check_mk: Fixed problem when trying to visit dashboards from new wato foldertree snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4c2fe13d050b00171379ed90882b05fdd1b518b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4c2fe13d050b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 10:12:37 2012 +0100 Fixed problem when trying to visit dashboards from new wato foldertree snapin --- ChangeLog | 3 ++- web/htdocs/js/sidebar.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48df1a9..d4d0ee8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,8 @@ Multisite: * Added several missing localization stringsw - * IE: Fixed problem with clicking SELECT fields in the new views snapin + * IE: Fixed problem with clicking SELECT fields in the new wato foldertree snapin + * Fixed problem when trying to visit dashboards from new wato foldertree snapin 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 8d1d532..3173db3 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -738,7 +738,7 @@ function wato_tree_click(folderpath) { var target = document.getElementById('target_' + topic).value; if(target.substr(0, 9) == 'dashboard') { - dashboard_name = target.substr(9, target.length); + dashboard_name = target.substr(10, target.length); href = 'dashboard.py?name=' + escape(dashboard_name); } else { href = 'view.py?view_name=' + escape(target);

12 years, 7 months

Check_MK Git: check_mk: IE: Fixed problem with clicking SELECT fields in the new views snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: de9a1c9702d3fd6998398daa5922c58ad92bd37b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de9a1c9702d3fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 10:10:20 2012 +0100 IE: Fixed problem with clicking SELECT fields in the new views snapin --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 844a6aa..48df1a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ Multisite: * Added several missing localization stringsw + * IE: Fixed problem with clicking SELECT fields in the new views snapin 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index f5a3065..8d1d532 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -437,6 +437,7 @@ function startDragScroll(event) { if (dragging === false && button == 'LEFT' && target.tagName != 'A' && target.tagName != 'INPUT' + && target.tagName != 'SELECT' && !(target.tagName == 'DIV' && target.className == 'heading')) { if (event.preventDefault) event.preventDefault();

12 years, 7 months

Check_MK Git: check_mk: Views: Only show the commands and row selection options for views where

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa6de55895f58fed7819c8316c88dd3b54eb72e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa6de55895f58f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 10:46:47 2012 +0100 Views: Only show the commands and row selection options for views where commands are possible --- ChangeLog | 2 ++ web/htdocs/views.py | 37 ++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4d0ee8..1a307a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ * Added several missing localization stringsw * IE: Fixed problem with clicking SELECT fields in the new wato foldertree snapin * Fixed problem when trying to visit dashboards from new wato foldertree snapin + * Views: Only show the commands and row selection options for views where + commands are possible 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 899e887..08e1a6e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1326,8 +1326,11 @@ def render_view(view, rows, datasource, group_painters, painters, if show_buttons and 'B' in display_options: show_context_links(view, hide_filters) + # Show the command form? Are commands possible? + command_form = len(rows) > 0 and display_command_form(display_options, datasource) + need_navi = show_buttons and \ - not html.do_actions() and ( + not html.do_actions() and ( 'D' in display_options or 'F' in display_options or 'C' in display_options or @@ -1353,7 +1356,7 @@ def render_view(view, rows, datasource, group_painters, painters, html.write("<td class=minigap></td>\n") # Command-button, open command form if checkboxes are currently shown - if 'C' in display_options and len(rows) > 0 and config.may("act"): + if command_form: toggle_button("table_actions", False, _("Commands")) # toggle_button("table_actions", show_checkboxes, _("Commands")) html.write("<td class=minigap></td>\n") @@ -1361,7 +1364,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and config.may("act") and layout["checkboxes"]: + if command_form and layout["checkboxes"]: if show_checkboxes: addclass = " selected" title = _("Hide check boxes") @@ -1423,7 +1426,7 @@ def render_view(view, rows, datasource, group_painters, painters, show_filter_form(filter_isopen, show_filters) # Actions - if len(rows) > 0: + if command_form: # If we are currently within an action (confirming or executing), then # we display only the selected rows (if checkbox mode is active) if html.var("selected_rows", "") and html.do_actions(): @@ -1949,11 +1952,16 @@ def collist_of_collection(collection, join_target = []): # | the other time of "action". Both is the same here... | # '----------------------------------------------------------------------' -def show_command_form(is_open, datasource): +# Checks wether or not this view handles commands for the current user +# When it does not handle commands the command tab, command form, row +# selection and processing commands is disabled. +def display_command_form(display_options, datasource): + if not 'C' in display_options: + return False if not config.may("act"): - return + return False if html.has_var("try"): - return + return False # What commands are available depends on the Livestatus table we # deal with. If a data source provides information about more @@ -1961,6 +1969,17 @@ def show_command_form(is_open, datasource): # information) then the first info is the primary table. So 'what' # will be one of "host", "service", "command" or "downtime". what = datasource["infos"][0] + for command in multisite_commands: + if what in command["tables"] and config.may(command["permission"]): + return True + +def show_command_form(is_open, datasource): + # What commands are available depends on the Livestatus table we + # deal with. If a data source provides information about more + # than one table, (like services datasource also provide host + # information) then the first info is the primary table. So 'what' + # will be one of "host", "service", "command" or "downtime". + what = datasource["infos"][0] html.write("<tr class=form id=table_actions %s><td>" % (not is_open and 'style="display: none"' or '') ) @@ -1973,16 +1992,12 @@ def show_command_form(is_open, datasource): # Commands are defined in plugins/views/commands.py. Iterate # over all command definitions and render HTML input fields. - one_shown = False for command in multisite_commands: if what in command["tables"] and config.may(command["permission"]): html.write('<tr><td class=legend>%s</td>\n' % command["title"]) html.write('<td class=content>\n') command["render"]() html.write('</td></tr>\n') - one_shown = True - if not one_shown: - html.write("<tr><td>"+ _('No commands possible for %ss') % what +"</td></tr>") html.write("</table></div>\n") html.end_form()

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0649

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4b3075aa6af65735fd329f4c6de47c14669d25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4b3075aa6af65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 15:28:49 2012 +0100 Updated bug entries #0649 --- .bugs/649 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/649 b/.bugs/649 new file mode 100644 index 0000000..b53ddce --- /dev/null +++ b/.bugs/649 @@ -0,0 +1,9 @@ +Title: Dashboard Zeit im header verwirrt +Component: multisite +State: open +Date: 2012-02-09 15:28:10 +Targetversion: future +Class: nastiness + +Die Zeit zeigt die Render Zeit der Seite an. Die Dashlets selbst laden sich neu +die Zeit wird aber nicht aktualisiert.

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0648

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb233262a1fc4e75eeb9e9b4b6e9adbda9192e43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb233262a1fc4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 10:35:50 2012 +0100 Updated bug entries #0648 --- .bugs/648 | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.bugs/648 b/.bugs/648 new file mode 100644 index 0000000..e8de827 --- /dev/null +++ b/.bugs/648 @@ -0,0 +1,24 @@ +Title: WATO API in multisite.mk einbinden +Component: multisite +State: open +Date: 2012-02-08 10:34:20 +Targetversion: future +Class: nastiness + +Momentan muss man ziemliche Verrenkungen machen um aus der multisite.mk auf die +WATO API zugreifen zu können. + +import __builtin__ +__builtin__._ = lambda x: x + +import config +config.login('') +import wato +wato.load_plugins() + +Eigentlich sollte + +import wato +wato.load_plugins() + +ausreichen.

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 095c07f97904b6f81d8933ef70fd85f5897c409d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=095c07f97904b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 09:13:51 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 7 months

Check_MK Git: check_mk: windows - mk_oracle tablespace: Added missing sid column

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 622e4d749719f8c4116fd222b9e4ed06795b5404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=622e4d749719f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 09:09:32 2012 +0100 windows - mk_oracle tablespace: Added missing sid column --- ChangeLog | 1 + agents/windows/plugins/mk_oracle.bat | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7101495..513acbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * hpux_if: make configurable via WATO * if.include: fix handling of NIC with index 0 * hpux_lunstats: new check for disk IO on HP-UX + * windows - mk_oracle tablespace: Added missing sid column Multisite: * Added several missing localization stringsw diff --git a/agents/windows/plugins/mk_oracle.bat b/agents/windows/plugins/mk_oracle.bat index da8340d..1f3971d 100644 --- a/agents/windows/plugins/mk_oracle.bat +++ b/agents/windows/plugins/mk_oracle.bat @@ -41,6 +41,8 @@ echo "set head off" echo "select count(*) from v$loghist where first_time > sysdate - 1/24;" ) | sqlplus -S %AUTH% +REM ; This is nearly the same query as in the linux agent. With the exception that the +REM ; column th.instance is fetched as first column to get the SID echo ^<^<^<oracle_tablespaces^>^>^> ( echo set cmdsep on @@ -52,5 +54,5 @@ echo "set feedback off" echo "set head off" echo "column instance format a10" echo "column file_name format a100" -echo "select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" +echo "select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from v$thread th, dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from v$thread th, dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" ) | sqlplus -S %AUTH%

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits