Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

DualListChoice: Fixed wrong title in duallistchoice header

by Lars Michelsen

Module: check_mk Branch: master Commit: f4ef40031285d3c03ae3b744c88b47bc5c92c25e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ef40031285d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 11:00:10 2017 +0100 DualListChoice: Fixed wrong title in duallistchoice header Change-Id: I43ff1fd0dac393da64e05b3af90d0da5675c5205 --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ce823b0..4fb5517 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2153,7 +2153,7 @@ class DualListChoice(ListChoice): html.open_tr() html.open_td(class_="head") - html.write("%s rows %d" %(_('Available'), self._rows)) + html.write(_('Available')) if not self._instant_add: html.a(">", href="javascript:%s;" % select_func, class_=["control", "add"]) html.close_td()

7 years, 7 months

Unbreak .f12 in livestatus and enterprise.

by Sven Panne

Module: check_mk Branch: master Commit: b6c9ce05632ce2579c0577828d48d357e9fc9c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c9ce05632ce2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 8 10:54:58 2017 +0100 Unbreak .f12 in livestatus and enterprise. Change-Id: I7a08be42e11c04742c82240a085eeccf7d42cfd1 --- Makefile | 3 ++- livestatus/.f12 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f9f6aeb..9bc1878 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,8 @@ cmc-$(VERSION).tar.gz: config.h rm -rf cmc-$(VERSION) build: config.h - $(MAKE) -C enterprise/core -j8 + LANG=C $(MAKE) -C livestatus -j8 + LANG=C $(MAKE) -C enterprise/core -j8 $(MAKE) -C enterprise/locale all install: diff --git a/livestatus/.f12 b/livestatus/.f12 index 9ea9892..b813963 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -1,9 +1,10 @@ #!/bin/bash +set -e + SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -set -e -make -C .. livestatus/config.h +make -C .. config.h make -j8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o (cd api/python ; bash .f12 )

7 years, 7 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 03c063a1e9a9b887235587938ee65b030bda4b73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03c063a1e9a9b8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 8 10:46:04 2017 +0100 minor cleanup Change-Id: I3d613d35c2888a20027174802b6503455347857f --- inventory/win_disks | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/inventory/win_disks b/inventory/win_disks index 05e7627..4e5b4fb 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -79,20 +79,25 @@ def inv_win_disks(info): if varname == "Manufacturer": array["vendor"] = value + elif varname == "InterfaceType": array["bus"] = value + elif varname == "Model": array["product"] = value + elif varname == "Name": array["fsnode"] = value + elif varname == "SerialNumber": array["serial"] = value - elif varname == "Size": - if value != "": - array["size"] = int(value) - elif varname == "MediaType": - if value != "": - array["type"] = value + + elif varname == "Size" and value != "": + array["size"] = int(value) + + elif varname == "MediaType" and value != "": + array["type"] = value + elif varname == "Signature": if value != "": array["signature"] = int(value)

7 years, 7 months

Fixed button label encoding issues in WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: eb0a998b546a8d486d8da09fc508208e6fafa90c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb0a998b546a8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 10:21:00 2017 +0100 Fixed button label encoding issues in WATO Change-Id: I668259463622d4508c3059b50cf07cd706b18d1f --- web/htdocs/wato.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb74046..10aeedd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1195,7 +1195,7 @@ def mode_editfolder(phase, new): forms.end() if new or not Folder.current().locked(): - html.button("save", _("Save & Finish"), "submit") + html.button("save", _("Save & Finish"), "submit") html.hidden_fields() html.end_form() @@ -1378,10 +1378,10 @@ def mode_edit_host(phase, new, is_cluster): forms.end() if not Folder.current().locked_hosts(): - html.button("services", _("Save & go to Services"), "submit") - html.button("save", _("Save & Finish"), "submit") + html.button("services", _("Save & go to Services"), "submit") + html.button("save", _("Save & Finish"), "submit") if not is_cluster: - html.button("diag_host", _("Save & Test"), "submit") + html.button("diag_host", _("Save & Test"), "submit") html.hidden_fields() html.end_form() @@ -4229,7 +4229,7 @@ def mode_bulk_edit(phase): html.hidden_field("host_hash", current_host_hash) configure_attributes(False, hosts, "bulk", parent = Folder.current()) forms.end() - html.button("_save", _("Save & Finish")) + html.button("_save", _("Save & Finish")) html.hidden_fields() html.end_form() @@ -4289,7 +4289,7 @@ def mode_bulk_cleanup(phase): html.write_text(_("The selected hosts have no explicit attributes")) else: forms.end() - html.button("_save", _("Save & Finish")) + html.button("_save", _("Save & Finish")) html.hidden_fields() html.end_form()

