Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Analyze configuration: Fixed acknowledged result filtering

by Lars Michelsen

Module: check_mk Branch: master Commit: ae22fd5a60c96478b6d50c344649920abf0c4a15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae22fd5a60c964… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 16:16:00 2017 +0100 Analyze configuration: Fixed acknowledged result filtering Change-Id: I378bde41e8edc36c8e7db1d075da9a18f733b2b2 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2e47a16..03ce9b2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16873,7 +16873,7 @@ class ModeAnalyzeConfig(WatoMode): if not self._show_failed and type(result) != ACResultOK: remove = True - if not self._show_ack and not self._is_acknowledged(result): + if not self._show_ack and self._is_acknowledged(result): remove = True # Remove result of site if filtered by user call

6 years, 6 months

Updated AC test description

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ed030d0fe8a7072b1a4468465c36d80bb5d7adf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed030d0fe8a70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 16:20:16 2017 +0100 Updated AC test description Change-Id: I1b011b1db09e49c0f17fac18223cb7223525ffff --- web/plugins/wato/ac_tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index 7890d6a..bc5d7a9 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -368,7 +368,11 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): "you need to configure them in a way that you system can handle them without " "reaching out of memory situations." "Please note that this value is only a rough estimation, because the memory " - "usage of the apache processes may vary with the requests being processed.") + "usage of the apache processes may vary with the requests being processed." + "Possible actions:<ul>" + "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=process_tuning\">number of apache processes</a></li>" + "</ul>" + "") def is_relevant(self):

6 years, 6 months

statgrab_cpu: Clarify parameter naming

by Konstantin Büttner

Module: check_mk Branch: master Commit: f1f2eefb35b38bf597e4e39f1198bf30049c5129 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1f2eefb35b38b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 30 15:57:10 2017 +0100 statgrab_cpu: Clarify parameter naming Change-Id: I183da1b5afc2911de755bd14a7da53b356f662ab --- checks/statgrab_cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/statgrab_cpu b/checks/statgrab_cpu index fd03d66..0132277 100644 --- a/checks/statgrab_cpu +++ b/checks/statgrab_cpu @@ -31,7 +31,7 @@ def inventory_statgrab_cpu(info): return [(None, {})] -def check_statgrab_cpu(item, params, info): +def check_statgrab_cpu(_no_item, params, info): if not params: params = {} user = 0

6 years, 6 months

check_cpu_util_unix: Remove bogus int call rounding the current time. Why was this ever there in the first place ?

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6fad806e5bc83705545aa51b59b9f5f294b7f8f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fad806e5bc837… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 30 14:56:22 2017 +0100 check_cpu_util_unix: Remove bogus int call rounding the current time. Why was this ever there in the first place? Change-Id: I8ad015054e71fa17f7162399930ebc9a17e64739 --- checks/cpu_util.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 89b7c9d..25e53ce 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -135,7 +135,7 @@ def check_cpu_util(util, params, this_time=None, cores=None): # - 8 - guest: time spent in guest OK # - 9 - guest_nice: time spent in niced guest OK def check_cpu_util_unix(values, params, cores = None): - this_time = int(time.time()) + this_time = time.time() # Compute jiffi-differences of all relevant counters diff_values = [] n = 0

6 years, 6 months

