Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

Made network interface and switch port discovery rule more user friendly

by Simon Betz

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. '

7 years

Fixed permissions

by Simon Betz

Module: check_mk Branch: master Commit: 8c8629664cb89531e983acfde2895426c8bdbc89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8629664cb895… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 27 12:30:42 2017 +0200 Fixed permissions Change-Id: Ib2debce2e09dbe7c8d19f9cff16e988c8d7fd449 --- agents/plugins/mk_postgres | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres old mode 100644 new mode 100755

7 years

4291 mk_postgres, postgres_instances, postgres_bloat, postgres_conn_time, postgres_connections, postgres_locks, postgres_query_duration, postgres_sessions, postgres_stat_database, postgres_stats, postgres_version: plugin and checks are now instance aware

by Simon Betz

Module: check_mk Branch: master Commit: 2cdeca32a93f375933c5fe669f65abf5f77fa1d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cdeca32a93f37… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 24 12:48:38 2017 +0100 4291 mk_postgres, postgres_instances, postgres_bloat, postgres_conn_time, postgres_connections, postgres_locks, postgres_query_duration, postgres_sessions, postgres_stat_database, postgres_stats, postgres_version: plugin and checks are now instance aware Change-Id: Icbbe6ab01a4e57adf68ceb9ca58b1c19db09e48d --- .werks/4291 | 43 +++ agents/plugins/mk_postgres | 684 ++++++++++++++++++++++------------- checks/postgres.include | 14 +- checks/postgres_bloat | 22 +- checks/postgres_conn_time | 40 +- checks/postgres_connections | 78 ++-- checks/postgres_instances | 76 ++++ checks/postgres_locks | 28 +- checks/postgres_query_duration | 29 +- checks/postgres_sessions | 88 +++-- checks/postgres_stat_database | 59 +-- checks/postgres_stats | 109 +++--- checks/postgres_version | 34 +- web/plugins/wato/check_parameters.py | 33 ++ 14 files changed, 907 insertions(+), 430 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2cdeca32a9…

7 years

4902 SEC Monitoring history views: Fixed possible XSS when displaying " plugin output"

by Lars Michelsen

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"]

7 years

Updated werk 4877

by Simon Betz

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

7 years

4877 netscaler_vserver: Added some performance data such as request rate, received and transmitted byte rates

by Simon Betz

