Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

CMK-1900: Add Raw and managed build plans

by Alex Zurhake

Module: check_mk Branch: master Commit: f0fb9ed2f0e9d09dfe326d87cba2b0d049745723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0fb9ed2f0e9d0… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Apr 9 16:12:13 2019 +0200 CMK-1900: Add Raw and managed build plans Change-Id: I2d6de5d1a690a2bb629e3f7be1ec285ce26c0a9f --- buildscripts/scripts/nightly-build.jenkins | 69 +++++++++++++++++------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 6b3b48a..b3deafb 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -2,7 +2,8 @@ import java.text.SimpleDateFormat properties([ parameters([ - string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ) + string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ), + string(name: 'EDITION', defaultValue: 'enterprise', description: 'Edition: raw, enterprise or managed' ) ]), pipelineTriggers([ cron('H 0 * * *') @@ -37,14 +38,20 @@ node { stage('checkout sources') { sh "rm -rf ${DAILY_DATA}" sh 'rm -rf *' - // Add line to delete folders older than 10 days dir("${DAILY_DATA}/git") { checkout(scm) - // Actually Dependent on Edition. For now set to Enterprise! - sh """ - rm -rf managed - make NEW_VERSION=${CMK_VERS} setversion - """ + + switch(EDITION) { + case 'raw': + AGENT_LIST = ["windows", "windows-legacy"] + sh 'rm -rf enterprise managed' + break + case 'enterprise': + sh 'rm -rf managed' + break + } + sh "make NEW_VERSION=${CMK_VERS} setversion" + dir('agents/wnx') { stash name: 'WinSRC', include: '**/*' } @@ -105,23 +112,23 @@ AGENT_LIST.each { AGENT -> sh "mount -t overlay overlay -o lowerdir=${DAILY_DATA}/git,upperdir=${WORKSPACE}/agent${AGENT}-dest,workdir=${WORKSPACE}/agent${AGENT}-work ${WORKSPACE}/agent${AGENT}-dest" if (AGENT == '-windows') { sh script: """ + mkdir -p ${DAILY_DATA}/agents cd agent${AGENT}-dest/agents/windows/ CHROOT_BUILD_DIR=${WORKSPACE}/agent${AGENT}-dest \ CHROOT_NAME="agent-builder-windows" \ ./build-agent + cp check_mk_agent-64.exe ${DAILY_DATA}/agents/check_mk_agent_legacy-64.exe + cp check_mk_agent.exe ${DAILY_DATA}/agents/check_mk_agent_legacy.exe + cp check_mk_agent.msi ${DAILY_DATA}/agents/check_mk_agent_legacy.msi """ - sh script: """ - cd agent${AGENT}-dest/enterprise/agents/windows/plugins - CHROOT_BUILD_DIR=${WORKSPACE}/agent${AGENT}-dest \ - make - """ - sh """ - mkdir -p ${DAILY_DATA}/agents - cp agent${AGENT}-dest/agents/windows/check_mk_agent-64.exe ${DAILY_DATA}/agents/check_mk_agent_legacy-64.exe - cp agent${AGENT}-dest/agents/windows/check_mk_agent.exe ${DAILY_DATA}/agents/check_mk_agent_legacy.exe - cp agent${AGENT}-dest/agents/windows/check_mk_agent.msi ${DAILY_DATA}/agents/check_mk_agent_legacy.msi - cp agent${AGENT}-dest/enterprise/agents/windows/plugins/cmk-update-agent.exe ${DAILY_DATA}/agents/ - """ + if(EDITION != 'raw') { + sh script: """ + cd agent${AGENT}-dest/enterprise/agents/windows/plugins + CHROOT_BUILD_DIR=${WORKSPACE}/agent${AGENT}-dest \ + make + cp cmk-update-agent.exe ${DAILY_DATA}/agents/ + """ + } } else { // Linux Agents (64 and 32 bit) sh script: """cd agent${AGENT}-dest/enterprise/agents/plugins \ && CHROOT_BUILD_DIR=${WORKSPACE}/agent${AGENT}-dest \ @@ -154,9 +161,11 @@ node { unstash name: 'WinMSI' sh "mv check_mk_agent* ${DAILY_DATA}/agents/" dir("${DAILY_DATA}/git") { - sh "cp ${DAILY_DATA}/agents/cmk-update-agent enterprise/agents/plugins/" - sh "cp ${DAILY_DATA}/agents/cmk-update-agent-32 enterprise/agents/plugins/" - sh "cp ${DAILY_DATA}/agents/cmk-update-agent.exe enterprise/agents/windows/plugins/" + if(EDITION != 'raw') { + sh "cp ${DAILY_DATA}/agents/cmk-update-agent enterprise/agents/plugins/" + sh "cp ${DAILY_DATA}/agents/cmk-update-agent-32 enterprise/agents/plugins/" + sh "cp ${DAILY_DATA}/agents/cmk-update-agent.exe enterprise/agents/windows/plugins/" + } sh "cp ${DAILY_DATA}/agents/check_mk_agent*.msi agents/windows" sh "cp ${DAILY_DATA}/agents/check_mk_agent*.exe agents/windows" sh 'make dist || cat /root/.npm/_logs/*-debug.log' @@ -215,10 +224,10 @@ node { sh """ mkdir -p /bauwelt/download/${CMK_VERS} cd /bauwelt/download/${CMK_VERS} - cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true - cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true - cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*x86_64.cma . || true - cp ${DAILY_DATA}/git/check-mk-enterprise-${CMK_VERS}.cee.tar.gz . || true + cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*_amd64.deb . || true + cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*.x86_64.rpm . || true + cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*x86_64.cma . || true + cp ${DAILY_DATA}/git/check-mk--${CMK_VERS}.cee.tar.gz . || true """ withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh """ @@ -231,10 +240,10 @@ node { } } else { dir("${DAILY_DATA}/download") { - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*x86_64.cma . || true" - sh "cp ${DAILY_DATA}/git/check-mk-enterprise-${CMK_VERS}.cee.tar.gz . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*_amd64.deb . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*.x86_64.rpm . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-${EDITION}-*x86_64.cma . || true" + sh "cp ${DAILY_DATA}/git/check-mk-${EDITION}-${CMK_VERS}.*.tar.gz . || true" withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" }

5 years, 5 months

CMK-1900: Workaround for conditional scss includes

by Alex Zurhake

Module: check_mk Branch: master Commit: dd90fbd8a2a0e8045273c14d5715ce80db173e97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd90fbd8a2a0e8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Apr 9 16:12:44 2019 +0200 CMK-1900: Workaround for conditional scss includes Change-Id: I592f6b20bb924d5104a90cdc3dea9706e1a635b3 --- buildscripts/scripts/nightly-build.jenkins | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index b3deafb..6e31e87 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -45,9 +45,23 @@ node { case 'raw': AGENT_LIST = ["windows", "windows-legacy"] sh 'rm -rf enterprise managed' + // Workaround since scss does not support conditional includes + sh ''' + rm -rf web/htdocs/themes/classic/scss/{cme,cee} + mkdir -p web/htdocs/themes/classic/scss/{cme,cee} + echo '@mixin graphs {}' > web/htdocs/themes/classic/scss/cee/_graphs.scss + echo '@mixin reporting {}' > web/htdocs/themes/classic/scss/cee/_reporting.scss + echo '@mixin managed {}' > web/htdocs/themes/classic/scss/cme/_managed.scss + ''' break case 'enterprise': sh 'rm -rf managed' + // Workaround since scss does not support conditional includes + sh ''' + rm -rf web/htdocs/themes/classic/scss/cme + mkdir -p web/htdocs/themes/classic/scss/cme + echo '@mixin managed {}' > web/htdocs/themes/classic/scss/cme/_managed.scss + ''' break } sh "make NEW_VERSION=${CMK_VERS} setversion"

5 years, 5 months

alcatel_*: Add info about supported devices and operating systems

by Florian Kromer

Module: check_mk Branch: master Commit: ebd078bf544404fb58e45bec05e493efa13aa997 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd078bf544404… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Apr 8 16:17:29 2019 +0200 alcatel_*: Add info about supported devices and operating systems Change-Id: I1b37a6e5602cc81955a5b8a7e2afa219ac14d633 --- checkman/alcatel_cpu | 12 +++++++++++- checkman/alcatel_fans | 12 +++++++++++- checkman/alcatel_power | 15 ++++++++++++--- checkman/alcatel_temp | 14 ++++++++++++-- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/checkman/alcatel_cpu b/checkman/alcatel_cpu index 0f4ed01..f8e36ff 100644 --- a/checkman/alcatel_cpu +++ b/checkman/alcatel_cpu @@ -4,7 +4,17 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This Check Monitors the CPU utilization on Alcatel switches supporting the ALCATEL-IND1-HEALTH-MIB. + This check monitors the CPU utilization on the following Alcatel switches + running the specified operating system release versions: + + - OmniSwitch 6850-48X: AOS 6.4.5.528.R02 Service Release + + - OmniSwitch 6850-U24X: AOS 6.4.4.442.C Service Release + + - OmniSwitch 6450-U24: AOS 6.6.5.77.R02 Service Release, AOS 6.6.4.285.R01 Service Release + + - OmniSwitch 6450-10: AOS 6.7.2.191.R04 GA + The value is a average in percent over the last hour. This average is calculated by the device. inventory: diff --git a/checkman/alcatel_fans b/checkman/alcatel_fans index e9e97eb..043327d 100644 --- a/checkman/alcatel_fans +++ b/checkman/alcatel_fans @@ -4,7 +4,17 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This Check Monitors all Fans on Alcatel switches supporting the ALCATEL-IND1-CHASSIS-MIB. + This check monitors all fans on the following Alcatel switches + running the specified operating system release versions: + + - OmniSwitch 6850-48X: AOS 6.4.5.528.R02 Service Release + + - OmniSwitch 6850-U24X: AOS 6.4.4.442.C Service Release + + - OmniSwitch 6450-U24: AOS 6.6.5.77.R02 Service Release, AOS 6.6.4.285.R01 Service Release + + - OmniSwitch 6450-10: AOS 6.7.2.191.R04 GA + The status is automaticly reported by the device, so no configuration is needed inventory: diff --git a/checkman/alcatel_power b/checkman/alcatel_power index 3da772b..3e6e434 100644 --- a/checkman/alcatel_power +++ b/checkman/alcatel_power @@ -4,9 +4,18 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This check monitors the health of power supplies in - Alcatel switches. If one of the two power supplies fails, the - check returns {CRIT}. + This check monitors the health of power supplies in the following Alcatel + switches running the specified operating system release versions: + + - OmniSwitch 6850-48X: AOS 6.4.5.528.R02 Service Release + + - OmniSwitch 6850-U24X: AOS 6.4.4.442.C Service Release + + - OmniSwitch 6450-U24: AOS 6.6.5.77.R02 Service Release, AOS 6.6.4.285.R01 Service Release + + - OmniSwitch 6450-10: AOS 6.7.2.191.R04 GA + + If one of the two power supplies fails, the check returns {CRIT}. item: The ID of the power supply as output from the SNMP agent. diff --git a/checkman/alcatel_temp b/checkman/alcatel_temp index c5d2b00..da0f3b1 100644 --- a/checkman/alcatel_temp +++ b/checkman/alcatel_temp @@ -4,8 +4,18 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This Check Monitors CPU and Board Temperatures on Alcatel switches supporting the ALCATEL-IND1-CHASSIS-MIB. - If the CPU Temperature is supported depends on the switch mode (not supported on Hawk models) + This check monitors CPU and board temperatures on the following Alcatel + switches running the specified operating system release versions: + + - OmniSwitch 6850-48X: AOS 6.4.5.528.R02 Service Release + + - OmniSwitch 6850-U24X: AOS 6.4.4.442.C Service Release + + - OmniSwitch 6450-U24: AOS 6.6.5.77.R02 Service Release, AOS 6.6.4.285.R01 Service Release + + - OmniSwitch 6450-10: AOS 6.7.2.191.R04 GA + + If the CPU Temperature is supported depends on the switch mode (not supported on Hawk models). inventory: One check is created

5 years, 5 months

7364 FIX check_mk_agent.{aix, solaris}: Fixed possibly disappeared inventory entries

by Simon Betz

Module: check_mk Branch: master Commit: f5bdda2164c817a15b44fb4785bea248a1338ccd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5bdda2164c817… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 9 16:08:39 2019 +0200 7364 FIX check_mk_agent.{aix,solaris}: Fixed possibly disappeared inventory entries On Linux hosts the HW/SW inventory plugin {{mk_inventory}} remembers the remote address, ie. the Check_MK server, in order to know which host has already got the inventory data for caching reasons. The AIX and Solaris agent does not provide the remote host information. This may lead to disappearing inventory data on Check_MK servers if at least two Check_MK servers request data from the same client host which does not know which server already got inventory data. Change-Id: If117940d5191b0ef003cfeab6e83a9bc4b7291bc --- .werks/7364 | 15 +++++++++++++++ agents/check_mk_agent.aix | 8 ++++++++ agents/check_mk_agent.solaris | 8 ++++++++ 3 files changed, 31 insertions(+) diff --git a/.werks/7364 b/.werks/7364 new file mode 100644 index 0000000..cad0da5 --- /dev/null +++ b/.werks/7364 @@ -0,0 +1,15 @@ +Title: check_mk_agent.{aix,solaris}: Fixed possibly disappeared inventory entries +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554818345 +Class: fix + +On Linux hosts the HW/SW inventory plugin {{mk_inventory}} remembers the +remote address, ie. the Check_MK server, in order to know which server has +already got the inventory data (for caching reasons). +The AIX and Solaris agent does not provide the remote host information. +This may lead to disappearing inventory data on Check_MK servers if at +least two Check_MK servers request data from the same client host. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 9e0ba21..1081fb8 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -41,6 +41,14 @@ export MK_VARDIR=${MK_VARDIR:-/tmp/check_mk} # Optionally set a tempdir for all subsequent calls #export TMPDIR= +# Provide information about the remote host. That helps when data +# is being sent only once to each remote host. +if [ "$REMOTE_HOST" ] ; then + export REMOTE=$REMOTE_HOST +elif [ "$SSH_CLIENT" ] ; then + export REMOTE=${SSH_CLIENT%% *} +fi + # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own # sections and must output headers with '<<<' and '>>>' diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index e9ce799..b3e843b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -35,6 +35,14 @@ export MK_VARDIR=${MK_VARDIR:-/var/lib/check_mk_agent} # Optionally set a tempdir for all subsequent calls #export TMPDIR= +# Provide information about the remote host. That helps when data +# is being sent only once to each remote host. +if [ "$REMOTE_HOST" ] ; then + export REMOTE=$REMOTE_HOST +elif [ "$SSH_CLIENT" ] ; then + export REMOTE=${SSH_CLIENT%% *} +fi + # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own # sections and must output headers with '<<<' and '>>>'

5 years, 5 months

Remove localization of empty text to unbreak gettext

by Lars Michelsen

Module: check_mk Branch: master Commit: 32e0cbe0d89fa2701f3c6f9b206bb93eaf658561 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32e0cbe0d89fa2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 10 08:00:17 2019 +0200 Remove localization of empty text to unbreak gettext Change-Id: Ic8b98d68ebc592779e3ee5c81871ae6c1b9adbe1 --- cmk/gui/plugins/sidebar/bookmarks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/sidebar/bookmarks.py b/cmk/gui/plugins/sidebar/bookmarks.py index 3bc999f..1728308 100644 --- a/cmk/gui/plugins/sidebar/bookmarks.py +++ b/cmk/gui/plugins/sidebar/bookmarks.py @@ -143,7 +143,7 @@ class BookmarkList(pagetypes.Overridable): FixedValue( None, title=_("Use default topic"), - totext=_(""), + totext="", ), OptionalDropdownChoice( title=_("Individual topic"),

5 years, 5 months

Fixed label valuespec initialization in ListOf valuespecs

by Lars Michelsen

Module: check_mk Branch: master Commit: 949353c485d8a537fb3fd7664ef33cccc9765a0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=949353c485d8a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 10 07:49:32 2019 +0200 Fixed label valuespec initialization in ListOf valuespecs Change-Id: Ieb14e56aaeeeba0c220366e84a00c4241a60d1c1 --- cmk/gui/valuespec.py | 2 +- web/htdocs/js/modules/forms.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 856d607..04032a7 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1318,7 +1318,7 @@ class ListOf(ValueSpec): def _show_reference_entry(self, varprefix, index, value): if self._style == ListOf.Style.REGULAR: html.open_table(style="display:none;") - html.open_tbody(id_="%s_prototype" % varprefix) + html.open_tbody(id_="%s_prototype" % varprefix, class_="vlof_prototype") self._show_entry(varprefix, index, value) diff --git a/web/htdocs/js/modules/forms.js b/web/htdocs/js/modules/forms.js index 9ad2c97..121ac12 100644 --- a/web/htdocs/js/modules/forms.js +++ b/web/htdocs/js/modules/forms.js @@ -55,6 +55,11 @@ function enable_label_input_fields(container) { let elements = container.querySelectorAll("input.labels"); elements.forEach(element => { + // Do not tagify objects that are part of a ListOf valuespec template + if (element.closest("tbody.vlof_prototype") !== null) { + return; + } + let ajax_obj; let tagify = new Tagify(element, { pattern: /^[^:]+:[^:]+$/,

5 years, 5 months

Minor improvement of tag/label rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: be46380a8b6523184db62f7e2fa40d996a449c81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be46380a8b6523… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 10 07:45:48 2019 +0200 Minor improvement of tag/label rendering Change-Id: I14f9e307221e7ed646c89106b70ee61f8cae5eef --- web/htdocs/themes/classic/scss/_pages.scss | 12 +++++++++--- web/htdocs/themes/facelift/scss/_pages.scss | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/web/htdocs/themes/classic/scss/_pages.scss b/web/htdocs/themes/classic/scss/_pages.scss index 8c39775..3c06bfe 100644 --- a/web/htdocs/themes/classic/scss/_pages.scss +++ b/web/htdocs/themes/classic/scss/_pages.scss @@ -1536,15 +1536,21 @@ table.data.job_table> tbody > tr > td.job_pid{ } .tagify { - border: 0; + border: none; + + tag { + margin: 0 0 0 5px; + } + a tag { cursor: pointer; } + tag x { - font-size: 8pt; + font-size: 11px; } } .tagify.display[readonly] tag > div::before { - background: #d6d6d6; + background: #d6d6d6; } diff --git a/web/htdocs/themes/facelift/scss/_pages.scss b/web/htdocs/themes/facelift/scss/_pages.scss index d0dd1a1..10c5d10 100644 --- a/web/htdocs/themes/facelift/scss/_pages.scss +++ b/web/htdocs/themes/facelift/scss/_pages.scss @@ -31,15 +31,21 @@ Boston, MA 02110-1301 USA. .tagify { - border: 0; + border: none; + + tag { + margin: 0 0 0 5px; + } + a tag { cursor: pointer; } + tag x { - font-size: 8pt; + font-size: 11px; } } .tagify.display[readonly] tag > div::before { - background: #d6d6d6; + background: #d6d6d6; }

5 years, 5 months

Removed a few unnecessary IWYU pragmas.

by Sven Panne

Module: check_mk Branch: master Commit: a861b3163a225c03c4eb11b803eb42fb08ed4c57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a861b3163a225c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 9 14:27:44 2019 +0200 Removed a few unnecessary IWYU pragmas. Change-Id: I70973cc93a065e6389dde88bea4268755155f75c --- active_checks/check_mkevents.cc | 1 + livestatus/src/AttributeListColumn.cc | 1 - livestatus/src/TableStateHistory.cc | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc index ba4845e..de56b48 100644 --- a/active_checks/check_mkevents.cc +++ b/active_checks/check_mkevents.cc @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// NOTE: We really need <sstream>, IWYU bug? #include <arpa/inet.h> #include <netdb.h> #include <netinet/in.h> diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index e826451..077a931 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -25,7 +25,6 @@ #include "AttributeListColumn.h" #include <memory> #include <vector> -#include "Filter.h" // IWYU pragma: keep #include "Row.h" std::unique_ptr<Filter> AttributeListColumn::createFilter( diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 328cb02..844ae8e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -44,7 +44,6 @@ #include "OffsetSStringColumn.h" #include "OffsetStringColumn.h" #include "OffsetTimeColumn.h" -#include "OringFilter.h" // IWYU pragma: keep #include "Query.h" #include "Row.h" #include "StringUtils.h"

5 years, 5 months

Do not create discovered label files with empty dicts

by Lars Michelsen

Module: check_mk Branch: master Commit: d38de7f7ed00dbf1d6747aeff70c30bbb95e8e3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d38de7f7ed00db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 17:16:07 2019 +0200 Do not create discovered label files with empty dicts Change-Id: I066e2df9ce66bd9b2fcb22ff33ed7fde15e11d60 --- cmk_base/discovered_host_labels.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmk_base/discovered_host_labels.py b/cmk_base/discovered_host_labels.py index e697120..fc35d7a 100644 --- a/cmk_base/discovered_host_labels.py +++ b/cmk_base/discovered_host_labels.py @@ -50,8 +50,9 @@ class DiscoveredHostLabelsStore(object): def save(self, labels): # type: (Dict) -> None - if not labels and self.file_path.exists(): # pylint: disable=no-member - self.file_path.unlink() # pylint: disable=no-member + if not labels: + if self.file_path.exists(): + self.file_path.unlink() return self.file_path.parent.mkdir(parents=True, exist_ok=True) # pylint: disable=no-member

5 years, 5 months

locale makefile: Be stricter on command failures

by Lars Michelsen

Module: check_mk Branch: master Commit: 6959faee4b012d88838184c9c45d3540f179311f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6959faee4b012d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 10 08:00:02 2019 +0200 locale makefile: Be stricter on command failures Change-Id: Ic37bc405fd2d8bdbac5da4e4b4a4ebc544167a90 --- locale/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/locale/Makefile b/locale/Makefile index 5b22acc..bfb9cef 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ LANGUAGES = de ro -SHELL=/bin/bash +SHELL=/bin/bash -e -o pipefail .PHONY: $(LANGUAGES) @@ -23,14 +23,15 @@ all: update-%: @L=$@ ; \ cd $${L#*-}/LC_MESSAGES ; \ - unset LANG ; xgettext -w 80 --sort-output --force-po \ + unset LANG ; \ + xgettext -w 80 --sort-output --force-po \ -L python --from-code=utf-8 --omit-header \ -o scanned.po \ ../../../web/app/index.wsgi \ $$(find -L ../../../cmk -type f -name "*.py") 2>&1 < /dev/null | \ sed '/format string with unnamed arguments cannot be properly localized/,/and a mapping instead of a tuple for the arguments./d' ; \ cat ../../header scanned.po > new.po ; \ - msgmerge -w 80 -q -U -v multisite.po new.po 2>&1 < /dev/null | grep -v "reference, merged" ; \ + msgmerge -w 80 -q -U -v multisite.po new.po 2>&1 < /dev/null | grep -v "reference, merged" || true ; \ rm -f new.po scanned.po cleanup-%:

5 years, 5 months

← Newer
1
...
32
33
34
35
36
37
38
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019