Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1588 FIX Renamed SNMP communities rule to SNMP credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: b78b1a60d8d299c58537ee01c285bc81a14693c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b78b1a60d8d299… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 10:32:14 2014 +0100 #1588 FIX Renamed SNMP communities rule to SNMP credentials --- .werks/1588 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 12 ++++++++++-- web/plugins/wato/check_mk_configuration.py | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/1588 b/.werks/1588 new file mode 100644 index 0000000..473dc5e --- /dev/null +++ b/.werks/1588 @@ -0,0 +1,9 @@ +Title: Renamed SNMP communities rule to SNMP credentials +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417599120 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 369b516..4f1e0ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 1546 FIX: Fixed adding cluster nodes to new cluster in complain phase... * 1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore... * 1576 FIX: SNMP Community host attribute is now visible for IE<=8... + * 1588 FIX: Renamed SNMP communities rule to SNMP credentials Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/modules/check_mk.py b/modules/check_mk.py index e278ace..f1afbe8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4618,16 +4618,24 @@ def dump_host(hostname): inline = "yes" else: inline = "no" + credentials = snmp_credentials_of(hostname) + if type(credentials) in [ str, unicode ]: + cred = "community: \'%s\'" % credentials + else: + cred = "credentials: '%s'" % ", ".join(credentials) + if is_bulkwalk_host(hostname): bulk = "yes" else: bulk = "no" + portinfo = snmp_port_of(hostname) if portinfo == None: portinfo = 'default' - agenttypes.append("SNMP (community: '%s', bulk walk: %s, port: %s, inline: %s)" % - (credentials, bulk, portinfo, inline)) + + agenttypes.append("SNMP (%s, bulk walk: %s, port: %s, inline: %s)" % + (cred, bulk, portinfo, inline)) if is_ping_host(hostname): agenttypes.append('PING only') diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index caa2468..30fab55 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2289,8 +2289,8 @@ register_rule(group, ])], default_value = "public", - title = _("SNMP communities of monitored hosts"), - help = _("By default Check_MK uses the community \"public\" to contact hosts via SNMP. This rule " + title = _("SNMP credentials of monitored hosts"), + help = _("By default Check_MK uses the community \"public\" to contact hosts via SNMP v1/v2. This rule " "can be used to customize the the credentials to be used when contacting hosts via SNMP."))) register_rule(group,

9 years, 9 months

Check_MK Git: check_mk: #1589 FIX Restructured SNMP credentials rule specification

by Lars Michelsen

