Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5623 FIX lnx_if: Do not ignore interface any more if no speed information is available

by Simon Betz

Module: check_mk Branch: master Commit: d709daf05f06347332b2c144c045ef818e02e229 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d709daf05f0634… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 26 10:49:35 2018 +0100 5623 FIX lnx_if: Do not ignore interface any more if no speed information is available Change-Id: If4125e3d0f73ea30d3724468a33e799575d90b6d --- .werks/5623 | 11 +++++++++++ inventory/lnx_if | 4 ++-- web/plugins/views/inventory.py | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/5623 b/.werks/5623 new file mode 100644 index 0000000..1baaa1a --- /dev/null +++ b/.werks/5623 @@ -0,0 +1,11 @@ +Title: lnx_if: Do not ignore interface any more if no speed information is available +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516960129 + + diff --git a/inventory/lnx_if b/inventory/lnx_if index be1b8de..2794079 100644 --- a/inventory/lnx_if +++ b/inventory/lnx_if @@ -42,7 +42,7 @@ def inv_lnx_if(parsed, params): if_in_errors, if_out_octets, outucast, outmcast, outbcast, \ if_out_discards, if_out_errors, if_out_qlen, if_alias, if_phys_address in parsed: - if if_type in ( "231", "232" ) or not if_speed: + if if_type in ( "231", "232" ): continue # Useless entries for "TenGigabitEthernet2/1/21--Uncontrolled" # Ignore useless half-empty tables (e.g. Viprinet-Router) @@ -50,7 +50,7 @@ def inv_lnx_if(parsed, params): "index" : int(if_index), "description" : if_descr, "alias" : if_alias, - "speed" : int(if_speed), + "speed" : if_speed, "phys_address" : render_mac_address(if_phys_address), "oper_status" : int(if_oper_status), "port_type" : int(if_type), diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index c05cafb..bb53846 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -252,10 +252,10 @@ def inv_paint_bytes_rounded(b): def inv_paint_nic_speed(bits_per_second): - if bits_per_second == 0: - return "", "" + if bits_per_second: + return "number", nic_speed_human_readable(int(bits_per_second)) else: - return "number", nic_speed_human_readable(bits_per_second) + return "", "" def inv_paint_if_oper_status(oper_status):

6 years, 7 months

5257 FIX Fixed broken creation of new tag groups and auxilary tags

by Andreas Boesl

Module: check_mk Branch: master Commit: d8fe4bccae347885d5c5ef6a505399dcaacc6a65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8fe4bccae3478… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 26 10:44:02 2018 +0100 5257 FIX Fixed broken creation of new tag groups and auxilary tags Change-Id: I4eb2ec89638c20380c00294d240817ca86c36466 --- .werks/5257 | 10 ++++++++++ web/htdocs/watolib.py | 14 ++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.werks/5257 b/.werks/5257 new file mode 100644 index 0000000..e6c8541 --- /dev/null +++ b/.werks/5257 @@ -0,0 +1,10 @@ +Title: Fixed broken creation of new tag groups and auxilary tags +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516959691 +Class: fix + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b2e8c2d..f650544 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6139,20 +6139,18 @@ def configured_aux_tags(): return get_effective_aux_tags(config.wato_aux_tags) -# When a tag group is not defined in the users tag groups, -# it must be a builtin tag group def is_builtin_host_tag_group(tag_group_id): - for tag_group in config.wato_host_tags: + for tag_group in builtin_host_tags: if tag_group[0] == tag_group_id: - return False - return True + return True + return False def is_builtin_aux_tag(taggroup_id): - for builtin_taggroup in config.wato_aux_tags: + for builtin_taggroup in builtin_aux_tags: if builtin_taggroup[0] == taggroup_id: - return False - return True + return True + return False def save_hosttags(hosttags, auxtags):

6 years, 7 months

Windows: write junit.xml in bindir

by Jukka Aro

Module: check_mk Branch: master Commit: 0f406897b93247aca37f7755aec6096de7cf2557 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f406897b93247… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 26 10:18:33 2018 +0100 Windows: write junit.xml in bindir Jenkins needs to copy it from there to its workspace as workspace dir is not mounted in chroot. --- agents/windows/.gitignore | 2 +- agents/windows/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 601cf2b..72a756e 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -19,4 +19,4 @@ chroot *.exe *.msi Makefile.in - +junit.xml diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index c996ec7..0245aa1 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -17,7 +17,7 @@ wmitest_LDADD = $(LD_COMMON) pytest = /usr/bin/env pytest pytest_options = --maxfail=10 -pytest_jenkins = $(pytest_options) --junitxml=$$WORKSPACE/results/junit.xml +pytest_jenkins = $(pytest_options) --junitxml=$(bindir)/junit.xml build_version: $(check_mk_agent_SOURCES:.cc=.o) echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version

6 years, 7 months

Windows: increase OHM test wait time to 5 s

by Jukka Aro

Module: check_mk Branch: master Commit: e632a964165bcfd7c912aeded7bc8ac0defab833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e632a964165bcf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 26 10:16:16 2018 +0100 Windows: increase OHM test wait time to 5 s --- agents/windows/it/test_section_openhardwaremonitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index 020bc7c..249c138 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -27,7 +27,7 @@ def testconfig(request, config): def wait_agent(): def inner(): # Wait a little so that OpenHardwareMonitorCLI.exe starts properly. - time.sleep(3) + time.sleep(5) return inner

6 years, 7 months

5657 FIX Custom user attributes that are not editable by the user can now edited by the admin

by Lars Michelsen

