Module: check_mk
Branch: master
Commit: 0b126a1c6ad04fac572f62439281df5b030e0677
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b126a1c6ad04f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 9 12:24:14 2015 +0100
Updated bug entries #2271
---
.bugs/2271 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/2271 b/.bugs/2271
new file mode 100644
index 0000000..739a3fe
--- /dev/null
+++ b/.bugs/2271
@@ -0,0 +1,10 @@
+Title: Availability of host group should be reachable via host groups view
+Component: multisite
+State: open
+Date: 2015-02-09 12:23:08
+Targetversion: 1.2.7
+Class: todo
+
+Currently you have to use the Host search. The reason is that the datasource hostgroups
+and appearantly hostsbygroup do not support availability. This should be fixed so that
+availability is always possible.
Module: check_mk
Branch: master
Commit: bbf2152a9e3d1e4dc9a67369de5163ae729a48d4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbf2152a9e3d1e…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Feb 9 12:23:16 2015 +0100
#1939 check_ftp: changed service description if the ftp port differs from 21
If a host had two check_ftp services assigned they both shared the same
service description, which resulted in only one check. This has been changed.
If the ftp port differs from 21, the port is also shown in the service
description, e.g. <i>FTP Port 999</i>.
So, if you had any check_ftp services running on a port that differs from 21 they will
have an updated service description.
---
.werks/1939 | 16 ++++++++++++++++
ChangeLog | 2 ++
checks/check_ftp | 11 ++++++++++-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/.werks/1939 b/.werks/1939
new file mode 100644
index 0000000..1a060e2
--- /dev/null
+++ b/.werks/1939
@@ -0,0 +1,16 @@
+Title: check_ftp: changed service description if the ftp port differs from 21
+Level: 1
+Component: checks
+Compatible: incomp
+Version: 1.2.7i1
+Date: 1423480555
+Class: feature
+
+If a host had two check_ftp services assigned they both shared the same
+service description, which resulted in only one check. This has been changed.
+
+If the ftp port differs from 21, the port is also shown in the service
+description, e.g. <i>FTP Port 999</i>.
+
+So, if you had any check_ftp services running on a port that differs from 21 they will
+have an updated service description.
diff --git a/ChangeLog b/ChangeLog
index 18f3114..87f8c6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,8 @@
* 1961 akcp_exp_humidity, akcp_exp_smoke, akcp_exp_temp, akcp_exp_water: New checks to monitor AKCP securityProbe and expansion boards...
* 1991 emc_datadomain_temps: make configurable via WATO, add Perf-O-Meter...
NOTE: Please refer to the migration notes!
+ * 1939 check_ftp: changed service description if the ftp port differs from 21...
+ NOTE: Please refer to the migration notes!
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
diff --git a/checks/check_ftp b/checks/check_ftp
index c9b177d..86d931c 100644
--- a/checks/check_ftp
+++ b/checks/check_ftp
@@ -65,10 +65,19 @@ def check_ftp_arguments(params):
return args
+
+def check_ftp_get_item(params):
+ if type(params) == tuple:
+ return "FTP " + args[0]
+ else:
+ if "port" in params and params["port"] != 21:
+ return "FTP Port " + str(params["port"])
+ return "FTP"
+
active_check_info['ftp'] = {
"command_line" : '$USER1$/check_ftp $ARG1$',
"argument_function" : check_ftp_arguments,
- "service_description" : lambda args: type(args) == tuple and ("FTP %s" % args[0]) or "FTP",
+ "service_description" : check_ftp_get_item,
"has_perfdata" : True,
}
Module: check_mk
Branch: master
Commit: 6f6623c69431d308b4225e0df160244559c10f9d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f6623c69431d3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 9 11:06:19 2015 +0100
Fixed some englisch texts
---
web/htdocs/wato.py | 10 +++++-----
web/plugins/views/datasources.py | 3 +--
web/plugins/wato/active_checks.py | 6 +++---
web/plugins/wato/check_mk_configuration.py | 4 ++--
web/plugins/wato/check_parameters.py | 2 +-
web/plugins/wato/datasource_programs.py | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 858ec79..7fd30f4 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6493,12 +6493,12 @@ def get_snapshot_status(snapshot, validate_checksums = False):
using_cmc = os.path.exists(defaults.omd_root + '/etc/check_mk/conf.d/microcore.mk')
snapshot_cmc = 'conf.d/microcore.mk' in files
if using_cmc and not snapshot_cmc:
- raise MKGeneralException(_('You are currently using the Check_MK Microcore, but this snapshot does not use the '
- 'Check_MK Microcore. If you need to migrate your data, you could consider changing '
+ raise MKGeneralException(_('You are currently using the Check_MK Micro Core, but this snapshot does not use the '
+ 'Check_MK Micro Core. If you need to migrate your data, you could consider changing '
'the core, restoring the snapshot and changing the core back again.'))
elif not using_cmc and snapshot_cmc:
- raise MKGeneralException(_('You are currently not using the Check_MK Microcore, but this snapshot uses the '
- 'Check_MK Microcore. If you need to migrate your data, you could consider changing '
+ raise MKGeneralException(_('You are currently not using the Check_MK Micro Core, but this snapshot uses the '
+ 'Check_MK Micro Core. If you need to migrate your data, you could consider changing '
'the core, restoring the snapshot and changing the core back again.'))
def snapshot_secret():
@@ -9786,7 +9786,7 @@ def mode_edit_timeperiod(phase):
# Excludes
if other_tps:
forms.section(_("Exclude"))
- html.help(_('You can use other timeperiod defnitions to exclude the times '
+ html.help(_('You can use other timeperiod definitions to exclude the times '
'defined in the other timeperiods from this current timeperiod.'))
vs_excl.render_input("exclude", timeperiod.get("exclude", []))
diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py
index 13af5fb..a861ae7 100644
--- a/web/plugins/views/datasources.py
+++ b/web/plugins/views/datasources.py
@@ -89,8 +89,7 @@ multisite_datasources["hostsbygroup"] = {
"keys" : [ "host_name", "host_downtimes" ],
"join" : ( "services", "host_name" ),
"idkeys" : [ "site", "hostgroup_name", "host_name" ],
- "description" : _("Using this, datasources host rows might appear multiple times depending "
- "on their membership in hostgroups."),
+ "description" : _("This datasource has a separate row for each group membership that a host has."),
}
multisite_datasources["services"] = {
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 6c7bf48..213f2d2 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -1786,7 +1786,7 @@ register_rule(group,
('match_subject', RegExpUnicode(
title = _('Only process mails with matching subject'),
help = _('Use this option to not process all messages found in the inbox, '
- 'but only the whones whose subject matches the given regular expression. '),
+ 'but only the those whose subject matches the given regular expression.'),
)),
('facility', DropdownChoice(
title = _("Events: Syslog facility"),
@@ -1805,8 +1805,8 @@ register_rule(group,
TextUnicode(
title = _("Specify the application"),
help = _("Use this text as application. You can use macros like <tt>\\1</tt>, <tt>\\2</tt>, ... "
- "here when you configured <i>subject matching</i> in this rule with a regex "
- "which declares match groups (using braces)."),
+ "here when you configured <i>subject matching</i> in this rule with a regular expression "
+ "that declares match groups (using braces)."),
allow_empty = False,
),
]
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 6d825cb..3fffbd5 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -974,10 +974,10 @@ register_configvar(group,
"password_policy",
Dictionary(
title = _('htpasswd: Password Policy'),
- help = _('You can define some rules which each user password must fit with. By default '
+ help = _('You can define some rules to which each user password aher. By default '
'all passwords are accepted, even ones which are made of only a single character, '
'which is obviously a bad idea. Using this option you can enforce your users '
- 'to choose more secure passwords of a minimal length having a defined complexity.'),
+ 'to choose more secure passwords.'),
elements = [
('min_length', Integer(
title = _("Minimum password length"),
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index bff87cf..fe041c7 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -5105,7 +5105,7 @@ register_check_parameters(
"netapp_disks",
_("NetApp Broken/Spare Disk Ratio"),
Dictionary(
- help = _("You can set level of the broken to spare disk ratio. "
+ help = _("You can set a limit to the broken to spare disk ratio. "
"The ratio is calculated with <i>broken / (broken + spare)</i>."),
elements = [
( "broken_spare_ratio",
diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py
index 4da6710..ca703ef 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -197,7 +197,7 @@ register_rule(group,
optional_keys = False
),
title = _("Check NetApp via WebAPI"),
- help = _("This rule selects the NetApp special agent instead of the normal Check_MK Agent "
+ help = _("This rule set selects the NetApp special agent instead of the normal Check_MK Agent "
"and allows monitoring via the NetApp API. Right now only <i>7-Mode</i> is supported, "
"<i>Cluster Mode</i> will follow soon. Important: To make this special agent NetApp work "
"you will have to provide two additional python files (<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) "
@@ -284,7 +284,7 @@ register_rule(group,
"special_agents:ibmsvc",
Dictionary(
title = _("Check state of IBM SVC / V7000 storage systems"),
- help = _("This rule selects the ibmsvc agent instead of the normal Check_MK Agent "
+ help = _("This rule set selects the <tt>ibmsvc</tt> agent instead of the normal Check_MK Agent "
"and allows monitoring of IBM SVC / V7000 storage systems by calling "
"ls* commands there over SSH. "
"Make sure you have SSH key authentication enabled for your monitoring user. "
Module: check_mk
Branch: master
Commit: 3008da6370c4427563da8a3f505ca163cc6bf6a9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3008da6370c442…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Mon Feb 9 10:54:06 2015 +0100
Fixed werk descriptions
---
ChangeLog | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5a83348..18f3114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,14 +134,14 @@
* 1877 FIX: printer_input/printer_output: Check can now handle non reported capacity unit
* 1921 FIX: kemp_loadmaster_realserver: reimplementation, now use vendor specific information
* 1859 FIX: cups_queues: linux agent now runs section cups_queues in cached mode...
- * 1881 FIX: omd_status: Check works now event when a site is reported as not OK...
+ * 1881 FIX: omd_status: Check works now even when a site is reported as not OK...
* 1923 FIX: cisco_qos: Fixed exception in discovery that might lead to missing services
* 1924 FIX: cisco_power: Fixed missing power supplies in case where name is not unique
* 1886 FIX: win_printers: Fixed exception in WATO when displaying default parameters
- * 1887 FIX: Logwatch event console forwarding: Better dealing with logwatch states
+ * 1887 FIX: Logwatch event console forwarding: Better handling of logwatch states
* 1969 FIX: apc_symmetra: Fix wrong critical state "0 batteries need replacement"
* 1926 FIX: ps: reenable compatiblity with existing configurations...
- * 1970 FIX: lparstat_aix: Made the check compatible to different kind of lparstat output...
+ * 1970 FIX: lparstat_aix: Made the check compatible to different kinds of lparstat output...
* 1971 FIX: printer_input/printer_output: Discovery is using name field when available no...
NOTE: Please refer to the migration notes!
* 1931 FIX: agent_vsphere: no longer crashes when host has no license information
@@ -223,7 +223,7 @@
* 1664 FIX: mknotifyd: further performance improvements for notification forwarding
* 1205 FIX: RBN: Fixed match contactgroup condition...
* 1810 FIX: Rule based notifications: Fixed output of non contact mail recipient address in analyze table...
- * 1988 FIX: Gracefully handline invalid empty bulk notification files from previous buggy versions
+ * 1988 FIX: Gracefully handle invalid empty bulk notification files from previous buggy versions
BI:
* 1784 FIX: Fix exception in BI Boxes when parents are being used
Module: check_mk
Branch: master
Commit: 4d8234ec62f8bfaafac07ebcfa0be8542bcd4eef
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d8234ec62f8bf…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Mon Feb 9 10:41:07 2015 +0100
more syntax fixes in werk descriptions
---
.werks/1217 | 5 +++--
.werks/1881 | 2 +-
.werks/1887 | 2 +-
.werks/1925 | 6 +++---
.werks/1926 | 10 +++++-----
.werks/1970 | 9 +++++----
.werks/1972 | 6 +++---
.werks/1974 | 7 ++++---
.werks/1988 | 2 +-
9 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/.werks/1217 b/.werks/1217
index f9f219e..5c07d93 100644
--- a/.werks/1217
+++ b/.werks/1217
@@ -6,6 +6,7 @@ Version: 1.2.7i1
Date: 1422451362
Class: feature
-The Check now uses the Wato Temperature Rule who provides more configuration options.
-If you used the Wato Room Temeperature Rule before, you have to migrate the levels.
+The check now uses the WATO temperature rule which provides more configuration
+options. If you have used the WATO room temperature rule until now, you
+have to migrate the levels.
diff --git a/.werks/1881 b/.werks/1881
index e634fc3..1cc0852 100644
--- a/.werks/1881
+++ b/.werks/1881
@@ -1,4 +1,4 @@
-Title: omd_status: Check works now event when a site is reported as not OK
+Title: omd_status: Check works now even when a site is reported as not OK
Level: 1
Component: checks
Class: fix
diff --git a/.werks/1887 b/.werks/1887
index 1569219..af463bf 100644
--- a/.werks/1887
+++ b/.werks/1887
@@ -1,4 +1,4 @@
-Title: Logwatch event console forwarding: Better dealing with logwatch states
+Title: Logwatch event console forwarding: Better handling of logwatch states
Level: 1
Component: checks
Class: fix
diff --git a/.werks/1925 b/.werks/1925
index 662139d..04a4a6a 100644
--- a/.werks/1925
+++ b/.werks/1925
@@ -7,6 +7,6 @@ State: unknown
Version: 1.2.7i1
Date: 1422615110
-If you have created an auxiliary host tag with a topic this
-is not also used in any of the normal host tags then that tag
-would not be displayed in the rule editor. This has been fixed.
+If you have created an auxiliary host tag with a topic which
+is not also used with any of the normal host tags, the tag
+was not displayed in the rule editor. This has been fixed.
diff --git a/.werks/1926 b/.werks/1926
index ac25836..ac9dbee 100644
--- a/.werks/1926
+++ b/.werks/1926
@@ -10,12 +10,12 @@ Date: 1422625157
In werk #1563 we moved all parameters for the process check to
a check parameter rule set in normal Check_MK style. Previously
these parameters (like process count, CPU levels, etc.) had been
-set only during discovery. But that way existing configuration
+set only during discovery. Due to this werk existing configurations
with rules for process inventory would not work anymore.
-This werk fixes this. All old inventory rule (now called
-discovery) work again. Also they are ediable via WATO. You can
-set the process parameters now in two places: during discovery
+This werk fixes this. All old inventory (now called
+discovery) rules work again. Also they are ediable via WATO. Now you can
+set the process parameters in two places: during discovery
and in the parameter rule. The preferred way is the new way:
-to set these in the parameter rule. That way changes will immediately
+to set them in the parameter rule. That way changes will immediately
get active without a need for a new discovery.
diff --git a/.werks/1970 b/.werks/1970
index 28f0a1a..af385bf 100644
--- a/.werks/1970
+++ b/.werks/1970
@@ -1,4 +1,4 @@
-Title: lparstat_aix: Made the check compatible to different kind of lparstat output
+Title: lparstat_aix: Made the check compatible to different kinds of lparstat output
Level: 1
Component: checks
Class: fix
@@ -7,6 +7,7 @@ State: unknown
Version: 1.2.7i1
Date: 1422627719
-lparstat seem to produce a lot of different kinds of output, meaning different number
-and order of columns. The check can now deal with a lot more kind of output types.
-To get this new flexibility, you need to use the newest version of the agent now.
+lparstat seem to produce a lot of different kinds of output, meaning different
+number and order of columns. The check can now deal with a lot more
+output types. To get this new flexibility, you need to use the newest
+version of the agent now.
diff --git a/.werks/1972 b/.werks/1972
index e59c19f..bc16b29 100644
--- a/.werks/1972
+++ b/.werks/1972
@@ -7,6 +7,6 @@ State: unknown
Version: 1.2.7i1
Date: 1422873119
-When performing "activate changes" in WATO, the quicksearch field of the sidebar was cleared
-during this process. This lead to user confusions when typing into the quicksearch field
-while the activate changes process was completing.
+When performing "activate changes" in WATO, the quicksearch field of
+the sidebar was cleared. This led to user confusion when typing into the
+quicksearch field while the activate changes process was completing.
diff --git a/.werks/1974 b/.werks/1974
index 6cb7863..7671798 100644
--- a/.werks/1974
+++ b/.werks/1974
@@ -7,7 +7,8 @@ State: unknown
Version: 1.2.7i1
Date: 1422880977
-Some times the event console views were accessed with a host filter,
-for example using the name of a host, the view was showing events
+Sometimes the event console views were accessed with a host filter,
+for example using the name of a host. The view was showing events
which did not belong to this host. After reloading the page, the
-view was showing a correctly filtered list again some times.
+view was showing a correctly filtered list again. This behaviour has
+been fixed.
diff --git a/.werks/1988 b/.werks/1988
index d7ad40a..479b981 100644
--- a/.werks/1988
+++ b/.werks/1988
@@ -1,4 +1,4 @@
-Title: Gracefully handline invalid empty bulk notification files from previous buggy versions
+Title: Gracefully handle invalid empty bulk notification files from previous buggy versions
Level: 1
Component: notifications
Class: fix
Module: check_mk
Branch: master
Commit: e863941dda641362168ecb7ac6575d26e6e1fed6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e863941dda6413…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Mon Feb 9 10:17:14 2015 +0100
various syntax fixes in the werk descriptions
---
.werks/1827 | 14 +++++++-------
.werks/1938 | 4 ++--
.werks/1977 | 2 +-
.werks/1978 | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.werks/1827 b/.werks/1827
index 06e46a7..8bfc825 100644
--- a/.werks/1827
+++ b/.werks/1827
@@ -7,13 +7,13 @@ State: unknown
Version: 1.2.7i1
Date: 1422393240
-The WATO rule missed a configuration for default increment on datafiles.
-This has been added.
+The WATO rule was lacking a configuration for the default increment on
+datafiles. This has been added.
Importan Note:
-The old configuration variable <tt>oracle_tablespaces_check_default_increment</tt>
-has been replaced with the dictionary based parameter <tt>defaultincrement</tt>.
-The default behaivor is still true and only users who disabled the check
-for default increment need to add a rule with the new dictionary based
-parameter.
+The old configuration variable
+<tt>oracle_tablespaces_check_default_increment</tt> has been replaced with
+the dictionary based parameter <tt>defaultincrement</tt>. This change does
+not modify the default behaviour. However, users who disabled the check for
+the default increment need to add a rule with the new dictionary based parameter.
diff --git a/.werks/1938 b/.werks/1938
index 72cc7d0..648334a 100644
--- a/.werks/1938
+++ b/.werks/1938
@@ -14,7 +14,7 @@ DOCSIS services used only the ChannelId as item name.
<li>Upstream Channel 3</li>
</ul>
-There are instances were this ChannelId is not unique, which causes the check
+There are instances when this ChannelId is not unique causing the check
to loose some services. With this update the docsis_channels_upstream check now
uses an additional parameter - the interface index - to make this service name unique.
@@ -27,5 +27,5 @@ uses an additional parameter - the interface index - to make this service name u
<li>Upstream Channel 1393.3</li>
</ul>
-<b>Note:</b> This extended item name is only used if it is required, means if there
+<b>Note:</b> The extended item name is only used when required, i.e. when there
are duplicate ChannelId entries for this device.
diff --git a/.werks/1977 b/.werks/1977
index aa29d5e..733556e 100644
--- a/.werks/1977
+++ b/.werks/1977
@@ -8,4 +8,4 @@ Version: 1.2.7i1
Date: 1423142432
Optimized the memory footprint of the Check_MK check helper processes
-which are used when using the CMC.
+used by the microcore (CMC).
diff --git a/.werks/1978 b/.werks/1978
index d0844e4..5abc7d8 100644
--- a/.werks/1978
+++ b/.werks/1978
@@ -7,5 +7,5 @@ State: unknown
Version: 1.2.7i1
Date: 1423149130
-Creating views with a joined columns which links to another view
+Creating views with a joined column which links to another view
resulted in an exception when displaying the view.
Module: check_mk
Branch: master
Commit: f0ecb88fac2239f5603eb638cb26e020315f157b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0ecb88fac2239…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Mon Feb 9 09:55:45 2015 +0100
syntax error in werk description
---
.werks/1991 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.werks/1991 b/.werks/1991
index 55f12dd..859aab0 100644
--- a/.werks/1991
+++ b/.werks/1991
@@ -12,4 +12,4 @@ the check can now be configured via WATO with all available features
and also has a Perf-O-Meter. The price for this is that the name
of the service has been changed, e.g. from <tt>Temperature 1-1</tt> to
<tt>Temperature Chassis Ambient Enclosure 1</tt>. This makes it more
-conveniant to write general rules, e.g. or all ambient sensors.
+convenient to write general rules, e.g. or all ambient sensors.