Module: check_mk Branch: master Commit: ab8293853b1e8dd25e40ab28b821960baafb1137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab8293853b1e8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:21:49 2014 +0100 #1589 FIX Restructured SNMP credentials rule specification Previous valuespec allowed wrong configurations which lead to non working SNMP credential values. --- .werks/1589 | 10 +++ ChangeLog | 1 + web/htdocs/check_mk.css | 8 +-- web/htdocs/valuespec.py | 5 ++ web/plugins/wato/check_mk_configuration.py | 104 ++++++++++++++++++---------- 5 files changed, 85 insertions(+), 43 deletions(-) diff --git a/.werks/1589 b/.werks/1589 new file mode 100644 index 0000000..b169304 --- /dev/null +++ b/.werks/1589 @@ -0,0 +1,10 @@ +Title: Restructured SNMP credentials rule specification +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417602070 +Class: fix + +Previous valuespec allowed wrong configurations which lead to non +working SNMP credential values. diff --git a/ChangeLog b/ChangeLog index 4f1e0ff..cf8be8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore... * 1576 FIX: SNMP Community host attribute is now visible for IE<=8... * 1588 FIX: Renamed SNMP communities rule to SNMP credentials + * 1589 FIX: Restructured SNMP credentials rule specification... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9e60aa1..a2cd9c9 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -393,13 +393,7 @@ table.valuespec_tuple td { } table.valuespec_tuple td.tuple_left { - padding-right: 8px; - padding-top: 5px; -} - -table.valuespec_tuple td.tuple_right, -table.valuespec_tuple td.tuple_left { - /* padding-bottom: 3px; */ + vertical-align: middle; } table.valuespec_tuple span.title { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 24a7c41..1d21eb6 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -353,6 +353,7 @@ class TextAscii(ValueSpec): self._regex = kwargs.get("regex") self._regex_error = kwargs.get("regex_error", _("Your input does not match the required format.")) + self._minlen = kwargs.get('minlen', None) if type(self._regex) == str: self._regex = re.compile(self._regex) self._prefix_buttons = kwargs.get("prefix_buttons", []) @@ -430,6 +431,10 @@ class TextAscii(ValueSpec): if value and self._regex: if not self._regex.match(value): raise MKUserError(varprefix, self._regex_error) + + if self._minlen != None and len(value) < self._minlen: + raise MKUserError(varprefix, _("You need to provide at least %d characters.") % self._minlen) + ValueSpec.custom_validate(self, value, varprefix) class TextUnicode(TextAscii): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 30fab55..29936a1 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2247,47 +2247,79 @@ register_rule(group, "and can change.")) group = "agent/" + _("SNMP") -_snmpv3_basic_elements = [ - DropdownChoice( - choices = [ - ( "authPriv", _("authPriv")), - ( "authNoPriv", _("authNoPriv")), - ( "noAuthNoPriv", _("noAuthNoPriv")), - ], - title = _("Security level")), - DropdownChoice( - choices = [ - ( "md5", _("MD5") ), - ( "sha", _("SHA1") ), - ], - title = _("Authentication protocol")), - TextAscii(title = _("Security name"), attrencode = True), - Password(title = _("Authentication password"))] +_snmpv3_auth_elements = [ + DropdownChoice( + choices = [ + ( "md5", _("MD5") ), + ( "sha", _("SHA1") ), + ], + title = _("Authentication protocol") + ), + TextAscii( + title = _("Security name"), + attrencode = True + ), + Password( + title = _("Authentication password"), + minlen = 8, + ) +] register_rule(group, "snmp_communities", Alternative( - elements = [ - TextAscii( - title = _("SNMP community (SNMP Versions 1 and 2c)"), - allow_empty = False, - attrencode = True, - ), - Tuple( - title = _("Credentials for SNMPv3"), - elements = _snmpv3_basic_elements), - Tuple( - title = _("Credentials for SNMPv3 including privacy options"), - elements = _snmpv3_basic_elements + [ - DropdownChoice( - choices = [ - ( "DES", _("DES") ), - ( "AES", _("AES") ), - ], - title = _("Privacy protocol")), - Password(title = _("Privacy pass phrase")), - ])], + elements = [ + TextAscii( + title = _("SNMP community (SNMP Versions 1 and 2c)"), + allow_empty = False, + attrencode = True, + ), + Tuple( + title = _("Credentials for SNMPv3 without authentication and privacy (noAuthNoPriv)"), + elements = [ + FixedValue("noAuthNoPriv", + title = _("Security Level"), + totext = _("No authentication, no privacy"), + ), + ] + ), + Tuple( + title = _("Credentials for SNMPv3 with authentication but without privacy (authNoPriv)"), + elements = [ + FixedValue("authNoPriv", + title = _("Security Level"), + totext = _("authentication but no privacy"), + ), + ] + _snmpv3_auth_elements + ), + Tuple( + title = _("Credentials for SNMPv3 with authentication and privacy (authPriv)"), + elements = [ + FixedValue("authPriv", + title = _("Security Level"), + totext = _("authentication and encryption"), + ), + ] + _snmpv3_auth_elements + [ + DropdownChoice( + choices = [ + ( "DES", _("DES") ), + ( "AES", _("AES") ), + ], + title = _("Privacy protocol") + ), + Password( + title = _("Privacy pass phrase"), + minlen = 8, + ), + ] + ), + ], + + match = lambda x: type(x) == tuple and ( \ + len(x) == 1 and 1 or \ + len(x) == 4 and 2 or 3) or 0, + style = "dropdown", default_value = "public", title = _("SNMP credentials of monitored hosts"), help = _("By default Check_MK uses the community \"public\" to contact hosts via SNMP v1/v2. This rule "

9 years, 9 months

