Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: context_buttons can have a hover title now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4961bc48bed40164adc12dea60d2185c17c0eced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4961bc48bed401… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 15 10:51:12 2012 +0200 context_buttons can have a hover title now --- web/htdocs/htmllib.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4caab07..1828f83 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -433,7 +433,7 @@ class html: self.write("</td></tr></table>\n") self.context_buttons_open = False - def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None): + def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=''): display = "block" if bestof: counts = config.load_user_file("buttoncounts", {}) @@ -457,6 +457,8 @@ class html: self.context_button_hover_code(hot and "_hot" or "") self.write('>') self.write('<a href="%s"' % url) + if hover_title: + self.write(' title="%s"' % hover_title) if bestof: self.write(' onmousedown="count_context_button(this); document.location=this.href; " ') self.write('>%s</a></div>\n' % title)

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0773

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea66cadd1bc8fc5d931e5b7ac2abe7006521f1be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea66cadd1bc8fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 15:19:26 2012 +0200 Updated bug entries #0773 --- .bugs/773 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/773 b/.bugs/773 new file mode 100644 index 0000000..4456cd4 --- /dev/null +++ b/.bugs/773 @@ -0,0 +1,10 @@ +Title: Available snapins: layout of WATO.Quickaccess garbled +Component: multisite +State: open +Date: 2012-06-14 15:18:42 +Targetversion: 1.2.0 +Class: nastiness + +The changes button overlaps with the icons. But only +in the add snapin dialog. +Some style seems to be missing here...

12 years, 3 months

Check_MK Git: check_mk: check_bi_local.py: fix non-cookie case

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48b89058bc1029991f733bdda02fd6f6ba8726db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b89058bc1029… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 15:08:20 2012 +0200 check_bi_local.py: fix non-cookie case --- doc/treasures/check_bi_local.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py index f0a783a..b911269 100755 --- a/doc/treasures/check_bi_local.py +++ b/doc/treasures/check_bi_local.py @@ -38,6 +38,8 @@ url_prefix = "" # non-OMD installations # HTTP Basic Auth user = "omdadmin" password = "omd" +cookie = None + # Alternatively: Multisite Cookie authentication: # If you are using Cookie base authentication, then # login with your browser and get the cookie content

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0770, #0771, #0772

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90616fc0a7cdb784bca787f3341ca0aa9ff34213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90616fc0a7cdb7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 14:57:34 2012 +0200 Updated bug entries #0770, #0771, #0772 --- .bugs/770 | 8 ++++++++ .bugs/771 | 13 +++++++++++++ .bugs/772 | 9 +++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.bugs/770 b/.bugs/770 new file mode 100644 index 0000000..330a9dd --- /dev/null +++ b/.bugs/770 @@ -0,0 +1,8 @@ +Title: View editor: view shown at "Link:" are duplicate +Component: multisite +State: open +Date: 2012-06-14 13:21:44 +Targetversion: 1.2.0 +Class: bug + +The list of views selectable when linking contains duplicates. diff --git a/.bugs/771 b/.bugs/771 new file mode 100644 index 0000000..b342a7a --- /dev/null +++ b/.bugs/771 @@ -0,0 +1,13 @@ +Title: Services in Hosttables: wrong headings +Component: multisite +State: open +Date: 2012-06-14 13:29:43 +Targetversion: 1.2.0 +Class: nastiness + +When adding service columns to host tables the column +headers of those columns should be the service name, +not the title of the painter. The latter one is +for example "Perf-O-Meter". Better would be "CPU load". +(if this is not specified by the user in the first +place). diff --git a/.bugs/772 b/.bugs/772 new file mode 100644 index 0000000..3e7989f --- /dev/null +++ b/.bugs/772 @@ -0,0 +1,9 @@ +Title: Try-Out mode in view editor should not display butons +Component: multisite +State: open +Date: 2012-06-14 14:51:49 +Targetversion: 1.2.0 +Class: nastiness + +When hitting "Try out" in the edit mode of a view then +the buttons for commands etc are shown but shouldn't.

12 years, 3 months

