Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 14c1361e24519a161906b3a26d6760df0d53fa86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14c1361e24519a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 16:10:16 2017 +0200 Updated bug entries #2901 Change-Id: I5fd85c852dde1f67728280dcb70028796057e40b --- .bugs/2901 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2901 b/.bugs/2901 new file mode 100644 index 0000000..28460da --- /dev/null +++ b/.bugs/2901 @@ -0,0 +1,13 @@ +Title: WATO rule edit/delete: Rules are referenced by list index (can delete/edit wrong rule) +Component: wato +State: open +Date: 2017-05-09 16:06:49 +Targetversion: 1.5.0 +Class: bug + +When multiple users edit the same ruleset for example by moving deleting rules they can edit wrong rules +by accident. This can happen because the rules are identified by their position in the ruleset list which +is really bad when doing actions with an outdated view. + +We either need to store a hash/token of the previous configuration, send it with the edit action and +compare it when applying a new change or we need to add some permanent identity to the rules.

7 years, 4 months

Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 70028c3072653ecb1176040e3906ee3b118bed7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70028c3072653e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 16:06:29 2017 +0200 Reserved 20 bug IDS Change-Id: Idc5544a7f69b98ae1cd54d5a2060360a40760606 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index c914c6a..abe0cf8 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2901 +2921

7 years, 4 months

4670 FIX Fixed exception when trying to edit not existing BI aggregation

by Lars Michelsen

Module: check_mk Branch: master Commit: 85a6e062eda020f3e61e55fec55790c330840dab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85a6e062eda020… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 14:24:48 2017 +0200 4670 FIX Fixed exception when trying to edit not existing BI aggregation Change-Id: I0e4faedadccd2d6f5381727010c197b35699b68b --- .werks/4670 | 11 +++++++++++ web/plugins/wato/bi.py | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/4670 b/.werks/4670 new file mode 100644 index 0000000..e090f46 --- /dev/null +++ b/.werks/4670 @@ -0,0 +1,11 @@ +Title: Fixed exception when trying to edit not existing BI aggregation +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494332654 + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index edefa22..895f370 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -72,7 +72,7 @@ class ModeBI(WatoMode): if html.has_var("pack"): self._pack_id = html.var("pack") if self._pack_id not in self._packs: - raise MKGeneralException(_("Invalid URL. BI pack %s does not exist.") % html.attrencode(self._pack_id)) + raise MKGeneralException(_("The BI pack '%s' does not exist.") % html.attrencode(self._pack_id)) self._pack = self._packs[self._pack_id] else: self._pack_id = None @@ -1284,8 +1284,10 @@ class ModeBIEditAggregation(ModeBI): self._edited_aggregation = { "groups" : [ _("Main") ] } else: self._new = False - self._edited_aggregation = self._pack["aggregations"][self._edited_nr] - + try: + self._edited_aggregation = self._pack["aggregations"][self._edited_nr] + except IndexError: + raise MKUserError("id", _("This aggregation does not exist.")) def title(self):

7 years, 4 months

4668 FIX Fixed editing of cluster properties

by Lars Michelsen

Module: check_mk Branch: master Commit: 31a58a1d95e47d91020d430f9d933b3635d502d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31a58a1d95e47d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 13:56:24 2017 +0200 4668 FIX Fixed editing of cluster properties Editing of cluster host properties (except nodes) was not possible. When loading and saving a cluster the set attributes of the cluster were lost. Change-Id: I6ecc183d1213b388856a44d82f192c0ef0c20650 --- .werks/4668 | 12 ++++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4668 b/.werks/4668 new file mode 100644 index 0000000..e5fb785 --- /dev/null +++ b/.werks/4668 @@ -0,0 +1,12 @@ +Title: Fixed editing of cluster properties +Level: 2 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494330927 + +Editing of cluster host properties (except nodes) was not possible. When loading and +saving a cluster the set attributes of the cluster were lost. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3aa7d14..4279ffb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1418,7 +1418,7 @@ def vs_cluster_nodes(): # Called by mode_edit_host() for new/clone/edit def action_edit_host(mode, hostname, is_cluster): - attributes = collect_attributes("host") + attributes = collect_attributes("host" if not is_cluster else "cluster") if is_cluster: cluster_nodes = vs_cluster_nodes().from_html_vars("nodes")

7 years, 4 months

BI: Fixed exception when trying to edit/clone not existing BI rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 490526e1aef0e81a9ee25e4a7e89f9ec98afe79f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=490526e1aef0e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 14:28:15 2017 +0200 BI: Fixed exception when trying to edit/clone not existing BI rule Change-Id: I033c229a4d9ce92e868621e2c4173802076bc606 --- web/plugins/wato/bi.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 895f370..5db13df 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1431,11 +1431,17 @@ class ModeBIEditRule(ModeBI): if self._new: cloneid = html.var("clone") if cloneid: - value = self._pack["rules"][cloneid] + try: + value = self._pack["rules"][cloneid] + except KeyError: + raise MKGeneralException(_("This BI rule does not exist")) else: value = {} else: - value = self._pack["rules"][self._ruleid] + try: + value = self._pack["rules"][self._ruleid] + except KeyError: + raise MKGeneralException(_("This BI rule does not exist")) html.begin_form("birule", method="POST") self.valuespec().render_input("rule", value)

7 years, 4 months

4667 FIX Cluster edit page: Removed useless "network scan" properties

by Lars Michelsen

