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
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.</p>"
"<p>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.</p>")
+ "usage of the apache processes may vary with the requests being processed.</p>"
+ "<p>Possible actions:<ul>"
+ "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=process_tuning\">number of apache processes</a></li>"
+ "</ul>"
+ "</p>")
def is_relevant(self):
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