Check_MK Git: check_mk: FIX: set new site dirty is host move due to change of folder attrs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06e797bef439735ad93a510aa86fae3683ed9c40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06e797bef43973… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 13 12:07:04 2012 +0200 FIX: set new site dirty is host move due to change of folder attrs --- .bugs/769 | 7 +++++-- ChangeLog | 2 ++ web/htdocs/wato.py | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.bugs/769 b/.bugs/769 index 85e227c..b155085 100644 --- a/.bugs/769 +++ b/.bugs/769 @@ -1,9 +1,9 @@ Title: Editing folder information does not set site dirty Component: wato -State: open +Class: bug +State: done Date: 2012-06-13 11:43:11 Targetversion: 1.2.0 -Class: bug I did the following: @@ -17,3 +17,6 @@ I did the following: --> Slave site is not being set to dirty. Activate changes leaves you with zero hosts. + +2012-06-13 12:06:34: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index e27dff7..abbc293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ a topic for "Used rules" - a short overview of all non-empty rulesets. * FIX: add missing context help to host details dialog + * FIX: set new site dirty is host move due to change of + folder attributes 1.2.0p1: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 52184dc..35d605f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -496,7 +496,7 @@ def load_folder(dir, name="", path="", parent=None, childs = True): # so that subsequent code has access to the correct folder # meta data (such as .siteid) def reload_folder(folder): - load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) + return load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) # Load the information about all folders - except the hosts def load_all_folders(): @@ -1664,13 +1664,15 @@ def mode_editfolder(phase, new): if attributes_changed: mark_affected_sites_dirty(g_folder) g_folder["attributes"] = attributes - mark_affected_sites_dirty(g_folder) # Due to changes in folder/file attributes, host files # might need to be rewritten in order to reflect Changes # in Nagios-relevant attributes. rewrite_config_files_below(g_folder) # due to inherited attributes - reload_folder(g_folder) + save_folder(g_folder) + g_folder = reload_folder(g_folder) + mark_affected_sites_dirty(g_folder) + log_pending(AFFECTED, g_folder, "edit-folder", _("Changed attributes of folder %s") % title) call_hook_hosts_changed(g_folder) @@ -4623,7 +4625,6 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute continue attrname = attr.name() if attrname in without_attributes: - html.debug(without_attributes) continue # e.g. needed to skip ipaddress in CSV-Import # Hide invisible attributes @@ -7003,7 +7004,6 @@ def mark_affected_sites_dirty(folder, hostname=None, sync = True, restart = True # "need_restart" : True, # } # for site_id, site in sites.items(): -# html.debug("ID: " + site_id) # update_replication_status(site_id, changes) def remove_sync_snapshot():

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0769

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 75635d4c01a4de8d11a5a9a93d857cc6d6801edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75635d4c01a4de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 13 11:44:42 2012 +0200 Updated bug entries #0769 --- .bugs/769 | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.bugs/769 b/.bugs/769 new file mode 100644 index 0000000..85e227c --- /dev/null +++ b/.bugs/769 @@ -0,0 +1,19 @@ +Title: Editing folder information does not set site dirty +Component: wato +State: open +Date: 2012-06-13 11:43:11 +Targetversion: 1.2.0 +Class: bug + +I did the following: + +1. create a site master and slvae +2. create two hosts and the master +3. restart + +--> works + +4. now change the folder properties to "monitored on slave" + +--> Slave site is not being set to dirty. Activate changes +leaves you with zero hosts.

12 years, 3 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: ff14eefe587cdc5473d9f90dfdedad9b926ec4fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff14eefe587cdc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 13:21:42 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Fixed Locaisation in mobile.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3fe5d5e97544f7e86afdeb212e6a151330bce1d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fe5d5e97544f7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jun 14 12:23:12 2012 +0200 Fixed Locaisation in mobile.py --- web/htdocs/mobile.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f5240a1..d1ed647 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -357,7 +357,7 @@ def show_command_form(view, datasource, rows): def do_commands(view, what, rows): command = None title, executor = views.core_command(what, rows[0])[1:3] # just get the title - r = html.confirm(_("Do you really want to %s the %d %ss?") % + r = html.confirm(_("Do you really want to %(title)s the %(count)d %(what)ss?") % (title, len(rows), what), action=html.req.myfile + ".py#commands") if r != True: return r == None # Show commands on negative answer

12 years, 3 months

Check_MK Git: check_mk: Added new image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1af588dd49a10d14d9601922e5816fc76ba01acb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af588dd49a10d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 11 14:44:47 2012 +0200 Added new image --- web/htdocs/images/icon_upload.png | Bin 0 -> 2163 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_upload.png b/web/htdocs/images/icon_upload.png new file mode 100644 index 0000000..2c463bf Binary files /dev/null and b/web/htdocs/images/icon_upload.png differ

12 years, 3 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: f6f340b0a8c0145ee874842efa1269e9bb9febc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f340b0a8c014… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 14 10:30:08 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012