Module: check_mk Branch: master Commit: 8f4d961f8c2db2c3f0bb17d0a7c9b15058e87d74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4d961f8c2db2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 27 09:27:02 2017 +0200 4877 netscaler_vserver: Added some performance data such as request rate, received and transmitted byte rates Change-Id: I5baa5b1f367ca0137dae6837f86352a2eff35323 --- .werks/4877 | 10 ++++++++++ checks/netscaler_vserver | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/4877 b/.werks/4877 new file mode 100644 index 0000000..b1412a9 --- /dev/null +++ b/.werks/4877 @@ -0,0 +1,10 @@ +Title: netscaler_vserver: Added some performance data such as request rate, received and transmitted byte rates +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498548299 +Class: feature + + diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver index 3f7c727..47c6c57 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -93,8 +93,9 @@ def check_netscaler_vserver(item, params, info): if params is None: params = {} - for name, ip, port, svr_type, svr_state,\ - svr_health, svr_entitytype in info: + for name, ip, port, svr_type, svr_state, \ + svr_health, svr_entitytype, request_rate, \ + rx_bytes, tx_bytes in info: if name == item: svr_state, svr_state_readable = \ netscaler_vserver_states.get(svr_state, ("unknown", 1)) @@ -124,6 +125,14 @@ def check_netscaler_vserver(item, params, info): netscaler_vserver_types.get(svr_type, "service unknown (%s)" % svr_type), ip, port) + request_rate = int(request_rate) + rx_bytes = int(rx_bytes) + tx_bytes = int(tx_bytes) + yield 0, "Request rate: %s/s, In: %s/s, Out: %s/s" % \ + (request_rate, get_bytes_human_readable(rx_bytes), + get_bytes_human_readable(tx_bytes)), \ + [("request_rate", request_rate), ("if_in_octets", rx_bytes), ("if_out_octets", tx_bytes)] + check_info["netscaler_vserver"] = { "check_function" : check_netscaler_vserver, @@ -137,6 +146,9 @@ check_info["netscaler_vserver"] = { 5, # vsvrState 62, # vsvrHealth 64, # vsvrEntityType + 43, # NS-ROOT-MIB::vsvrRequestRate + 44, # NS-ROOT-MIB::vsvrRxBytesRate + 45, # NS-ROOT-MIB::vsvrTxBytesRate ]), "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"),

7 years

4909 FIX arris_cmts_cpu: Fixed crash if thresholds are set

by Marcel Arentz

Module: check_mk Branch: master Commit: f0fabc696cd2d783d40204535adeeeabde1eed64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0fabc696cd2d7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jun 26 17:57:50 2017 +0200 4909 FIX arris_cmts_cpu: Fixed crash if thresholds are set Change-Id: I1bf072efef0c128c5b6afa23dc9d4ba3f9ac6886 --- .werks/4909 | 10 ++++++++++ checks/arris_cmts_cpu | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4909 b/.werks/4909 new file mode 100644 index 0000000..2c0b0de --- /dev/null +++ b/.werks/4909 @@ -0,0 +1,10 @@ +Title: arris_cmts_cpu: Fixed crash if thresholds are set +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498492632 +Class: fix + + diff --git a/checks/arris_cmts_cpu b/checks/arris_cmts_cpu index 8323953..5da3238 100644 --- a/checks/arris_cmts_cpu +++ b/checks/arris_cmts_cpu @@ -38,6 +38,9 @@ def inventory_arris_cmts_cpu(info): yield item, 'arris_cmts_cpu_default_levels' def check_arris_cmts_cpu(item, params, info): + if type(params) is tuple: + params = { "levels" : params, } + for oid_id, cpu_id, cpu_idle_util in info: # see inventory function if cpu_id: @@ -48,7 +51,8 @@ def check_arris_cmts_cpu(item, params, info): if citem == item: # We get the IDLE percentage, but need the usage cpu_util = 100 - int(cpu_idle_util) - warn, crit = params + warn, crit = params['levels'] + infotext = "Current utilization is: %d %% " % cpu_util levels = " (warn/crit at %.1f/%.1f %%)" % (warn, crit) perfdata = [ ( "util", cpu_util, warn, crit ) ]

7 years

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 09b28ce54bfcae021a14e02848fdfc6cccde007e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09b28ce54bfcae… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jun 26 17:36:03 2017 +0200 Reserved 10 Werk IDS Change-Id: Ied2dd600d24f252fb66e850677dcb515d5593070 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index af9a862..a1001fd 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4908 +4918

7 years

4908 FIX enterasys_powersupply: Fixed crash if empty output

by Marcel Arentz

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.

7 years

4826 FIX juniper_cpu_util: No crash anymore if information is not provided

by Marcel Arentz

Module: check_mk Branch: master Commit: 2202283d5a915f69feb39d2d291e768f1ba09a8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2202283d5a915f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jun 26 15:49:36 2017 +0200 4826 FIX juniper_cpu_util: No crash anymore if information is not provided Change-Id: Icecda56d0f5fd9bdbc355869342add7ea1069171 --- .werks/4826 | 10 ++++++++++ checks/juniper_cpu_util | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/4826 b/.werks/4826 new file mode 100644 index 0000000..cca0644 --- /dev/null +++ b/.werks/4826 @@ -0,0 +1,10 @@ +Title: juniper_cpu_util: No crash anymore if information is not provided +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498484944 +Class: fix + + diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index 3d1a51a..a513a46 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -37,6 +37,8 @@ def check_juniper_cpu_util(item, params, info): for name, util in info: if name == item: + if util == "": + return 3, "Information not available" return check_cpu_util(int(util), params)

7 years

← Newer
1
...
4
5
6
7
8
9
10
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017