Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

pull latest master image before building od-nodes

by Alex Zurhake

Module: check_mk Branch: master Commit: 2525e23029f6af72e1acf5b5fd08daae423a3087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2525e23029f6af… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 5 11:49:58 2019 +0100 pull latest master image before building od-nodes Change-Id: I93ea68496cbdcddd5364d3fa5bb4e941d451b168 --- buildscripts/scripts/os-nodes.jenkins | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buildscripts/scripts/os-nodes.jenkins b/buildscripts/scripts/os-nodes.jenkins index 1aba9f3..b04dd90 100644 --- a/buildscripts/scripts/os-nodes.jenkins +++ b/buildscripts/scripts/os-nodes.jenkins @@ -13,7 +13,10 @@ currentBuild.description = currentBuild.description + '\nBuilding for the follow def DOCKER_BUILDS = [:] node { - docker.image(DOCKER_REGISTRY + '/ubuntu-18.04-common').inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).pull() + docker.image(IMAGE).inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { stage('checkout sources') { cleanWs() checkout(scm) @@ -26,7 +29,9 @@ node { DISTRO_LIST.each { DISTRO -> DOCKER_BUILDS[DISTRO] = { node { - docker.image(DOCKER_REGISTRY + '/ubuntu-18.04-common').inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { stage('build ' + DISTRO + ' os-image') { unstash name: 'dockerfiles' unstash name: 'distroinfos'

5 years, 3 months

Add sudo, npm and nodejs to centos-7 test image

by Alex Zurhake

Module: check_mk Branch: master Commit: 0789ef528a38486346efdd9cf344d6b0e239cbb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0789ef528a3848… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 5 10:13:02 2019 +0100 Add sudo, npm and nodejs to centos-7 test image Change-Id: I9e9ef30aa11bfed092788bbaacf0163ee3e45472 --- buildscripts/infrastructure/os-nodes/centos-7/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile b/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile index 31967b3..c34f575 100644 --- a/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile +++ b/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile @@ -14,10 +14,13 @@ RUN yum -y --enablerepo=extras install \ krb5-devel \ make \ mysql-devel \ + nodejs \ + npm \ openldap-devel \ python \ python-devel \ rrdtool-devel \ + sudo \ which RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py

5 years, 3 months

7205 jolokia_jvm_threading: new check for JVM threads

by Moritz Kiemer

Module: check_mk Branch: master Commit: 938a90015b03c4d4d797736761d9e61434f79c45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=938a90015b03c4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 15:21:04 2019 +0100 7205 jolokia_jvm_threading: new check for JVM threads The new check jolokia_jvm_threading is introduced. It creates the services "JVM <instance> Threading" and optionally "JVM <instance> ThreadPool <pool name>", replacing the former checks jolokia_metrics.threads and jolokia_metrics.tp. The new "JVM Threading" check now allows to set rules on the thread count as well as on the rate at which new threads are created. Additionally levels for the daemon threads can be configured. Unlike for the old check 'jolokia_metrics.threads', no default levels are imposed on the thread count. Users who had a rule in place for the ThreadCount metric of the old check need to set up a new rule "JVM threading". The "JVM ThreadPool" check applies the same rule as the previous check did (JVM tomcat threadpool levels). A rediscovery is required for affected hosts. Change-Id: Ia24f460f198aa36ba66c91bf1b35da7d13ca7568 --- .werks/7205 | 24 +++ agents/plugins/mk_jolokia.py | 53 ++++-- checkman/jolokia_jvm_threading | 22 +++ checkman/jolokia_jvm_threading.pool | 20 +++ checkman/jolokia_metrics.threads | 18 +- checkman/jolokia_metrics.tp | 16 +- checks/jolokia_jvm_threading | 143 ++++++++++++++++ checks/jolokia_metrics | 183 ++++----------------- .../plugins/wato/check_parameters/jvm_threading.py | 78 +++++++++ .../plugins/wato/check_parameters/jvm_threads.py | 4 + .../datasets/jolokia_jvm_threading_regression.py | 44 +++++ 11 files changed, 406 insertions(+), 199 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=938a90015b…

5 years, 3 months

CMK-1723: Add integration test in docker containers for all supported OSes. Some tests still failing and need some work -- see ticket

by Alex Zurhake

