Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64206 discussions

Check_MK Git: check_mk: FIX: fix inventory of f5_bigip_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cd6c9df47ad1e9e1d7e0af91e97bfc8117ec0cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cd6c9df47ad1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 12 18:10:10 2012 +0100 FIX: fix inventory of f5_bigip_temp --- ChangeLog | 1 + checks/f5_bigip_temp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8548556..33f32fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ on HP-UX. * if/if64: inventory also picks up type 62 (fastEther). This is needed on Cisco WLC 21xx series (thanks to Ralf Ertzinger) + * FIX: fix inventory of f5_bigip_temp Multisite: * Added several missing localization stringsw diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 80e82ce..83fbfcb 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -59,8 +59,7 @@ def f5_bigip_temp_genitem(info): def inventory_f5_bigip_temp(info): inventory = [] for sensor in f5_bigip_temp_genitem(info): - inventory.append([sensor[0], nom_temp]) - + inventory.append((sensor[0], sensor[2])) return inventory

12 years, 7 months

Check_MK Git: check_mk: Showing inventory icon only when permitted

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9fc6f8b40db77203ad75573999c21c1818b12dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9fc6f8b40db77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 16:03:48 2012 +0100 Showing inventory icon only when permitted --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index af72f16..3fc2047 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1204,7 +1204,8 @@ def show_hosts(folder): html.write("<td class=buttons>") html.icon_button(edit_url, _("Edit the properties of this host"), "edit") - html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") + if check_host_permissions(hostname, False) == True: + html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") if config.may("wato.manage_hosts"): html.icon_button(clone_url, _("Create a clone of this host"), "insert") html.icon_button(delete_url, _("Delete this host"), "delete")

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: dae7a2dfc28d229abb303c4584a6279708c077db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dae7a2dfc28d22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 16:03:57 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: The login mask honors the default_language definition now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 071e2517fb70fd1a5f28442ea78df188391f9ff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=071e2517fb70fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 11:59:34 2012 +0100 The login mask honors the default_language definition now --- .bugs/603 | 7 +++++-- .bugs/618 | 7 +++++-- ChangeLog | 1 + web/htdocs/config.py | 2 +- web/htdocs/index.py | 4 ++++ 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.bugs/603 b/.bugs/603 index 3c41bf2..a5c69c4 100644 --- a/.bugs/603 +++ b/.bugs/603 @@ -1,9 +1,9 @@ Title: default_language not honored by login maski Component: multisite -State: open +Class: bug +State: done Date: 2012-01-25 09:58:35 Targetversion: 1.2.0 -Class: bug I've translated "Username" and "Password" into 'de'. Then I've set default_language = 'de' in multisite.mk. Texts are not @@ -11,3 +11,6 @@ translated in the Cookie based login form, even after are restart of Apache. The I login, set my user language to 'de' and logout. Now the login screen is in German. After a logout the login screen is in German. Restarting Apache now switches it back to english. + +2012-02-10 11:59:32: changed state open -> done +Has just been implemented. diff --git a/.bugs/618 b/.bugs/618 index 8bf2335..cf78a5e 100644 --- a/.bugs/618 +++ b/.bugs/618 @@ -1,9 +1,9 @@ Title: Hosts Snapin berücksichtigt Nutzer Berechtigungen nicht Component: multisite -State: open +Class: bug +State: done Date: 2012-01-18 10:25:53 Targetversion: 1.2.0 -Class: bug Ich habe gerade eine leere Site mit 2 Hosts in 2 Foldern angelegt. Auf den einen ist der Nutzer berechtigt, auf den anderen nicht. Im Hosts Snapin sehe ich troztem beide @@ -13,3 +13,6 @@ Lösungsmöglichkeit: Das Snapin nur noch für die Statusgui Navigation benutzen und dann via Livestatus Query die Anzahl der Hosts herausfinden. + +2012-02-10 11:53:14: changed state open -> done +Has already been solved. The hosts snapin has been recoded. diff --git a/ChangeLog b/ChangeLog index c7feb79..ce9ea0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Chrome: Fixed styling problem of foldertree snapin * Views: Only show the commands and row selection options for views where commands are possible + * The login mask honors the default_language definition now 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 13c04e2..8273b6e 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -304,7 +304,7 @@ def login(u): def get_language(default = None): if default == None: default = default_language - return user.get('language', default) + return user and user.get('language', default) or default def roles_of_user(user): # Make sure, builtin roles are present, even if not modified diff --git a/web/htdocs/index.py b/web/htdocs/index.py index d6b0fd3..25916e5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -240,6 +240,10 @@ def handler(req, profiling = True): # While api call don't show the login dialog raise MKUnauthenticatedException(_('You are not authenticated.')) + # Initialize the i18n for the login dialog. This might be overridden + # later after user login + load_language(html.var("lang", config.get_language())) + # After auth check the regular page can be shown result = login.page_login() if type(result) == tuple:

12 years, 7 months

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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits