Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: Added missing localization strings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0554c694e71c7c1e775546a31cafcbea2a62936 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0554c694e71c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 16:00:00 2012 +0100 Added missing localization strings --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 821b490..03fa20c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -85,7 +85,7 @@ def views_by_topic(): s.sort() # Enforce a certain order on the topics - known_topics = [ _('Dashboards'), "Hosts", "Hostgroups", "Services", "Servicegroups", + known_topics = [ _('Dashboards'), _("Hosts"), _("Hostgroups"), _("Services"), _("Servicegroups"), _("Business Intelligence"), _("Problems"), _("Addons") ] result = []

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0625

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7889c882bbc143030b85d062e97d6f56653733c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7889c882bbc143… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 14:57:53 2012 +0100 Updated bug entries #0625 --- .bugs/625 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/625 b/.bugs/625 index a7f8848..9eb1c91 100644 --- a/.bugs/625 +++ b/.bugs/625 @@ -1,9 +1,9 @@ Title: OMD: Probleme im Shared-Mode Component: wato -State: open +Class: bug +State: done Date: 2012-01-23 17:19:31 Targetversion: 1.2.0 -Class: bug Hallo Lars, @@ -58,3 +58,6 @@ Danke fuer eine kurze Antwort. Gruesse, Andreas + +2012-02-10 12:04:56: changed state open -> done +Has been fixed in OMD. The etc/htpasswd has now 664 credentials by default.

12 years, 4 months

Check_MK Git: check_mk: Add interface type 62 (fastEther)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91af45773b6bd8a1b733dad525c26d72cf759c5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91af45773b6bd8… Author: Ralf Ertzinger <re(a)addix.net> Date: Thu Feb 9 16:43:58 2012 +0100 Add interface type 62 (fastEther) The Cisco WLC 21xx series describes it's interfaces as type 62 (fastEther) instead of 6 (ethernetCsmacd). --- ChangeLog | 2 ++ checks/if.include | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad9d2f1..84034f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ * Fix Perf-O-Meter of fileage * hpux_snmp_cs.cpu: new SNMP check for CPU utilization on HP-UX. + * if/if64: inventory also picks up type 62 (fastEther). This + is needed on Cisco WLC 21xx series (thanks to Ralf Ertzinger) Multisite: * Added several missing localization stringsw diff --git a/checks/if.include b/checks/if.include index 58203ce..f1ebe87 100644 --- a/checks/if.include +++ b/checks/if.include @@ -26,7 +26,7 @@ # Functions and definitions used by if and if64 -if_inventory_porttypes = [ '6', '32', '117' ] +if_inventory_porttypes = [ '6', '32', '62', '117' ] if_inventory_portstates = [ '1' ] if_inventory_uses_description = False if_inventory_uses_alias = False

12 years, 4 months

Check_MK Git: check_mk: FIX: do not use isdisjoint() ( was in rule editor on Lenny)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7cee259b6b810e7df9fe84949413a57525fa6c3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cee259b6b810e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 10 15:52:28 2012 +0100 FIX: do not use isdisjoint() (was in rule editor on Lenny) --- ChangeLog | 1 + web/htdocs/lib.py | 6 ++++++ web/htdocs/wato.py | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0bbce..ad9d2f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * FIX: fix bug in inventory in validate_datatype() * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD + * FIX: do not use isdisjoint() (was in rule editor on Lenny) Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 0bc28e9..29736ff 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -194,3 +194,9 @@ def saveint(x): return int(x) except: return 0 + +def set_is_disjoint(a, b): + for elem in a: + if elem in b: + return False + return True diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a91b157..1156b75 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8396,7 +8396,7 @@ def mode_edit_ruleset(phase): img = 'imatch' else: new_keys = set(value.keys()) - if match_keys.isdisjoint(new_keys): + if set_is_disjoint(match_keys, new_keys): title = _("This rule matches and defines new parameters.") img = 'match' elif new_keys.issubset(match_keys):

12 years, 4 months

Check_MK Git: check_mk: FIX: fix bug in host_icon rule on non OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f062ebe40a91fce3293fb635d9cac9a7e0426b7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f062ebe40a91fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 10 15:48:02 2012 +0100 FIX: fix bug in host_icon rule on non OMD --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7feb79..0b0bbce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * Distributed WATO: Made all url calls using curl now * FIX: fix bug in inventory in validate_datatype() * Better output in case of inventory error + * FIX: fix bug in host_icon rule on non OMD Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 93f9cb4..f1c46c2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -626,7 +626,7 @@ class MonitoringIcon(ValueSpec): dirs = [ defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons", defaults.omd_root + "/share/check_mk/web/htdocs/images/icons" ] else: - dir = [ defaults.web_dir + "/htdocs/images/icons" ] + dirs = [ defaults.web_dir + "/htdocs/images/icons" ] icons = [] for dir in dirs:

12 years, 4 months

Check_MK Git: check_mk: WATO: fix detection of preferred peer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e3d120aa2bfc0c3eff87250c74909e63d8efefe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e3d120aa2bfc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 10 15:01:25 2012 +0100 WATO: fix detection of preferred peer --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index af72f16..a91b157 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6244,6 +6244,9 @@ def preferred_peer(): best_peer = None best_working_peer = None for site_id, site in config.allsites().items(): + if site.get("replication") == "slave": + continue # Ignore slave sites + if site_is_local(site_id): if best_peer == None or site_id < best_peer["id"]: best_peer = site

12 years, 4 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: 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, 4 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, 4 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, 4 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, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012