Module: check_mk Branch: master Commit: 0dab40e32156978b270a43b516aebf28ca80e892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dab40e3215697… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Feb 26 09:35:53 2019 +0100 CMK-1723: Add integration test in docker containers for all supported OSes. Some tests still failing and need some work -- see ticket Change-Id: I9b774f3fb8fcaa8eaab2a35d52db5aff8ac2f70c --- .../infrastructure/os-nodes/centos-7/Dockerfile | 28 +++++ .../infrastructure/os-nodes/debian-7/Dockerfile | 45 +++++++ .../infrastructure/os-nodes/debian-8/Dockerfile | 38 ++++++ .../infrastructure/os-nodes/debian-9/Dockerfile | 37 ++++++ .../os-nodes/ubuntu-14.04/Dockerfile | 39 ++++++ .../os-nodes/ubuntu-16.04/Dockerfile | 39 ++++++ .../os-nodes/ubuntu-17.10/Dockerfile | 46 +++++++ .../os-nodes/ubuntu-18.04/Dockerfile | 39 ++++++ .../os-nodes/ubuntu-18.10/Dockerfile | 39 ++++++ .../scripts/integration-daily-master.jenkins | 132 +++++++++++++++++++++ buildscripts/scripts/os-nodes.jenkins | 49 ++++++++ 11 files changed, 531 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0dab40e321…

5 years, 3 months

6762 FIX zfsget: Aligned behaviour in Solaris and Linux

by Marcel Arentz

Module: check_mk Branch: master Commit: b0072e51244d38293b47e2a4c2bb3406c2990d64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0072e51244d38… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Feb 25 11:05:08 2019 +0100 6762 FIX zfsget: Aligned behaviour in Solaris and Linux Previously the implementation of getting zfs information was slightly different in Linux and Solaris. Now both agents are fetching data only for volumes and filesystems and are using the quota for computing the total size of a filesystem or volume. So the information of each service will be more precise. FEED-3375 Change-Id: I22d5f57c62a028af56b1bdf52b58e119b62f4588 --- .werks/6762 | 13 +++++++++++++ agents/check_mk_agent.linux | 3 +-- agents/check_mk_agent.solaris | 5 +---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.werks/6762 b/.werks/6762 new file mode 100644 index 0000000..1280d4b --- /dev/null +++ b/.werks/6762 @@ -0,0 +1,13 @@ +Title: zfsget: Fixed different behaviour of the plugin in Solaris and Linux +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551088721 +Class: fix + +Previously the implementation of getting zfs information was slightly +different in Linux and Solaris. Now both agents are fetching data only for +volumes and filesystems and are using the quota for computing the total size of +a filesystem or volume. So the information of each service will be more precise. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8f1c447..6690f95 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -399,8 +399,7 @@ sections_systemd # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' - zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ - zfs get -Hp name,quota,used,avail,mountpoint,type + zfs get -t filesystem,volume -Hp name,quota,used,avail,mountpoint,type 2>/dev/null echo '[df]' df -PTlk -t zfs | sed 1d fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 002afda..1c5bc66 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -199,10 +199,7 @@ done if type zfs &>/dev/null then echo '<<<zfsget>>>' - zfs get -Hp name,usedbydataset,avail,mountpoint,type | sed 's/usedbydataset/used/g' 2>/dev/null - if [ $? -ne 0 ] ; then - zfs get -Hp name,referenced,avail,mountpoint,type | sed 's/referenced/used/g' - fi + zfs get -t filesystem,volume -Hp name,quota,used,avail,mountpoint,type 2>/dev/null echo '[df]' df -l -k -F zfs 2>/dev/null | sed 1d fi

5 years, 3 months

Start moving view logic into dedicated object

by Lars Michelsen

Module: check_mk Branch: master Commit: fe8e667f9813fb2f5ad915862f575a5807a3059a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe8e667f9813fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 19:53:27 2019 +0100 Start moving view logic into dedicated object The goal is to restructure the view processing logic classes that separate the logic and make the whole view rendering easier to understand. First steps: Move logic from page_view() and show_view() to the new View() class to be able to clean up some hacks related to availability and SLA processing. Change-Id: Ic1da2b56dd361cce33f1a02d867c2681d4a0f197 --- cmk/gui/views.py | 148 +++++++++++++++++++++------------------ tests/unit/cmk/gui/test_views.py | 37 +++++++--- 2 files changed, 105 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fe8e667f98…

5 years, 3 months