7 years, 7 months

4329 FIX mkbackup: Fixed "Operation not permitted" error when backing up to some NFS shares

by Lars Michelsen

Module: check_mk Branch: master Commit: 6da9e09cb017c91774fbf8ca6896ead409c6f443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6da9e09cb017c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 09:54:09 2017 +0100 4329 FIX mkbackup: Fixed "Operation not permitted" error when backing up to some NFS shares Change-Id: I08dc61bbf96f531762b37d28f6d354cdf2237110 --- .werks/4329 | 9 +++++++++ ChangeLog | 1 + bin/mkbackup | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/4329 b/.werks/4329 new file mode 100644 index 0000000..116e48b --- /dev/null +++ b/.werks/4329 @@ -0,0 +1,9 @@ +Title: mkbackup: Fixed "Operation not permitted" error when backing up to some NFS shares +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i4 +Date: 1486544016 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 94b3736..41aae63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 4286 SNMP MIBs of the Event Console can now be packed using MKPs... * 4269 FIX: Verifying unexpected keys in check_info while loading checks... * 4281 FIX: Fixed piggyback hosts with spaces in names leading to crashes... + * 4329 FIX: mkbackup: Fixed "Operation not permitted" error when backing up to some NFS shares Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs diff --git a/bin/mkbackup b/bin/mkbackup index 421a7cb..8ce264b 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -201,6 +201,10 @@ def set_permissions(path, uid, gid, mode): if e.errno == 13: pass # On CIFS mounts where "uid=0,forceuid,gid=1000,forcegid" mount options # are set, this is not possible. So skip over. + elif e.errno == 1: + pass # On NFS mounts where "" mount options are set, we get an + # "Operation not permitted" error when trying to change e.g. + # the group permission. else: raise @@ -210,6 +214,10 @@ def set_permissions(path, uid, gid, mode): if e.errno == 13: pass # On CIFS mounts where "uid=0,forceuid,gid=1000,forcegid" mount options # are set, this is not possible. So skip over. + elif e.errno == 1: + pass # On NFS mounts where "" mount options are set, we get an + # "Operation not permitted" error when trying to change e.g. + # the group permission. else: raise

7 years, 7 months

4328 FIX EC archive: Fixed exception in "line number column" of event detail page

by Lars Michelsen