5560 FIX Fixed "Events of Monitored Host" showing events of unrelated hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f4bb3cc45ca397ab25320f5ba7811e02e6e854a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f4bb3cc45ca39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 14:55:17 2017 +0100 5560 FIX Fixed "Events of Monitored Host" showing events of unrelated hosts Change-Id: I1d6b36379c7236a5c46e5b6479bea471405f0873 --- .werks/5560 | 11 +++++++++++ web/plugins/views/mkeventd.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5560 b/.werks/5560 new file mode 100644 index 0000000..846e6da --- /dev/null +++ b/.werks/5560 @@ -0,0 +1,11 @@ +Title: Fixed "Events of Monitored Host" showing events of unrelated hosts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1512050096 + + diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index d639416..5b8fef3 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -887,7 +887,7 @@ if mkeventd_enabled: ], 'hide_filters': [ 'siteopt', - 'host', + 'event_host', ], 'sorters': [ ('event_last', False)

6 years, 6 months

Check tests: Remove unused import

by Konstantin Büttner

Module: check_mk Branch: master Commit: 154cfd15ff2276b6c528a784b9fcbed61e21b88c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=154cfd15ff2276… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 30 14:31:46 2017 +0100 Check tests: Remove unused import Change-Id: I114b7e926b0a677d9b5406dd097144abd9326444 --- tests/checks/conftest.py | 2 -- tests/checks/test_df_check.py | 1 - tests/checks/test_mkbackup_check.py | 1 - 3 files changed, 4 deletions(-) diff --git a/tests/checks/conftest.py b/tests/checks/conftest.py index a80ce04..95445e6 100644 --- a/tests/checks/conftest.py +++ b/tests/checks/conftest.py @@ -1,5 +1,3 @@ - -import sys import pytest import cmk diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index f2abdf6..bb5ac44 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -1,6 +1,5 @@ import pytest import pprint -import sys pytestmark = pytest.mark.checks diff --git a/tests/checks/test_mkbackup_check.py b/tests/checks/test_mkbackup_check.py index 0029892..a93bccb 100644 --- a/tests/checks/test_mkbackup_check.py +++ b/tests/checks/test_mkbackup_check.py @@ -1,6 +1,5 @@ import pytest import pprint -import sys pytestmark = pytest.mark.checks

6 years, 6 months

Spelling corrections (usefull -> useful)

by Konstantin Büttner

Module: check_mk Branch: master Commit: caf1079c661fcebe431d91c649ab80cd09294a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caf1079c661fce… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 30 14:07:16 2017 +0100 Spelling corrections (usefull -> useful) Change-Id: I0840eaba3601ba0e9d7719972ffca84c39f769ad --- .werks/1277 | 2 +- .werks/175 | 2 +- .werks/179 | 2 +- checkman/logwatch.groups | 2 +- checkman/winperf.cpuusage | 2 +- checkman/winperf_processor.util | 2 +- doc/treasures/colorgrep | 2 +- doc/treasures/wato_geo_fields.py | 2 +- omd/packages/pnp4nagios/skel/etc/pnp4nagios/npcd.cfg | 2 +- web/plugins/views/layouts.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.werks/1277 b/.werks/1277 index 4312aed..1676acf 100644 --- a/.werks/1277 +++ b/.werks/1277 @@ -6,5 +6,5 @@ Version: 1.2.7i3 Date: 1439196083 Class: feature -This is usefull if u want to check LDAPS servers to prevent certificate problems. +This is useful if u want to check LDAPS servers to prevent certificate problems. diff --git a/.werks/175 b/.werks/175 index 56bd00c..03eb3ed 100644 --- a/.werks/175 +++ b/.werks/175 @@ -5,6 +5,6 @@ Version: 1.2.5i5 Date: 1404305698 Class: feature -This check is used to group multiple logfiles together. This is usefull in cases when a logrotation mechanism is used, +This check is used to group multiple logfiles together. This is useful in cases when a logrotation mechanism is used, with no permanent name for the current logfile. diff --git a/.werks/179 b/.werks/179 index 9db99cb..9fd761e 100644 --- a/.werks/179 +++ b/.werks/179 @@ -7,4 +7,4 @@ Class: feature Befor this change, it was only possible to define the ip of a dns server or use the the ip address of the host as dns server. Now it's also possible to omit this confiuration. In this case the check is done against the local dns servers configured on the monitoring server. -This is usefull if you e.g. want check web domain names. +This is useful if you e.g. want check web domain names. diff --git a/checkman/logwatch.groups b/checkman/logwatch.groups index 0cbc5e7..936b10a 100644 --- a/checkman/logwatch.groups +++ b/checkman/logwatch.groups @@ -4,7 +4,7 @@ catalog: os/files license: GPL distribution: check_mk description: - This check is used to group multiple logfiles together. This is usefull in cases when a logrotation mechanism is used, + This check is used to group multiple logfiles together. This is useful in cases when a logrotation mechanism is used, with no permanent name for the current logfile. Please refer to to manpage of {{logwatch}} for more details about logfile monitoring. diff --git a/checkman/winperf.cpuusage b/checkman/winperf.cpuusage index a1ec6f5..f1d2552 100644 --- a/checkman/winperf.cpuusage +++ b/checkman/winperf.cpuusage @@ -9,7 +9,7 @@ description: In its current implementation this check is always OK. Setting a level for warning or a critical state is possible, but might - not be very usefull, since the computed value is an average over just one + not be very useful, since the computed value is an average over just one check cycle. A combination with a larger value of {max_check_attempts} or {notification_delay} might be useful here. diff --git a/checkman/winperf_processor.util b/checkman/winperf_processor.util index 57f9721..7e8e10a 100644 --- a/checkman/winperf_processor.util +++ b/checkman/winperf_processor.util @@ -9,7 +9,7 @@ description: This check replaces {winperf.cpuusage} which is outdated since version {1.1.11i1} Setting a level for warning or a critical state is possible, but might - not be very usefull, since the computed value is an average over + not be very useful, since the computed value is an average over just one check cycle. Consider to set the {average} option for this purpose. A combination with a larger value of {max_check_attempts} or {notification_delay} might also be useful here. diff --git a/doc/treasures/colorgrep b/doc/treasures/colorgrep index 94b0182..9c7fbf1 100755 --- a/doc/treasures/colorgrep +++ b/doc/treasures/colorgrep @@ -1,6 +1,6 @@ #!/usr/bin/python # This is like egrep, but hilites the exact positions -# of *subexpressions*. This is e.g. usefull for testing +# of *subexpressions*. This is e.g. useful for testing # inventory_processes... import re, sys diff --git a/doc/treasures/wato_geo_fields.py b/doc/treasures/wato_geo_fields.py index 3dd6126..a06cf32 100644 --- a/doc/treasures/wato_geo_fields.py +++ b/doc/treasures/wato_geo_fields.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # place this file to ~/local/share/check_mk/web/plugins/wato to get two new fields in the wato host properties. -# this fields can be used to add Latiude and Longitude information. Usefull for the Nagvis Geomap +# this fields can be used to add Latiude and Longitude information. Useful for the Nagvis Geomap declare_host_attribute( NagiosTextAttribute( diff --git a/omd/packages/pnp4nagios/skel/etc/pnp4nagios/npcd.cfg b/omd/packages/pnp4nagios/skel/etc/pnp4nagios/npcd.cfg index d694634..e7495bb 100644 --- a/omd/packages/pnp4nagios/skel/etc/pnp4nagios/npcd.cfg +++ b/omd/packages/pnp4nagios/skel/etc/pnp4nagios/npcd.cfg @@ -170,7 +170,7 @@ perfdata_file = ###ROOT###/var/pnp4nagios/perfdata.dump # filename for the spooled files # # This option allows you a customized filename. -# Usefull if you own different nagios servers +# Useful if you own different nagios servers # which write their data to a shared storage. # # perfdata_spool_filename = <filename> diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 8a9a2d8..d0824aa 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -151,7 +151,7 @@ def render_grouped_boxes(rows, view, group_cells, cells, num_columns, show_check for group in groups: columns[0].append(group) - # shift from src to dst, if usefull + # shift from src to dst, if useful def balance(src, dst): if len(src) == 0: return False

6 years, 6 months

Added Bug regarding xinetd and livestatus

by Marcel Arentz

Module: check_mk Branch: master Commit: f82f866aa21b03094f92b5d0bd2dca908313d924 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f82f866aa21b03… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Nov 30 12:22:46 2017 +0100 Added Bug regarding xinetd and livestatus Change-Id: I0cace6ccb1a26fcae82a7ce5643ac57061f467d9 --- .bugs/2973 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2973 b/.bugs/2973 new file mode 100644 index 0000000..a4261ea --- /dev/null +++ b/.bugs/2973 @@ -0,0 +1,8 @@ +Title: xinetd for livestatus: only_from not marked as handled by omd +Component: livestatus +State: open +Date: 2017-11-30 12:20:51 +Targetversion: 1.5.0 +Class: nastiness + +The mentioned option is not marked as handled by omd even it cannot be manually modified anymore.

6 years, 6 months

Refactores some more modes to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 61726a05842307b396dc74122a8cb9697b2d59f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61726a05842307… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 08:12:51 2017 +0100 Refactores some more modes to WatoMode Change-Id: I926a06143ef826fb18c2c0a9a92634905bc2c52b --- web/htdocs/js/wato.js | 24 +- web/htdocs/wato.py | 962 +++++++++++++++++++++++++--------------------- web/plugins/pages/wato.py | 2 +- 3 files changed, 534 insertions(+), 454 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61726a0584…

6 years, 6 months

5559 Bulk import: site attribute can now be imported

by Lars Michelsen

Module: check_mk Branch: master Commit: 2aae9a3428169ffda41e737fd029b150a6cc70d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2aae9a3428169f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 09:28:24 2017 +0100 5559 Bulk import: site attribute can now be imported Change-Id: Ida231b2739281c57be1ad5c418a23d06712e7132 --- .werks/5559 | 10 ++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/5559 b/.werks/5559 new file mode 100644 index 0000000..23c6217 --- /dev/null +++ b/.werks/5559 @@ -0,0 +1,10 @@ +Title: Bulk import: site attribute can now be imported +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512030494 +Class: feature + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e5af8de..2b2994a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3894,6 +3894,7 @@ class ModeBulkImport(WatoMode): ("-", _("Don't import")), ("host_name", _("Hostname")), ("alias", _("Alias")), + ("site", _("Monitored on site")), ("ipaddress", _("IPv4 Address")), ("ipv6address", _("IPv6 Address")), ("snmp_community", _("SNMP Community")),

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017