Make view object available in all view render functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 64b944c61c97ac3df1e2ee9e5648239eae9aaad3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64b944c61c97ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 19:07:47 2019 +0100 Make view object available in all view render functions Change-Id: I74ce0d1baad1a53ab5d434e171cc86b1b5ea5211 --- cmk/gui/mobile.py | 37 +++++++++++++++++++---------------- cmk/gui/plugins/dashboard/view.py | 3 ++- cmk/gui/views.py | 41 ++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64b944c61c…

5 years, 3 months

Move individual view rendering to specific classes

by Lars Michelsen

Module: check_mk Branch: master Commit: e5b3d27fd7c2dc72a77e9938272b6b4e4af03e92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5b3d27fd7c2dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 19:27:25 2019 +0100 Move individual view rendering to specific classes * View rendering is done by ViewRenderer() sub classes in the future * Initially moved the main render functions to GUIViewRenderer, MobileViewRenderer and ReportViewRenderer classses * These classes will be populated step by step now Change-Id: Ia3ecdb8f10a180b01da8a93ec2947ada98cebd94 --- cmk/gui/mobile.py | 147 ++++++++-------- cmk/gui/plugins/dashboard/view.py | 4 +- cmk/gui/views.py | 360 ++++++++++++++++++++------------------ 3 files changed, 262 insertions(+), 249 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5b3d27fd7…

5 years, 3 months

Removed unused browser_reload argument from ViewRenderer.render()

by Lars Michelsen

Module: check_mk Branch: master Commit: 65bdea584f8b4cd4bdde409c577ba6ecb1662b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65bdea584f8b4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 20:04:13 2019 +0100 Removed unused browser_reload argument from ViewRenderer.render() Change-Id: Ibbf014ed98135bf2e64b7f20b3c8ac927c7b1458 --- cmk/gui/mobile.py | 3 +-- cmk/gui/views.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index 0a637ff..ad2774c 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -300,8 +300,7 @@ def page_view(): class MobileViewRenderer(views.ViewRenderer): - def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, - browser_reload): + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters): view_spec = self.view.spec home = ("mobile.py", "Home", "home") diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 71b9cfe..82b3840 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -235,8 +235,7 @@ class ViewRenderer(object): self.view = view @abc.abstractmethod - def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, - browser_reload): + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters): raise NotImplementedError() @@ -245,8 +244,7 @@ class GUIViewRenderer(ViewRenderer): super(GUIViewRenderer, self).__init__(view) self._show_buttons = show_buttons - def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters, - browser_reload): + def render(self, rows, group_cells, cells, show_checkboxes, layout, num_columns, show_filters): view_spec = self.view.spec if html.transaction_valid() and html.do_actions(): @@ -1352,7 +1350,7 @@ def show_view(view, view_renderer, only_count=False, limit=None): # Until now no single byte of HTML code has been output. # Now let's render the view view_renderer.render(rows, group_cells, cells, show_checkboxes, layout, num_columns, - show_filters, browser_reload) + show_filters) SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"])

5 years, 3 months

Removed datasource argument from ViewRenderer.render()

by Lars Michelsen