Check_MK Git: check_mk: #1591 FIX netapp_volumes: The state mixed_raid_type is now treated as non-critical state

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b66505c84964c62c73efa4d32c8b6945662f45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b66505c84964… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:46:16 2014 +0100 #1591 FIX netapp_volumes: The state mixed_raid_type is now treated as non-critical state --- .werks/1591 | 9 ++++ ChangeLog | 1 + checks/netapp_volumes | 113 ++++++++++++++++++++++++------------------------- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/.werks/1591 b/.werks/1591 new file mode 100644 index 0000000..ca4a8f5 --- /dev/null +++ b/.werks/1591 @@ -0,0 +1,9 @@ +Title: netapp_volumes: The state mixed_raid_type is now treated as non-critical state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417603533 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 567efd6..a69153e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... * 1590 FIX: printer_supply_ricoh: Fixed broken check + * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 1918cc1..05e5fe4 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -24,62 +24,60 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - -#.1.3.6.1.4.1.789.1.5.8.1.1.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.1.2 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.1.3 = INTEGER: 3 -#.1.3.6.1.4.1.789.1.5.8.1.2.1 = STRING: "vol0" -#.1.3.6.1.4.1.789.1.5.8.1.2.2 = STRING: "RvRBackup" -#.1.3.6.1.4.1.789.1.5.8.1.2.3 = STRING: "RundV" -#.1.3.6.1.4.1.789.1.5.8.1.3.1 = STRING: "67155442" -#.1.3.6.1.4.1.789.1.5.8.1.3.2 = STRING: "2600515058" -#.1.3.6.1.4.1.789.1.5.8.1.3.3 = STRING: "788575730" -#.1.3.6.1.4.1.789.1.5.8.1.4.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.4.2 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.4.3 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.5.1 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.5.2 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.5.3 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.6.1 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.6.2 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.6.3 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.7.1 = STRING: "root, diskroot, nosnap=off, -# nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, -# nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, -# convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, -# svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, -# no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.7.2 = STRING: "nosnap=off, nosnapdir=off, -# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, -# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, -# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, -# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, -# fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.7.3 = STRING: "nosnap=on, nosnapdir=on, -# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, -# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, -# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, -# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, -# fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.8.1 = STRING: "1ddc9920-496e-11df-aae1-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.8.2 = STRING: "62ac1040-5a8d-11df-83fd-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.8.3 = STRING: "4edc66e0-d6a3-11df-8724-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.9.1 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.9.2 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.9.3 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.10.1 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.10.2 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.10.3 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.11.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.11.2 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.11.3 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.12.1 = "" -#.1.3.6.1.4.1.789.1.5.8.1.12.2 = "" -#.1.3.6.1.4.1.789.1.5.8.1.12.3 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.1 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.2 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.3 = "" +# .1.3.6.1.4.1.789.1.5.8.1.1.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.1.2 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.1.3 = INTEGER: 3 +# .1.3.6.1.4.1.789.1.5.8.1.2.1 = STRING: "vol0" +# .1.3.6.1.4.1.789.1.5.8.1.2.2 = STRING: "RvRBackup" +# .1.3.6.1.4.1.789.1.5.8.1.2.3 = STRING: "RundV" +# .1.3.6.1.4.1.789.1.5.8.1.3.1 = STRING: "67155442" +# .1.3.6.1.4.1.789.1.5.8.1.3.2 = STRING: "2600515058" +# .1.3.6.1.4.1.789.1.5.8.1.3.3 = STRING: "788575730" +# .1.3.6.1.4.1.789.1.5.8.1.4.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.4.2 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.4.3 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.5.1 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.5.2 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.5.3 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.6.1 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.6.2 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.6.3 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.7.1 = STRING: "root, diskroot, nosnap=off, +# nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, +# nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, +# convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, +# svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, +# no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.7.2 = STRING: "nosnap=off, nosnapdir=off, +# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, +# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, +# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, +# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, +# fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.7.3 = STRING: "nosnap=on, nosnapdir=on, +# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, +# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, +# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, +# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, +# fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.8.1 = STRING: "1ddc9920-496e-11df-aae1-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.8.2 = STRING: "62ac1040-5a8d-11df-83fd-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.8.3 = STRING: "4edc66e0-d6a3-11df-8724-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.9.1 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.9.2 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.9.3 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.10.1 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.10.2 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.10.3 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.11.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.11.2 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.11.3 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.12.1 = "" +# .1.3.6.1.4.1.789.1.5.8.1.12.2 = "" +# .1.3.6.1.4.1.789.1.5.8.1.12.3 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.1 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.2 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.3 = "" netapp_volumes_owner = { '1': 'local', @@ -107,7 +105,8 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += '(!)' - elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored', 'raid4' ]: + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', + 'raid0, mirrored', 'raid4', 'mixed_raid_type' ]: ret_state = 2 output += '(!!)'

9 years, 9 months

