Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Some javascript cleanups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7409889f23debfb2419964d9e25d0685353669f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7409889f23debf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 12:54:32 2012 +0100 Some javascript cleanups --- web/htdocs/js/wato.js | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index fc7b944..ba09ca1 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -84,22 +84,22 @@ function wato_fix_visibility() { var oTr = oTable.childNodes[i]; if (oTr.tagName == 'TR') { /* If the Checkbox is unchecked try to get a value from the inherited_tags */ - var oCheckbox = oTr.childNodes[1].childNodes[0] + var oCheckbox = oTr.childNodes[1].childNodes[0]; if( oCheckbox.checked == false ){ - attrname = oCheckbox.parentNode.parentNode.id + var attrname = oCheckbox.parentNode.parentNode.id; if( attrname in inherited_tags ){ - currentTags = currentTags.concat(inherited_tags[oCheckbox.parentNode.parentNode.id].split("|")) + currentTags = currentTags.concat(inherited_tags[oCheckbox.parentNode.parentNode.id].split("|")); + } + } else { + /* Find the <select>/<checkbox> object in this tr */ + /* td.content div select/checkbox */ + var oElement = oTr.childNodes[2].childNodes[0].childNodes[0]; + if( oElement.type == 'checkbox' && oElement.checked ){ // <checkbox> + currentTags = currentTags.concat(oElement.getAttribute('tags').split("|")); + } + else{ // <select> + currentTags = currentTags.concat(oElement.value.split("|")); } - continue - } - /* Find the <select>/<checkbox> object in this tr */ - /* td.content div select/checkbox */ - var oElement = oTr.childNodes[2].childNodes[0].childNodes[0]; - if( oElement.type == 'checkbox' && oElement.checked ){ // <checkbox> - currentTags = currentTags.concat(oElement.getAttribute('tags').split("|")); - } - else{ // <select> - currentTags = currentTags.concat(oElement.value.split("|")); } } } @@ -136,7 +136,7 @@ function wato_fix_visibility() { } } for (var item in volatile_topics){ - var name = volatile_topics[item] + var name = volatile_topics[item]; var oTr = document.getElementById("topic_" + name); if(oTr) { if(hide_topics.indexOf(name) > -1 )

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Corrected sorting and changed Classic UI link

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e36156ad6e9ec5ba04b199a19fdd84564e9e7655 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e36156ad6e9ec5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 12:07:37 2012 +0100 MobileUI: Corrected sorting and changed Classic UI link --- web/htdocs/mobile.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 7fb74cd..560e334 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -120,11 +120,11 @@ def jqm_page_navfooter(items, current, page_id): def jqm_page_index(title, items): manual_sort = [_("Hosts"), _("Services"), _("Events")] + items.sort(cmp = lambda a,b: cmp((a[0],a[2]),(b[0],b[2]))) for topic in manual_sort: jqm_page_index_topic_renderer(topic, items) other_topics = list(set([ x[0] for x in items if x[0] not in manual_sort])) - other_topics.sort() for topic in other_topics: jqm_page_index_topic_renderer(topic, items) @@ -184,14 +184,16 @@ def page_index(): for view_name, view in html.available_views.items(): if view.get("mobile") and not view.get("hidden"): url = "mobile_view.py?view_name=%s" % view_name - count = "" + count = "" if not view.get("mustsearch"): count = views.show_view(view, only_count = True) - count = '<span class="ui-li-count">%d</span>' % count + count = '<span class="ui-li-count">%d</span>' % count items.append((view.get("topic"), url, '%s %s' % (view["title"], count))) jqm_page_index(_("Check_MK Mobile"), items) # Link to non-mobile GUI - html.write('<ul data-role="listview" data-inset="true">\n') + + html.write('<hr>') + 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()

12 years, 8 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: 5077c95db49f40fda554e4bf05d460eaf162da64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5077c95db49f40… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 12:07:44 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Fixed links to pnp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2eca2c917a209c228a5b4d3b9fa82d081e3fe99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2eca2c917a209… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 16:09:45 2012 +0100 MobileUI: Fixed links to pnp --- web/htdocs/mobile.css | 2 +- web/htdocs/mobile.py | 9 ++++++--- web/plugins/icons/builtin.py | 9 +++++++-- web/plugins/icons/wato.py | 2 +- web/plugins/views/mobile.py | 13 ++++++------- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 3ac57aa..4d87b2f 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -159,7 +159,7 @@ body.mobile table.data td.perfometer td.inner { | Styles for hiliting data cells in status displays | '-------------------------------------------------------------------------*/ .ui-li-aside.state { - width: 3em; + width: 4.5em; text-align: center; } diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 53bdd4e..7fb74cd 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -131,11 +131,14 @@ def jqm_page_index(title, items): def jqm_page_index_topic_renderer(topic, items): - html.write('<p>%s</p><ul data-role="listview" data-inset="true">\n' % topic) for top, href, title in items: if top == topic: - html.write('<li><a data-ajax="false" data-transition="flip" href="%s">%s</a></li>\n' % (href, title)) - html.write('</ul>') + html.write('<p>%s</p><ul data-role="listview" data-inset="true">\n' % topic) + for top, href, title in items: + if top == topic: + html.write('<li><a data-ajax="false" data-transition="flip" href="%s">%s</a></li>\n' % (href, title)) + html.write('</ul>') + return def jqm_page(title, content, foot, id=None): diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3f09af7..9b51479 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -133,8 +133,13 @@ def pnp_url(row, what, how = 'graph'): else: svc = pnp_cleanup(row["service_description"]) site = html.site_status[sitename]["site"] - url = site["url_prefix"] + ("pnp4nagios/index.php/%s?host=%s&srv=%s" % \ - (how, htmllib.urlencode(host), htmllib.urlencode(svc))) + if html.mobile: + url = site["url_prefix"] + ("pnp4nagios/index.php?kohana_uri=/mobile/%s/%s/%s" % \ + (how, htmllib.urlencode(host), htmllib.urlencode(svc))) + else: + url = site["url_prefix"] + ("pnp4nagios/index.php/%s?host=%s&srv=%s" % \ + (how, htmllib.urlencode(host), htmllib.urlencode(svc))) + if how == 'graph': url += "&theme=multisite&baseurl=%scheck_mk/" % \ htmllib.urlencode(site["url_prefix"]) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index a52c4ec..d6b38f1 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -42,7 +42,7 @@ def wato_link(folder, site, hostname, where): return "" def paint_wato(what, row, tags, custom_vars): - if not wato.may_see_hosts(): + if not wato.may_see_hosts() or html.mobile: return filename = row["host_filename"] diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 750f894..46a80bb 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -94,7 +94,7 @@ multisite_builtin_views.update({ 'num_columns': 2, 'owner': '', 'painters': [ - ('service_state_appr', None, ''), + ('service_state', None, ''), ('host', 'mobile_hoststatus', ''), ('service_description', 'mobile_service', ''), ('svc_plugin_output', '' ), @@ -148,7 +148,7 @@ multisite_builtin_views.update({ 'name': 'mobile_svcproblems', 'num_columns': 2, 'painters': [ - ('service_state_appr', None, ''), + ('service_state', None, ''), ('host', 'mobile_hoststatus', ''), ('service_description', 'mobile_service', ''), ('svc_plugin_output', '' ), @@ -199,7 +199,7 @@ multisite_builtin_views.update({ 'name': 'mobile_svcproblems_unack', 'num_columns': 2, 'painters': [ - ('service_state_appr', None, ''), + ('service_state', None, ''), ('host', 'mobile_hoststatus', ''), ('service_description', 'mobile_service', ''), ('svc_plugin_output', '' ), @@ -234,7 +234,7 @@ multisite_builtin_views.update({ 'hidden' : True, 'painters': [ ('sitealias', None, ''), - ('host', 'hoststatus', ''), + ('host', 'mobile_host', ''), ('service_description', ''), ('svc_plugin_output', None, ''), ('service_icons', None, ''), @@ -283,7 +283,7 @@ multisite_builtin_views.update({ 'name': 'mobile_svcproblems', 'num_columns': 1, 'painters': [ - ('service_state_appr', None), + ('service_state', None), ('service_description', 'mobile_service'), ('svc_plugin_output', None), ('svc_state_age', None), @@ -309,12 +309,11 @@ multisite_builtin_views.update({ 'hidden' : True, 'painters': [ ('sitealias', None), - ('host', 'host'), + ('host', 'mobile_host'), ('alias', None), ('host_icons', None), ('host_state', None), ('host_address', None), - ('host_group_memberlist', None), ('host_parents', None), ('host_childs', None), ('host_contact_groups', None),

12 years, 8 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: ad1d7c3e57120b6a2c3b10bdfaa93ce73c9b07a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad1d7c3e57120b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 09:58:04 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Added Bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80d9da3d00e7dbe0d15d7c696613676bdfeec0ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80d9da3d00e7db… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 11:07:55 2012 +0100 Added Bug --- .bugs/595 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/595 b/.bugs/595 new file mode 100644 index 0000000..f2a45fa --- /dev/null +++ b/.bugs/595 @@ -0,0 +1,9 @@ +Title: Wato Replikation Transaktionssicher machen +Component: multisite +State: open +Date: 2012-01-13 11:05:09 +Targetversion: 1.2.0 +Class: todo + +Repliziert User A in Wato änderungen und User B produziert gleichzeitig neue, verhält sich die Replizierung falsch +.

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Changed view options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9496f3c3f43c2b042e4d707c307ce14ea02b627c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9496f3c3f43c2b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 13 11:30:23 2012 +0100 MobileUI: Changed view options --- web/plugins/views/mobile.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 46a80bb..347e36e 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -208,7 +208,6 @@ multisite_builtin_views.update({ 'show_filters': [ 'service_in_notification_period', 'hoststate', - 'service_acknowledged', 'svchardstate', 'svcstate'], 'sorters': [ @@ -393,7 +392,7 @@ multisite_builtin_views.update({ ('hst1', 'on'), ('hst2', 'on'), ('hstp', ''), - ('is_host_acknowledged', '-1'), + ('is_host_acknowledged', '0'), ('host', ''), ('is_summary_host', '0'), ('opthostgroup', '') @@ -425,15 +424,15 @@ multisite_builtin_views.update({ 'mobile_hostproblems_unack': mobile_view({ 'datasource': 'hosts', 'group_painters': [('host_state_appr', None)], - 'hard_filters': ['host_scheduled_downtime_depth', 'summary_host'], + 'hard_filters': ['host_scheduled_downtime_depth', 'summary_host', 'host_acknowledged'], 'hard_filtervars': [ - ('is_host_scheduled_downtime_depth', '-1'), + ('is_host_scheduled_downtime_depth', '0'), ('is_host_in_notification_period', '-1'), ('hst0', ''), ('hst1', 'on'), ('hst2', 'on'), ('hstp', ''), - ('is_host_acknowledged', '-1'), + ('is_host_acknowledged', '0'), ('host', ''), ('is_summary_host', '0'), ('opthostgroup', '')], @@ -451,8 +450,7 @@ multisite_builtin_views.update({ 'show_filters': ['host_in_notification_period', 'hoststate', 'hostregex', - 'opthostgroup', - 'host_acknowledged'], + 'opthostgroup'], 'sorters': [], 'title': _('Problems (unhandled)'), 'topic': _('Hosts')}),

12 years, 8 months

Check_MK Git: check_mk: WATO: Supporting localized tag titles

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc975ebc3101c47c71885d6abc35a9e03641faf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc975ebc3101c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 12:05:00 2012 +0100 WATO: Supporting localized tag titles --- ChangeLog | 1 + modules/localize.py | 9 ++++----- web/htdocs/wato.py | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7825b85..7b9b9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ WATO: * Removed IP-Address attribute from folders + * Supporting localized tag titles * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import diff --git a/modules/localize.py b/modules/localize.py index 85e1650..669b41f 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -163,15 +163,14 @@ def localize_init_po(lang): def localize_sniff(): sys.stdout.write('Sniffing source code...\n') + paths = [ default_config_dir, web_dir ] if local_web_dir and os.path.exists(local_web_dir): - paths = web_dir + ' ' + local_web_dir - else: - paths = web_dir + paths.append(local_web_dir) if verbose_system('xgettext --no-wrap --sort-output --force-po ' '-L Python --from-code=utf-8 --omit-header ' - '-o %s $(find %s -type f -name \*.py | xargs) >/dev/null' % \ - (pot_file, paths)) != 0: + '-o %s $(find %s -type f -name \*.py -o -name \*.mk | xargs) >/dev/null' % \ + (pot_file, ' '.join(paths))) != 0: sys.stderr.write('Failed!\n') else: header = '''# +------------------------------------------------------------------+ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a8f5d08..e062abb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3528,15 +3528,17 @@ class HostTagAttribute(Attribute): Attribute.__init__(self, name, title, "", def_value) def paint(self, value, hostname): + # Localize the titles. To make the strings available in the scanned localization + # files the _() function must also be placed in the configuration files if len(self._taglist) == 1: title = self._taglist[0][1] if value: - return "", title + return "", _(title) else: - return "", "%s %s" % (_("not"), title) + return "", "%s %s" % (_("not"), _(title)) for entry in self._taglist: if value == entry[0]: - return "", entry[1] + return "", _(entry[1]) return "", "" # Should never happen, at least one entry should match # But case could occur if tags definitions have been changed. @@ -3556,7 +3558,7 @@ class HostTagAttribute(Attribute): secondary_tags = e[2] else: secondary_tags = [] - choices.append(("|".join([ tagvalue ] + secondary_tags), e[1])) + choices.append(("|".join([ tagvalue ] + secondary_tags), _(e[1]))) if value != "" and value == tagvalue and secondary_tags: value = value + "|" + "|".join(secondary_tags)

12 years, 8 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: d68dd1f5d34f00e7cc20dc35524efccae08b28e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d68dd1f5d34f00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 12:05:05 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 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: 498b00642b5c7de135ecca9395bf5f32fb955172 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=498b00642b5c7d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 13 11:03:15 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
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