Module: check_mk
Branch: master
Commit: baa3039faf7e29a1cc9778ca2ad934ff22972583
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baa3039faf7e29…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Jun 27 13:03:45 2017 +0200
Made network interface and switch port discovery rule more user friendly
Change-Id: Idd2c1b850b3729c716e3b66dc69b31c3e3049acc
---
web/plugins/wato/check_parameters.py | 79 ++++++++++++++++++++----------------
1 file changed, 45 insertions(+), 34 deletions(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 6987cf5..e744e4c 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -816,30 +816,39 @@ register_rule(group + '/' + subgroup_inventory,
title = _("Network Interface and Switch Port Discovery"),
valuespec = Dictionary(
elements = [
- ( "use_desc",
- Checkbox(
- title = _("Use description as service name for network interface checks"),
- label = _("use description"),
- help = _("This option lets Check_MK use the interface description as item instead "
- "of the port number. If no description is available then the port number is "
- "used anyway."))),
- ( "use_alias",
- Checkbox(
- title = _("Use alias as service name for network interface checks"),
- label = _("use alias"),
- help = _("This option lets Check_MK use the alias of the port (ifAlias) as item instead "
- "of the port number. If no alias is available then the port number is used "
- "anyway."))),
- ( "pad_portnumbers",
- Checkbox(title = _("Pad port numbers with zeroes"),
- label = _("pad port numbers"),
- help = _("If this option is activated then Check_MK will pad port numbers of "
- "network interfaces with zeroes so that all port descriptions from "
- "all ports of a host or switch have the same length and thus sort "
- "currectly in the GUI. In versions prior to 1.1.13i3 there was no "
- "padding. You can switch back to the old behaviour by disabling this "
- "option. This will retain the old service descriptions and the old "
- "performance data."),
+ ( "use_desc", DropdownChoice(
+ choices = [
+ (True, _('Use description')),
+ (False, _('Do not use description')),
+ ],
+ title = _("Description as service name for network interface checks"),
+ help = _("This option lets Check_MK use the interface description as item instead "
+ "of the port number. If no description is available then the port number is "
+ "used anyway.")
+ )),
+ ( "use_alias", DropdownChoice(
+ choices = [
+ (True, _('Use alias')),
+ (False, _('Do not use alias')),
+ ],
+ title = _("Alias as service name for network interface checks"),
+ help = _("This option lets Check_MK use the alias of the port (ifAlias) as item instead "
+ "of the port number. If no alias is available then the port number is used "
+ "anyway.")
+ )),
+ ( "pad_portnumbers", DropdownChoice(
+ choices = [
+ (True, _('Pad port numbers with zeros')),
+ (False, _('Do not pad')),
+ ],
+ title = _("Port numbers"),
+ help = _("If this option is activated then Check_MK will pad port numbers of "
+ "network interfaces with zeroes so that all port descriptions from "
+ "all ports of a host or switch have the same length and thus sort "
+ "currectly in the GUI. In versions prior to 1.1.13i3 there was no "
+ "padding. You can switch back to the old behaviour by disabling this "
+ "option. This will retain the old service descriptions and the old "
+ "performance data."),
)),
( "match_alias",
ListOfStrings(
@@ -889,16 +898,18 @@ register_rule(group + '/' + subgroup_inventory,
toggle_all = True,
default_value = [ '6', '32', '62', '117', '127', '128', '129', '180', '181', '182', '205','229' ],
)),
- ( "rmon",
- Checkbox(
- title = _("Collect RMON statistics data"),
- help = _("If you enable this option, for every RMON capable switch port an additional service will "
- "be created which is always OK and collects RMON data. This will give you detailed information "
- "about the distribution of packet sizes transferred over the port. Note: currently "
- "this extra RMON check does not honor the inventory settings for switch ports. In a future "
- "version of Check_MK RMON data may be added to the normal interface service and not add "
- "an additional service."),
- label = _("Create extra service with RMON statistics data (if available for the device)"),
+ ( "rmon", DropdownChoice(
+ choices = [
+ (True, _("Create extra service with RMON statistics data (if available for the device)")),
+ (False, _('Do not create extra services')),
+ ],
+ title = _("Collect RMON statistics data"),
+ help = _("If you enable this option, for every RMON capable switch port an additional service will "
+ "be created which is always OK and collects RMON data. This will give you detailed information "
+ "about the distribution of packet sizes transferred over the port. Note: currently "
+ "this extra RMON check does not honor the inventory settings for switch ports. In a future "
+ "version of Check_MK RMON data may be added to the normal interface service and not add "
+ "an additional service."),
)),
],
help = _('This rule can be used to control the inventory for network ports. '
Module: check_mk
Branch: master
Commit: d9455172c8aefc640b37317d744057163dedf195
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9455172c8aefc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jun 27 12:12:03 2017 +0200
4902 SEC Monitoring history views: Fixed possible XSS when displaying "plugin output"
A possible XSS issue has been fixed in the monitoring history views displaying the
plugin output of hosts or services. In case a host or service problem is being
acknowledged with HTML code in the acknowlegement comment, this HTML code was
not being escaped properly when being displayed in the "plugin output" column.
Only authenticated users that are permitted to acknowledge host or service problems
could trigger this issue.
Change-Id: I800d2c48bb2dfcf72ed69852be897bba4e58feee
---
.werks/4902 | 17 +++++++++++++++++
web/plugins/views/painters.py | 5 ++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.werks/4902 b/.werks/4902
new file mode 100644
index 0000000..7fcaa3b
--- /dev/null
+++ b/.werks/4902
@@ -0,0 +1,17 @@
+Title: Monitoring history views: Fixed possible XSS when displaying "plugin output"
+Level: 1
+Component: multisite
+Class: security
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1498558049
+
+A possible XSS issue has been fixed in the monitoring history views displaying the
+plugin output of hosts or services. In case a host or service problem is being
+acknowledged with HTML code in the acknowlegement comment, this HTML code was
+not being escaped properly when being displayed in the "plugin output" column.
+
+Only authenticated users that are permitted to acknowledge host or service problems
+could trigger this issue.
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index afc0d87..ed52745 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -2221,10 +2221,13 @@ multisite_painters["log_message"] = {
def paint_log_plugin_output(row):
output = row["log_plugin_output"]
comment = row["log_comment"]
+
if output:
return "", format_plugin_output(output, row)
+
elif comment:
- return "", comment
+ return "", html.attrencode(comment)
+
else:
log_type = row["log_type"]
lst = row["log_state_type"]
Module: check_mk
Branch: master
Commit: ea5e9a0cacfb08228ae75bde0cacce04654ca7bc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea5e9a0cacfb08…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Jun 27 09:49:03 2017 +0200
Updated werk 4877
Change-Id: I4db7383baedcf9d1bca042d03adcfb485a9255b8
---
checkman/netscaler_vserver | 1 +
1 file changed, 1 insertion(+)
diff --git a/checkman/netscaler_vserver b/checkman/netscaler_vserver
index b1db83c..1649e92 100644
--- a/checkman/netscaler_vserver
+++ b/checkman/netscaler_vserver
@@ -6,6 +6,7 @@ distribution: check_mk
description:
This check monitors the status of the VServers of Citrix Netscaler
Loadbalacing Appliances. It uses snmp and the NS-ROOT-MIB to access the data.
+ Also request rate, received and transmitted byte rates are reported.
The check is in the state OK when the VServer is in the state {UP}. It is in the
state CRIT when the VServer is in the state {DOWN}. It is in the state WARN in
Module: check_mk
Branch: master
Commit: 0d68bf0149743fc5e7dd8d5505b0d9ec8fb2f288
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d68bf0149743f…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Mon Jun 26 17:38:01 2017 +0200
4908 FIX enterasys_powersupply: Fixed crash if empty output
This check will now change the state to UNKNOWN if the output is empty
instead of crashing completely.
Change-Id: I777ff8fa4afd95c6a38fea63911956427b21dad4
---
.werks/4908 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.werks/4908 b/.werks/4908
new file mode 100644
index 0000000..944826a
--- /dev/null
+++ b/.werks/4908
@@ -0,0 +1,11 @@
+Title: enterasys_powersupply: Fixed crash if empty output
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1498491403
+Class: fix
+
+This check will now change the state to UNKNOWN if the output is empty
+instead of crashing completely.