Module: check_mk Branch: master Commit: 8526b1515652811fe71b7ad39804207d4222f101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8526b151565281… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 9 13:34:48 2017 +0200 4667 FIX Cluster edit page: Removed useless "network scan" properties Change-Id: Ibac7469a1b924b1040db1fe8355120434c04267d --- .werks/4667 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4667 b/.werks/4667 new file mode 100644 index 0000000..a9a7a05 --- /dev/null +++ b/.werks/4667 @@ -0,0 +1,11 @@ +Title: Cluster edit page: Removed useless "network scan" properties +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494329668 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index db5e09a..1131060 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2637,7 +2637,7 @@ class Attribute: # Gets the type of current view as argument and returns whether or not # this attribute is shown in this type of view def is_visible(self, for_what): - if for_what in [ "host", "bulk" ] and not self.show_in_form(): + if for_what in [ "host", "cluster", "bulk" ] and not self.show_in_form(): return False elif for_what == "folder" and not self.show_in_folder(): return False

7 years, 4 months

modified .gitignore

by Marcel Schulte

Module: check_mk Branch: master Commit: eff287fc99f9f283003eed8a601e6e98f41d9a50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eff287fc99f9f2… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue May 9 15:35:33 2017 +0200 modified .gitignore Change-Id: I9b0df263384531310efb630793e5c4c8dba8740c --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 735ca95..701b3cb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ stamp-h1 tags tests/web/data/* var/ +.idea/

7 years, 4 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 0e41d37800df84b70ae655804c6a7c723adad9c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e41d37800df84… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 9 15:11:50 2017 +0200 minor cleanup Change-Id: I36309eeef0a1e025df6cf3ea61f5371f7a2d48b0 --- checks/oracle_tablespaces | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 93ab8d4..a2a9a5b 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -279,9 +279,8 @@ def check_oracle_tablespaces(item, params, parsed): if incsize == datafile["block_size"]: uses_default_increment = True - incs = free_extension / incsize - num_increments += incs - increment_size += incsize * incs + num_increments += (free_extension / incsize) + increment_size += free_extension if db_version >= 11: # Newer versions of Oracle uses every time the remaining space of the

7 years, 4 months

4546 lnx_packages: Now inventorizes also release numbers of rpm based Distributions

by Marcel Arentz

Module: check_mk Branch: master Commit: e7874852ed8ce5ae52881c43f084f1990657838c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7874852ed8ce5… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Mar 21 14:21:24 2017 +0100 4546 lnx_packages: Now inventorizes also release numbers of rpm based Distributions Change-Id: I7293b87db404d55e4b7a1e977c757d31391f22c6 --- .werks/4546 | 10 ++++++++++ agents/plugins/mk_inventory.linux | 4 ++-- inventory/lnx_packages | 11 ++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/4546 b/.werks/4546 new file mode 100644 index 0000000..2c938b5 --- /dev/null +++ b/.werks/4546 @@ -0,0 +1,10 @@ +Title: lnx_packages: Now inventorizes also release numbers of rpm based Distributions +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490102404 +Class: feature + + diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 8906739..ea8a53f 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -41,13 +41,13 @@ then # List of DEB packages if type dpkg-query >/dev/null; then echo "<<<lnx_packages:sep(124):persist($UNTIL)>>>" - dpkg-query --show --showformat='${Package}|${Version}|${Architecture}|deb|${Summary}|${Status}\n' + dpkg-query --show --showformat='${Package}|${Version}|${Architecture}|deb|-|${Summary}|${Status}\n' fi # List of RPM packages in same format if type rpm >/dev/null; then echo "<<<lnx_packages:sep(9):persist($UNTIL)>>>" - rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{SUMMARY}\t-\n' + rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{RELEASE}\t%{SUMMARY}\t-\n' fi # List Gentoo packages diff --git a/inventory/lnx_packages b/inventory/lnx_packages index 8699018..3eb86d9 100644 --- a/inventory/lnx_packages +++ b/inventory/lnx_packages @@ -52,7 +52,14 @@ def inv_lnx_packages(info): paclist = inv_tree_list("software.packages:") - for pacname, version, arch, pactype, summary, inststate in info: + + for line in info: + if len(line) == 6: + pacname, version, arch, pactype, summary, inststate = line + release = "-" + elif len(line) == 7: + pacname, version, arch, pactype, release, summary, inststate = line + if pactype == "deb": if "installed" not in inststate: continue @@ -72,6 +79,8 @@ def inv_lnx_packages(info): version, package_version = parts entry["version"] = version entry["package_version"] = package_version + if not release == "-": + entry["package_version"] = release paclist.append(entry)

7 years, 4 months

4545 hpux_tunables: All services will now have thresholds

by Marcel Arentz

Module: check_mk Branch: master Commit: 61bda3bd8e3a44096ebfd404b14a5cdb32f3a968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61bda3bd8e3a44… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Mar 21 11:14:21 2017 +0100 4545 hpux_tunables: All services will now have thresholds Only two services created by hpux_tunables used thresholds. Now all of them have them set. The created services are: Number of IPC Semaphore IDs Number of IPC Semaphores Number of open files Number of processes Number of shares memory segments Number of threads Change-Id: Ic7356f5f5f1ea82632fdfcf40c5bd1ce7455396a --- .werks/4545 | 17 +++ checks/hpux_tunables | 301 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 258 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61bda3bd8e…

7 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017