Module: check_mk Branch: master Commit: 74af0ecc4a3e9f26b1df1e4a29447d8e38d186f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74af0ecc4a3e9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 09:53:17 2017 +0100 4328 FIX EC archive: Fixed exception in "line number column" of event detail page The error "Type Error: html.write accepts str and unicode input object only" has been fixed. Change-Id: I0fba63200f84e141a51cf8561cfa47a08380b5a0 --- .werks/4328 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/mkeventd.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4328 b/.werks/4328 new file mode 100644 index 0000000..1ef2b1b --- /dev/null +++ b/.werks/4328 @@ -0,0 +1,10 @@ +Title: EC archive: Fixed exception in "line number column" of event detail page +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1486543924 +Class: fix + +The error "Type Error: html.write accepts str and unicode input object only" has +been fixed. diff --git a/ChangeLog b/ChangeLog index 5b8fd13..94b3736 100644 --- a/ChangeLog +++ b/ChangeLog @@ -169,6 +169,7 @@ * 4312 FIX: Counting events are now also respecting the EC limits * 4314 FIX: Quick event delete icon works with checkboxes enabled now * 4322 FIX: Activate changes: Fixed exception when having EC changes and core changes while core produces a warning + * 4328 FIX: EC archive: Fixed exception in "line number column" of event detail page... HW/SW-Inventory: * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 48e4935..591f0a5 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -369,7 +369,7 @@ if mkeventd_enabled: "title" : _("Line number in log file"), "short" : _("Line"), "columns" : ["history_line" ], - "paint" : lambda row: ("number", row["history_line"]), + "paint" : lambda row: ("number", "%s" % row["history_line"]), } multisite_painters["history_time"] = {

7 years, 7 months

replaced javascript replace_all(..) function, with a more performant implemenation

by Andreas Boesl

Module: check_mk Branch: master Commit: 35f5090236d8f82555cde1d963b6ff56bcee86f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35f5090236d8f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 7 16:40:02 2017 +0100 replaced javascript replace_all(..) function, with a more performant implemenation Change-Id: I181ca1ed3445b677ef06a6fbfd0b6d3641af4faa --- web/htdocs/js/checkmk.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0d8e22b..1297202 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -45,15 +45,6 @@ function real_next_sibling(o) { return n; } -// simple string replace that replaces all occurrances. -// Unbelievable that JS does not have a builtin way to -// to that. -function replace_all(haystack, needle, r) { - while (haystack.search(needle) != -1) - haystack = haystack.replace(needle, r); - return haystack; -} - function has_class(o, cn) { if (typeof(o.className) === 'undefined') return false; @@ -2017,9 +2008,13 @@ function valuespec_listof_add(varprefix, magic) var oPrototype = document.getElementById(varprefix + "_prototype").childNodes[0].childNodes[0]; // TR var htmlcode = oPrototype.innerHTML; // replace the magic - htmlcode = replace_all(htmlcode, magic, strcount); + var re = new RegExp(magic, "g") + htmlcode = htmlcode.replace(re, strcount) + // in some cases the magic might be URL encoded. Also replace these occurences. - htmlcode = replace_all(htmlcode, encodeURIComponent(magic).replace('!', '%21'), strcount); + re = new RegExp(encodeURIComponent(magic).replace('!', '%21'), "g") + htmlcode = htmlcode.replace(re, strcount) + var oTable = document.getElementById(varprefix + "_table"); var oTbody = oTable.childNodes[0];

7 years, 7 months

WATO WebAPI: get/add/edit/delete users

by Andreas Boesl

Module: check_mk Branch: master Commit: 28edb4a88ea5771e2b22bb597a2407b710300813 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28edb4a88ea577… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 4 18:06:56 2017 +0100 WATO WebAPI: get/add/edit/delete users Change-Id: I9572c7689ee50ff91fc33a0d7532c635e3e19f91 --- web/htdocs/wato.py | 347 +++++++++++-------------------------------- web/htdocs/watolib.py | 273 +++++++++++++++++++++++++++++++++- web/plugins/webapi/webapi.py | 179 ++++++++++++++++------ 3 files changed, 491 insertions(+), 308 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=28edb4a88e…

7 years, 7 months

4023 WATO Web API: Now able to add/edit/delete htpasswd users

by Andreas Boesl

Module: check_mk Branch: master Commit: 2f0f46a2d05838a482c84e97e8afddd62d6681f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f0f46a2d05838… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 7 15:44:29 2017 +0100 4023 WATO Web API: Now able to add/edit/delete htpasswd users New functions for the WATO Web-API have been introduced. You can now manage htpasswd users with automation calls. The following (not very fleshed out) examples provide a quick overview. A more elaborate version will be written later on in our official manual. <pre> Common url prefix: http://localhost/heute/check_mk/webapi.py?_username=automation&_secret=1122... To get a list of all supported attributes, you'll need to have a look in the actual config files ~/etc/check_mk/conf.d/wato/contacts.mk ~/etc/check_mk/multisite.d/wato/users.mk Add users: curl {common_prefix}&action=add_users -d 'request={"users": {"klaus": {"alias": "mr. klaus", "password": "1234", "contactgroups": ["all"]}}}' Edit users: curl {common_prefix}&action=edit_users -d 'request={"users": {"klaus": {"set_attributes": {"alias": "mr. santa"}, "unset_attributes": ["contactgroups"]}}}' Delete users: curl {common_prefix}&action=delete_users -d 'request={"users": ["klaus", "guest12", "guest2332"]}' </pre> Change-Id: Iebbfb0f42dd4d4563662e586ef607104c2477e4b --- .werks/4023 | 32 ++++++++++++++++++++++++++++++++ ChangeLog | 1 + 2 files changed, 33 insertions(+) diff --git a/.werks/4023 b/.werks/4023 new file mode 100644 index 0000000..a9c6aa0 --- /dev/null +++ b/.werks/4023 @@ -0,0 +1,32 @@ +Title: WATO Web API: Now able to add/edit/delete htpasswd users +Level: 2 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486477736 +Class: feature + + +New functions for the WATO Web-API have been introduced. +You can now manage htpasswd users with automation calls. + +The following (not very fleshed out) examples provide a quick overview. +A more elaborate version will be written later on in our official manual. + +<pre> +Common url prefix: +http://localhost/heute/check_mk/webapi.py?_username=automation&_secret=1122... + +To get a list of all supported attributes, you'll need to have a look in the actual config files +~/etc/check_mk/conf.d/wato/contacts.mk +~/etc/check_mk/multisite.d/wato/users.mk + +Add users: +curl {common_prefix}&action=add_users -d 'request={"users": {"klaus": {"alias": "mr. klaus", "password": "1234", "contactgroups": ["all"]}}}' + +Edit users: +curl {common_prefix}&action=edit_users -d 'request={"users": {"klaus": {"set_attributes": {"alias": "mr. santa"}, "unset_attributes": ["contactgroups"]}}}' + +Delete users: +curl {common_prefix}&action=delete_users -d 'request={"users": ["klaus", "guest12", "guest2332"]}' +</pre> diff --git a/ChangeLog b/ChangeLog index bd8c0ab..5b8fd13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 4319 Reworked the service discovery dialog... * 4320 Distributed: Master site has now also site specific global settings... * 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users + * 4023 WATO Web API: Now able to add/edit/delete htpasswd users... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression)

7 years, 7 months

4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users

by Andreas Boesl

Module: check_mk Branch: master Commit: df48ae299fb543557ed9a6317a3fd38fe5c33d6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df48ae299fb543… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 7 14:51:54 2017 +0100 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users Change-Id: I8aa25c1ae3c2ab500a94554bb0f9a141e8852616 --- .werks/4022 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++---- web/htdocs/watolib.py | 7 ------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.werks/4022 b/.werks/4022 new file mode 100644 index 0000000..9d1c738 --- /dev/null +++ b/.werks/4022 @@ -0,0 +1,9 @@ +Title: Removed no longer supported (hidden) WATO feature: wato_hidden_users +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486475476 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e0f6eb8..bd8c0ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 4018 WATO WebAPI: new functions to manage host, service and contactgroups... * 4319 Reworked the service discovery dialog... * 4320 Distributed: Master site has now also site specific global settings... + * 4022 Removed no longer supported (hidden) WATO feature: wato_hidden_users * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 557dab5..ffa446c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6943,7 +6943,7 @@ def mode_groups(phase, what): # Show member of contact groups if what == "contact": - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() members = {} for userid, user in users.items(): cgs = user.get("contactgroups", []) @@ -10142,7 +10142,7 @@ def mode_users(phase): return roles = userdb.load_roles() - users = filter_hidden_users(userdb.load_users(lock = phase == 'action' and html.var('_delete'))) + users = userdb.load_users(lock = phase == 'action' and html.var('_delete')) timeperiods = load_timeperiods() contact_groups = userdb.load_group_information().get("contact", {}) @@ -10917,7 +10917,7 @@ def mode_edit_user(phase): def generate_wato_users_elements_function(none_value, only_contacts = False): def get_wato_users(nv): - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() elements = [ (name, "%s - %s" % (name, us.get("alias", name))) for (name, us) in users.items() @@ -10979,7 +10979,7 @@ def mode_roles(phase): return roles = userdb.load_roles() - users = filter_hidden_users(userdb.load_users()) + users = userdb.load_users() if phase == "action": if html.var("_delete"): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fa734a5..9b21562 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7136,13 +7136,6 @@ def save_group_information(all_groups): os.rename(filename, filename[:-4]) - -def filter_hidden_users(users): - if config.wato_hidden_users: - return dict([ (id, user) for id, user in users.items() if id not in config.wato_hidden_users ]) - else: - return users - def find_usages_of_group(name, group_type): usages = [] if group_type== 'contact':

7 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017