Check_MK Git: check_mk: #1590 FIX printer_supply_ricoh: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: 02f06fbbaf62c721a62b6571d07c5cf859a8a52d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02f06fbbaf62c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:37:55 2014 +0100 #1590 FIX printer_supply_ricoh: Fixed broken check --- .werks/1590 | 9 +++++++++ ChangeLog | 1 + checks/printer_supply_ricoh | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1590 b/.werks/1590 new file mode 100644 index 0000000..fc5e80e --- /dev/null +++ b/.werks/1590 @@ -0,0 +1,9 @@ +Title: printer_supply_ricoh: Fixed broken check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417603065 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cf8be8c..567efd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... + * 1590 FIX: printer_supply_ricoh: Fixed broken check Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/printer_supply_ricoh b/checks/printer_supply_ricoh index d90510d..f7384f1 100644 --- a/checks/printer_supply_ricoh +++ b/checks/printer_supply_ricoh @@ -40,7 +40,7 @@ def check_printer_supply_ricoh(item, params, info): state = 2 elif level < warn: state = 1 - message = "Remaining: %s%%%s (levels at %d%%/%d%%) " % (level, label, warn, crit) + message = "Remaining: %s%% (levels at %d%%/%d%%) " % (level, warn, crit) perfdata = [ ("level", level, warn, crit, 0, 100)] return (state, message, perfdata) return(3, "Supply information not found")

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7895c77f0b7f28cd5e8ed972dda7873b5e1bb3c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7895c77f0b7f28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:51:10 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3c8cfd3..fed8f61 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1602 +1622

9 years, 9 months

Check_MK Git: check_mk: #1602 FIX dell_om_esmlog: Fixed typo in plugin output

by Lars Michelsen

Module: check_mk Branch: master Commit: 331d8284a035e09e5c2042fd634fa6ad66b115ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=331d8284a035e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:51:34 2014 +0100 #1602 FIX dell_om_esmlog: Fixed typo in plugin output --- .werks/1602 | 9 +++++++++ ChangeLog | 1 + checks/dell_om_esmlog | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1602 b/.werks/1602 new file mode 100644 index 0000000..9a938a7 --- /dev/null +++ b/.werks/1602 @@ -0,0 +1,9 @@ +Title: dell_om_esmlog: Fixed typo in plugin output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417603875 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3a782b2..2eaf4a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... * 1590 FIX: printer_supply_ricoh: Fixed broken check * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state + * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/dell_om_esmlog b/checks/dell_om_esmlog index 59576a3..b6eabb5 100644 --- a/checks/dell_om_esmlog +++ b/checks/dell_om_esmlog @@ -36,10 +36,10 @@ def check_dell_om_esmlog(_no_item, _no_params, info): message = "ESM Log is full" elif status == 3: state = 0 - message = "EMS Log is less then 80% full" + message = "EMS Log is less than 80% full" else: state =1 - message = "EMS log more then 80% full" + message = "EMS log more than 80% full" return state, message

9 years, 9 months

Check_MK Git: check_mk: fixed exception with host_tag painters

by Andreas Boesl