Module: check_mk Branch: master Commit: a5010632542c555290841a7715c9fd38086d68ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5010632542c55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 3 19:50:58 2019 +0100 Removed datasource argument from ViewRenderer.render() Change-Id: I84019043a88adb0f2eea091c6cd0fdc30a65f123 --- cmk/gui/mobile.py | 10 +++++----- cmk/gui/views.py | 35 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index 6dd48b1..6ee9323 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -301,8 +301,8 @@ def page_view(): class MobileViewRenderer(views.ViewRenderer): - def render(self, rows, datasource, group_cells, cells, show_heading, show_buttons, - show_checkboxes, layout, num_columns, show_filters, show_footer, browser_reload): + def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, + num_columns, show_filters, show_footer, browser_reload): view_spec = self.view.spec home = ("mobile.py", "Home", "home") @@ -338,13 +338,13 @@ class MobileViewRenderer(views.ViewRenderer): show_commands = True if html.request.has_var("_do_actions"): try: - show_commands = do_commands(view_spec, datasource["infos"][0], rows) + show_commands = do_commands(view_spec, self.view.datasource.infos[0], rows) except MKUserError as e: html.show_error(e) html.add_user_error(e.varname, e) show_commands = True if show_commands: - show_command_form(view_spec, datasource, rows) + show_command_form(view_spec, self.view.datasource, rows) jqm_page_navfooter(navbar, 'commands', page_id) elif page == "data": @@ -401,7 +401,7 @@ def show_filter_form(show_filters): def show_command_form(view, datasource, rows): - what = datasource["infos"][0] + what = datasource.infos[0] html.javascript(""" $(document).ready(function() { $('.command_group').has('x').trigger('expand'); diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 114d8d3..d66274f 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -235,14 +235,14 @@ class ViewRenderer(object): self.view = view @abc.abstractmethod - def render(self, rows, datasource, group_cells, cells, show_heading, show_buttons, - show_checkboxes, layout, num_columns, show_filters, show_footer, browser_reload): + def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, + num_columns, show_filters, show_footer, browser_reload): raise NotImplementedError() class GUIViewRenderer(ViewRenderer): - def render(self, rows, datasource, group_cells, cells, show_heading, show_buttons, - show_checkboxes, layout, num_columns, show_filters, show_footer, browser_reload): + def render(self, rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, layout, + num_columns, show_filters, show_footer, browser_reload): view_spec = self.view.spec if html.transaction_valid() and html.do_actions(): @@ -263,16 +263,16 @@ class GUIViewRenderer(ViewRenderer): # This is a general flag which makes the command form render when the current # view might be able to handle commands. When no commands are possible due missing # permissions or datasources without commands, the form is not rendered - command_form = should_show_command_form(datasource) + command_form = should_show_command_form(self.view.datasource) if command_form: weblib.init_selection() if show_buttons: show_combined_graphs_button = \ - ("host" in datasource.infos or "service" in datasource.infos) and \ - (isinstance(datasource.table, str)) and \ - ("host" in datasource.table or "service" in datasource.table) + ("host" in self.view.datasource.infos or "service" in self.view.datasource.infos) and \ + (isinstance(self.view.datasource.table, str)) and \ + ("host" in self.view.datasource.table or "service" in self.view.datasource.table) _show_context_links( view_spec, show_filters, @@ -282,7 +282,8 @@ class GUIViewRenderer(ViewRenderer): layout.can_display_checkboxes and not view_spec.get("force_checkboxes"), show_checkboxes, # Show link to availability - datasource.table in ["hosts", "services"] or "aggr" in datasource.infos, + self.view.datasource.table in ["hosts", "services"] or + "aggr" in self.view.datasource.infos, # Show link to combined graphs show_combined_graphs_button, ) @@ -311,16 +312,17 @@ class GUIViewRenderer(ViewRenderer): try: # Create URI with all actions variables removed backurl = html.makeuri([], delvars=['filled_in', 'actions']) - has_done_actions = do_actions(view_spec, datasource.infos[0], rows, backurl) + has_done_actions = do_actions(view_spec, self.view.datasource.infos[0], rows, + backurl) except MKUserError as e: html.show_error(e) html.add_user_error(e.varname, e) if display_options.enabled(display_options.C): - show_command_form(True, datasource) + show_command_form(True, self.view.datasource) elif display_options.enabled( display_options.C): # (*not* display open, if checkboxes are currently shown) - show_command_form(False, datasource) + show_command_form(False, self.view.datasource) # Also execute commands in cases without command form (needed for Python- # web service e.g. for NagStaMon) @@ -333,7 +335,7 @@ class GUIViewRenderer(ViewRenderer): rows = filter_by_row_id(view_spec, rows) try: - do_actions(view_spec, datasource.infos[0], rows, '') + do_actions(view_spec, self.view.datasource.infos[0], rows, '') except: pass # currently no feed back on webservice @@ -364,7 +366,7 @@ class GUIViewRenderer(ViewRenderer): update_context_links( # don't take display_options into account here ('c' is set during reload) row_count > 0 and - should_show_command_form(datasource, ignore_display_option=True), + should_show_command_form(self.view.datasource, ignore_display_option=True), # and not html.do_actions(), layout.can_display_checkboxes) @@ -1355,9 +1357,8 @@ def show_view(view, # Until now no single byte of HTML code has been output. # Now let's render the view - view_renderer.render(rows, view.datasource, group_cells, cells, show_heading, show_buttons, - show_checkboxes, layout, num_columns, show_filters, show_footer, - browser_reload) + view_renderer.render(rows, group_cells, cells, show_heading, show_buttons, show_checkboxes, + layout, num_columns, show_filters, show_footer, browser_reload) SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"])

5 years, 3 months

← Newer
1
...
37
38
39
40
41
42
43
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019