Module: check_mk Branch: master Commit: c3c22850bcf81737265a7bf1ffa70fa8a1a1ad08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c22850bcf817… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 10:14:28 2018 +0100 5657 FIX Custom user attributes that are not editable by the user can now edited by the admin Change-Id: If6e6bdd2dbb5c1e5758af36507f6a052aa3f9f8e --- .werks/5657 | 11 +++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5657 b/.werks/5657 new file mode 100644 index 0000000..a6cb47d --- /dev/null +++ b/.werks/5657 @@ -0,0 +1,11 @@ +Title: Custom user attributes that are not editable by the user can now edited by the admin +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516958049 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb28caf..3926ade 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10825,7 +10825,7 @@ def mode_edit_user(phase): vs = attr['valuespec'] forms.section(_u(vs.title())) - if attr['user_editable'] and not is_locked(name): + if not is_locked(name): vs.render_input("ua_" + name, user.get(name, vs.default_value())) else: html.write(vs.value_to_text(user.get(name, vs.default_value())))

6 years, 7 months

5656 FIX Report edit: Add validation that reports can not use layouts from itself

by Lars Michelsen

Module: check_mk Branch: master Commit: 118033f690da4fcfe6495d0904b264afc19d397b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=118033f690da4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 25 17:32:01 2018 +0100 5656 FIX Report edit: Add validation that reports can not use layouts from itself Change-Id: Ibee739b638b9bbb7245c97d5d99bbdffdb8010ed --- .werks/5656 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5656 b/.werks/5656 new file mode 100644 index 0000000..9642a55 --- /dev/null +++ b/.werks/5656 @@ -0,0 +1,11 @@ +Title: Report edit: Add validation that reports can not use layouts from itself +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i3 +Date: 1516897861 + +

6 years, 7 months

windows agent: Only care about ssh setup when running integrationtest

by Lars Michelsen

Module: check_mk Branch: master Commit: 77bd21d77c9d5e6c18646fe17224d674cb397652 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77bd21d77c9d5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 09:49:38 2018 +0100 windows agent: Only care about ssh setup when running integrationtest Change-Id: I26e51b758794c30fc1f706164c3456ba3c3c57b9 --- agents/windows/make-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 1c744ee..5b28a31 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -87,7 +87,7 @@ echo "CHROOT_PATH is $CHROOT_PATH" fi # Copy windows test-specific ssh key pair from ~$SUDO_USER/.ssh to chroot. - if [[ ! -f "$CHROOT_PATH/home/$SUDO_USER/.ssh/id_rsa" ]] ; then + if [[ "$targets" == *integrationtest* && ! -f "$CHROOT_PATH/home/$SUDO_USER/.ssh/id_rsa" ]] ; then $script_dir/setup-ssh fi ) 200>/var/lock/cmk-make-agent_${CHROOT_PATH//\//-}.lock

6 years, 7 months

Windows integrationtest: fix jenkins user check

by Jukka Aro

Module: check_mk Branch: master Commit: f9ad28c9485b12a5dcab7c3a4ff29cf691a212c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9ad28c9485b12… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 25 16:31:33 2018 +0100 Windows integrationtest: fix jenkins user check --- agents/windows/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 5ebd491..c996ec7 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -42,7 +42,7 @@ integrationtest: install-strip cd $(bindir)/it ; \ rm -f remote.pyc ; \ rm -rf __pycache__ ; \ - if [[ $$SUDO_USER == jenkins ]] ; then \ + if [[ $$USER == jenkins ]] ; then \ $(pytest) $(pytest_jenkins) ; \ else \ $(pytest) $(pytest_options) ; \

6 years, 7 months

Fix pytest ImportMismatchError

by Jukka Aro

Module: check_mk Branch: master Commit: 66c091da7f72f7d05d8feb41b946a7de72c23f64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c091da7f72f7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 25 15:45:01 2018 +0100 Fix pytest ImportMismatchError Try to rm -rf __pycache__ as the option --cache-clear did not seem to help or did its job too late. --- agents/windows/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 13b65f3..5ebd491 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -16,7 +16,7 @@ WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) wmitest_LDADD = $(LD_COMMON) pytest = /usr/bin/env pytest -pytest_options = --cache-clear --maxfail=10 +pytest_options = --maxfail=10 pytest_jenkins = $(pytest_options) --junitxml=$$WORKSPACE/results/junit.xml build_version: $(check_mk_agent_SOURCES:.cc=.o) @@ -41,6 +41,7 @@ unittest: WindowsAgentTest$(EXEEXT) integrationtest: install-strip cd $(bindir)/it ; \ rm -f remote.pyc ; \ + rm -rf __pycache__ ; \ if [[ $$SUDO_USER == jenkins ]] ; then \ $(pytest) $(pytest_jenkins) ; \ else \

6 years, 7 months

Windows: increase wait time for OHM tests

by Jukka Aro

Module: check_mk Branch: master Commit: 2444a471ce71eefe43c5abb9c8d8f729ece2095e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2444a471ce71ee… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 25 15:28:39 2018 +0100 Windows: increase wait time for OHM tests Wait 3 s in order to give OpenHardwareMonitorCLI.exe some more time to start. Waiting only 1 s was not enough, the test was failing quite often as OHM was not running properly and not giving any output yet. --- agents/windows/it/test_section_openhardwaremonitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index a459176..020bc7c 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -27,7 +27,7 @@ def testconfig(request, config): def wait_agent(): def inner(): # Wait a little so that OpenHardwareMonitorCLI.exe starts properly. - time.sleep(1) + time.sleep(3) return inner

6 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018