Module: check_mk Branch: master Commit: 22b510e6d68723e599993ee6f12e44d536dbbf6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22b510e6d68723… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 3 11:23:08 2014 +0100 fixed exception with host_tag painters --- web/plugins/views/painters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0f1c01d..89a4e56 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1962,6 +1962,7 @@ def load_host_tag_painters(): multisite_painters["host_tag_" + tgid] = { "title" : _("Host tag:") + ' ' + long_tit, + "name" : "host_tag_" + tgid, "short" : tit, "columns" : [ "host_custom_variables" ], "paint" : paint_host_tag,

9 years, 9 months

Check_MK Git: check_mk: #1562 Move manual checks into a new WATO module

by Mathias Kettner

Module: check_mk Branch: master Commit: 46eae19c6aabe084cf7b5c5aeacd883ed9d3ce67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46eae19c6aabe0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 10:49:28 2014 +0100 #1562 Move manual checks into a new WATO module The rulesets for configuration manual checks (i.e. checks not created by the service discovery) have been moved into a new WATO module Manual Checks. This should save users from accidentally using these rules instead of their counterparts for invetorized checks. --- .werks/1562 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/images/icon_static_checks.png | Bin 0 -> 3242 bytes web/htdocs/wato.py | 28 +++++++++++++++++++++++----- web/plugins/wato/builtin_modules.py | 3 +++ 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.werks/1562 b/.werks/1562 new file mode 100644 index 0000000..9759232 --- /dev/null +++ b/.werks/1562 @@ -0,0 +1,12 @@ +Title: Move manual checks into a new WATO module +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417599830 +Class: feature + +The rulesets for configuration manual checks (i.e. checks not created by the service +discovery) have been moved into a new WATO module Manual Checks. This should +save users from accidentally using these rules instead of their counterparts for +invetorized checks. diff --git a/ChangeLog b/ChangeLog index ee7258c..01bbdca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * 1587 SEC: Prevent logging of passwords during initial distributed site login... * 1560 Put host and service groups into one WATO menu item... * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page + * 1562 Move manual checks into a new WATO module... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/images/icon_static_checks.png b/web/htdocs/images/icon_static_checks.png new file mode 100644 index 0000000..b7b58ee Binary files /dev/null and b/web/htdocs/images/icon_static_checks.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2132e18..a626574 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -834,6 +834,7 @@ def mode_folder(phase): global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "ruleeditor")]), "rulesets") + html.context_button(_("Manual Checks"), make_link([("mode", "static_checks")]), "static_checks") if auth_read: html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") if not g_folder.get(".lock_subfolders") and config.may("wato.manage_folders") and auth_write: @@ -13587,6 +13588,8 @@ def mode_ruleeditor(phase): title = _("Used Rulesets") help = _("Show only modified rulesets (all rulesets with at least one rule)") icon = "usedrulesets" + elif groupname == "static": # these have moved into their own WATO module + continue else: title, help = g_rulegroups.get(groupname, (groupname, "")) icon = "rulesets" @@ -13749,9 +13752,14 @@ def mode_ineffective_rules(phase): html.write('</div>') return +def mode_static_checks(phase): + return mode_rulesets(phase, "static") + + +def mode_rulesets(phase, group=None): + if not group: + group = html.var("group") # obligatory -def mode_rulesets(phase): - group = html.var("group") # obligatory search = html.var("search") if search != None: search = search.strip().lower() @@ -13760,6 +13768,10 @@ def mode_rulesets(phase): title = _("Used Rulesets") help = _("Non-empty rulesets") only_used = True + elif group == "static": + title = _("Manual Checks") + help = _("Here you can create explicit checks that are not being created by the automatic service discovery.") + only_used = False elif search != None: title = _("Rules matching ") + search help = _("All rules that contain '%s' in their name") % search @@ -13780,12 +13792,14 @@ def mode_rulesets(phase): elif phase == "buttons": if only_host: home_button() - html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor"), ("host", only_host)]), "back") + if group != "static": + html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor"), ("host", only_host)]), "back") html.context_button(only_host, make_link([("mode", "edithost"), ("host", only_host)]), "host") else: global_buttons() - html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") + if group != "static": + html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") if config.may("wato.hosts") or config.may("wato.seeall"): html.context_button(_("Folder"), make_link([("mode", "folder")]), "folder") return @@ -13818,7 +13832,7 @@ def mode_rulesets(phase): # Select matching rule groups while keeping their configured order groupnames = [ gn for gn, rulesets in g_rulespec_groups - if only_used or search != None or gn == group or gn.startswith(group + "/") ] + if only_used or search or gn == group or gn.startswith(group + "/") ] # In case of search we need to sort the groups since main chapters would # appear more than once otherwise. @@ -13853,6 +13867,9 @@ def mode_rulesets(phase): and search not in varname: continue + if search != None and groupname.startswith("static/"): + continue # search must not find these + # Handle case where a host is specified rulespec = g_rulespecs[varname] @@ -18208,6 +18225,7 @@ modes = { "edit_configvar" : (["global"], mode_edit_configvar), "ldap_config" : (["global"], mode_ldap_config), "ruleeditor" : (["rulesets"], mode_ruleeditor), + "static_checks" : (["rulesets"], mode_static_checks), "rulesets" : (["rulesets"], mode_rulesets), "ineffective_rules" : (["rulesets"], mode_ineffective_rules), "edit_ruleset" : (["rulesets"], mode_edit_ruleset), diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index d337e8b..5a6daaa 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -43,6 +43,9 @@ modules += [ _("Check parameters and other configuration variables on " "hosts and services") ), + ( "static_checks", _("Manual Checks"), "static_checks", "rulesets", + _("Configure fixed checks without using service discovery")), + ( "host_groups", _("Host & Service Groups"), "hostgroups", "groups", _("Organize your hosts and services in groups independent of the tree structure.") ),

9 years, 9 months

Check_MK Git: check_mk: #1560 Put host and service groups into one WATO menu item

by Mathias Kettner

Module: check_mk Branch: master Commit: 3ee6ad88206d229939412d753c891874f99659bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ee6ad88206d22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 10:17:42 2014 +0100 #1560 Put host and service groups into one WATO menu item There is now a common menu item in WATO for host and service groups. It points to the host group management where you can switch to the service groups. This makes the WATO menu a bit more cleaned up. --- .werks/1560 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 9 ++++++++- web/plugins/wato/builtin_modules.py | 7 ++----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.werks/1560 b/.werks/1560 new file mode 100644 index 0000000..cfa460e --- /dev/null +++ b/.werks/1560 @@ -0,0 +1,12 @@ +Title: Put host and service groups into one WATO menu item +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417598188 +Class: feature + +There is now a common menu item in WATO for host and service groups. It +points to the host group management where you can switch to the service +groups. This makes the WATO menu a bit more cleaned up. + diff --git a/ChangeLog b/ChangeLog index 369b516..07e2a0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 1504 WATO makes host tag and group information available for NagVis... * 1535 Disabled services on service discovery page now link to the ruleset * 1587 SEC: Prevent logging of passwords during initial distributed site login... + * 1560 Put host and service groups into one WATO menu item... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 089e6bb..750b92d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7769,7 +7769,14 @@ def mode_groups(phase, what): elif phase == "buttons": global_buttons() - html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") + if what == "host": + html.context_button(_("Service groups"), make_link([("mode", "service_groups")]), "hostgroups") + html.context_button(_("New host group"), make_link([("mode", "edit_host_group")]), "new") + elif what == "service": + html.context_button(_("Host groups"), make_link([("mode", "host_groups")]), "servicegroups") + html.context_button(_("New service group"), make_link([("mode", "edit_service_group")]), "new") + else: + html.context_button(_("New contact group"), make_link([("mode", "edit_contact_group")]), "new") if what == "contact": html.context_button(_("Rules"), make_link([("mode", "rulesets"), ("filled_in", "search"), ("search", _("contact group"))]), "rulesets") diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 9e9ff0f..7992dde 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -43,11 +43,8 @@ modules += [ _("Check parameters and other configuration variables on " "hosts and services") ), - ( "host_groups", _("Host Groups"), "hostgroups", "groups", - _("Organize your hosts in groups independent of the tree structure.") ), - - ( "service_groups", _("Service Groups"), "servicegroups", "groups", - _("Organize services in groups for a better overview in the status display.") ), + ( "host_groups", _("Host & Service Groups"), "hostgroups", "groups", + _("Organize your hosts and services in groups independent of the tree structure.") ), ( "users", _("Users"), "users", "users", _("Manage users of the monitoring system.") ),

9 years, 9 months

Check_MK Git: check_mk: #1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page

by Mathias Kettner

Module: check_mk Branch: master Commit: dbd2f29c6b28d4dadbb4c82bec5c1001214e6af4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd2f29c6b28d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 10:19:58 2014 +0100 #1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page --- .werks/1561 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +++ web/plugins/wato/builtin_modules.py | 3 --- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1561 b/.werks/1561 new file mode 100644 index 0000000..328bd54 --- /dev/null +++ b/.werks/1561 @@ -0,0 +1,9 @@ +Title: Remove Auditlog from the main WATO menu and put it into the activate Changes page +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417598377 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 07e2a0f..ee7258c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1535 Disabled services on service discovery page now link to the ruleset * 1587 SEC: Prevent logging of passwords during initial distributed site login... * 1560 Put host and service groups into one WATO menu item... + * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 750b92d..2132e18 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4648,6 +4648,9 @@ def mode_changelog(phase): if is_distributed(): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") + if config.may("wato.auditlog"): + html.context_button(_("Audit log"), make_link([("mode", "auditlog")]), "auditlog") + elif phase == "action": # Let host validators do their work diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 7992dde..d337e8b 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -71,9 +71,6 @@ modules += [ ( "sites", _("Distributed Monitoring"), "sites", "sites", _("Distributed monitoring via Multsite, distributed configuration via WATO")), - ( "auditlog", _("Audit Logfile"), "auditlog", "auditlog", - _("Keep track of all modifications and actions of the users in WATO.")), - ( "snapshot", _("Backup & Restore"), "backup", "snapshots", _("Make snapshots of your configuration, download, upload and restore snapshots.")),

9 years, 9 months

← Newer
1
...
43
44
45
46
47
48
49
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014