Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1680 FIX Fixed various dashlet designer position/ resizing issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 49828762594e9b8dec8b68da18ff897c2213b5e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49828762594e9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 23:25:16 2014 +0100 #1680 FIX Fixed various dashlet designer position/resizing issues Previous versions of the dashboard designer had problems with resizing, moving and changing the anchors of dynamically sized dashlets. Dashlets were flipping around in different situations and changing sizes in an unintended way. All known issues have been fixed now. --- .werks/1680 | 14 ++ ChangeLog | 1 + web/htdocs/dashboard.py | 6 +- web/htdocs/js/dashboard.js | 375 +++++++++++++++++++++++++++++--------------- 4 files changed, 268 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4982876259…

9 years, 9 months

Check_MK Git: check_mk: #1679 FIX ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature

by Lars Michelsen

Module: check_mk Branch: master Commit: a92acd82e50992f644c29a694568ea8c93693072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a92acd82e50992… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 19:45:38 2014 +0100 #1679 FIX ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature --- .werks/1679 | 9 +++++++++ ChangeLog | 1 + checks/ups_bat_temp | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1679 b/.werks/1679 new file mode 100644 index 0000000..ee50adf --- /dev/null +++ b/.werks/1679 @@ -0,0 +1,9 @@ +Title: ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417718606 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0f607b3..d358f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 1655 FIX: AIX Agent: Fixed broken filesystem checks when having PowerHA installed... * 1656 FIX: cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs... * 1677 FIX: f5_bigip_interfaces: Cleaned up check a bit + * 1679 FIX: ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index dcc7827..5088152 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -28,7 +28,9 @@ ups_bat_temp_default = (40, 50) # warning / critical def inventory_ups_bat_temp(info): - if len(info) > 0: + # 2nd condition is needed to catch some UPS devices which do not have + # any temperature sensor but report a 0 as upsBatteryTemperature. Skip those lines + if len(info) > 0 and saveint(info[0][1]) != 0: return [ ( x[0], "ups_bat_temp_default") for x in info ] def check_ups_bat_temp(item, params, info): @@ -45,7 +47,10 @@ check_info['ups_bat_temp'] = { "service_description" : "Temperature Battery %s", "has_perfdata" : True, "group" : "hw_temperature", - "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), + "snmp_info" : ( ".1.3.6.1.2.1.33.1", [ + "1.5", # upsIdentName + "2.7", # upsBatteryTemperature + ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'),

9 years, 9 months

Check_MK Git: check_mk: #1678 FIX Fixed problem with garbled styles on user profile page after saving

by Lars Michelsen

Module: check_mk Branch: master Commit: 12caa89e75d3e5eca8d4ef61a3f82898ec4f9cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12caa89e75d3e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 19:36:40 2014 +0100 #1678 FIX Fixed problem with garbled styles on user profile page after saving --- .werks/1678 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/1678 b/.werks/1678 new file mode 100644 index 0000000..235f7e3 --- /dev/null +++ b/.werks/1678 @@ -0,0 +1,9 @@ +Title: Fixed problem with garbled styles on user profile page after saving +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417718173 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1655bc4..9b71cda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -164,6 +164,7 @@ * 1641 FIX: Quicksearch: Now able to search for services with backslashes in names * 1642 FIX: Quicksearch: Improved error handling on invalid search statements (invalid regexes) * 1651 FIX: Consolidated painters of service list views... + * 1678 FIX: Fixed problem with garbled styles on user profile page after saving WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9e2cf6f..bbd4674 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15721,8 +15721,6 @@ def page_user_profile(change_pw=False): userdb.save_users(users) success = True - - html.reload_sidebar() except MKUserError, e: html.add_user_error(e.varname, e.message) @@ -15757,6 +15755,7 @@ def page_user_profile(change_pw=False): html.write('<p>%s</p>' % _('You are required to change your password before proceeding.')) if success: + html.reload_sidebar() if change_pw: html.message(_("Your password has been changed.")) html.http_redirect(html.var('_origtarget', 'index.py'))

9 years, 9 months

Check_MK Git: check_mk: #1697 Allow non-Ascii characters in topic of host tag groups

by Mathias Kettner

Module: check_mk Branch: master Commit: 07625976d9058320d17ec9fb9ce960e0c3672390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07625976d90583… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 19:11:47 2014 +0100 #1697 Allow non-Ascii characters in topic of host tag groups --- .werks/1697 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1697 b/.werks/1697 new file mode 100644 index 0000000..9f96a4f --- /dev/null +++ b/.werks/1697 @@ -0,0 +1,9 @@ +Title: Allow non-Ascii characters in topic of host tag groups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417716684 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1655bc4..883e749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,6 +175,7 @@ * 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... + * 1697 Allow non-Ascii characters in topic of host tag groups * 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 9e2cf6f..c53043d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12777,7 +12777,7 @@ def mode_edit_auxtag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic") + "<sup>*</sup>", choices = hosttag_topics(hosttags), - explicit = TextAscii(), + explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, ) @@ -12903,7 +12903,7 @@ def mode_edit_hosttag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic"), choices = hosttag_topics(hosttags), - explicit = TextAscii(), + explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, )

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 2f0df74cb5dc1295655d859a635f9d3025078429 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f0df74cb5dc12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 19:11:05 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 7c024ac..bdc2aea 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1697 +1717

9 years, 9 months

Check_MK Git: check_mk: #1677 FIX f5_bigip_interfaces: Cleaned up check a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: a2bf8c028b1d8d61c5c356ee329258adeb82a243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2bf8c028b1d8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 19:05:52 2014 +0100 #1677 FIX f5_bigip_interfaces: Cleaned up check a bit --- .werks/1677 | 9 ++++++++ ChangeLog | 4 +--- checks/f5_bigip_interfaces | 51 +++++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.werks/1677 b/.werks/1677 new file mode 100644 index 0000000..654b3ab --- /dev/null +++ b/.werks/1677 @@ -0,0 +1,9 @@ +Title: f5_bigip_interfaces: Cleaned up check a bit +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417716341 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 10e14e1..1655bc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,10 +55,7 @@ * 1631 juniper_bgp_state: check now detects and supports more differen device models... * 1645 Added basic kernel section to FreeBSD agent... * 1597 bluecat_dhcp, bluecat_dns: Checks can now be used in Check_MK Cluster Mode -<<<<<<< HEAD * 1599 check_mk_agent.aix: Simple run_cached Feature for plugins... -======= ->>>>>>> dcce27ee01c3b2f67401746d50991795f63e1bc5 * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... @@ -113,6 +110,7 @@ * 1654 FIX: statgrab_disk: Fixed scaling of values shown in PNP graphs... * 1655 FIX: AIX Agent: Fixed broken filesystem checks when having PowerHA installed... * 1656 FIX: cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs... + * 1677 FIX: f5_bigip_interfaces: Cleaned up check a bit Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/f5_bigip_interfaces b/checks/f5_bigip_interfaces index 13025d5..eee0ad2 100644 --- a/checks/f5_bigip_interfaces +++ b/checks/f5_bigip_interfaces @@ -24,37 +24,40 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.1. index for ifname +# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.1. index for ifname # .1.3.6.1.4.1.3375.2.1.2.4.1.2.1.17. index for ifstate -# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.3. index for OUT bytes -# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.5. index for IN bytes +# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.3. index for IN bytes +# .1.3.6.1.4.1.3375.2.1.2.4.4.3.1.5. index for OUT bytes + +f5_bigip_interface_states = { + 1 : "down (has no link and is initialized)", + 2 : "disabled (has been forced down)", + 3 : "uninitialized (has not been initialized)", + 4 : "loopback (in loopback mode)", + 5 : "unpopulated (interface not physically populated)", +} def check_f5_bigip_interfaces(item, params, info): for port, ifstate, inbytes, outbytes in info: - if item == port: - if int(ifstate) != 0: - states = { - 1 : "down (has no link and is initialized)", - 2 : "disabled has been forced down)", - 3 : "uninitialized (has not been initialized)", - 4 : "loopback (in loopback mode)", - 5 : "unpopulated (interface not physically populated)", - } - return(2, "State of %s is %s" % (states.get(ifstate,"unkown"), port)) - this_time = int(time.time()) - in_timedif, in_per_sec = get_counter("f5.interface.in.%s" % item, this_time, saveint(inbytes)) - out_timedif, out_per_sec = get_counter("f5_interface.out.%s" % item, this_time, saveint(outbytes)) + if item != port: + continue + if int(ifstate) != 0: + return (2, "State of %s is %s" % + (f5_bigip_interface_states.get(ifstate, "unhandled (%d)" % ifstate), port)) - inbytes_h = get_bytes_human_readable(in_per_sec) - outbytes_h = get_bytes_human_readable(out_per_sec) - perf = [ - ("bytes_in", in_per_sec), - ("bytes_out", out_per_sec), - ] - return (0, "in bytes: %s/s, out bytes: %s/s" % (inbytes_h, outbytes_h), perf) - return 3, "no such interface found in snmp data" + this_time = int(time.time()) + in_timedif, in_per_sec = get_counter("f5.interface.in.%s" % item, this_time, saveint(inbytes)) + out_timedif, out_per_sec = get_counter("f5_interface.out.%s" % item, this_time, saveint(outbytes)) + inbytes_h = get_bytes_human_readable(in_per_sec) + outbytes_h = get_bytes_human_readable(out_per_sec) + perf = [ + ("bytes_in", in_per_sec), + ("bytes_out", out_per_sec), + ] + return (0, "in bytes: %s/s, out bytes: %s/s" % (inbytes_h, outbytes_h), perf) + return 3, "Interface not found in SNMP data" check_info["f5_bigip_interfaces"] = { "check_function" : check_f5_bigip_interfaces,

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 02f95bc616ad5925334f038168d9bf780f510540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02f95bc616ad59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 19:05:30 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 9b53651..7c024ac 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1677 +1697

9 years, 9 months

Check_MK Git: check_mk: #1656 FIX cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs

by Lars Michelsen

Module: check_mk Branch: master Commit: 86e809f634796852f669f49ca132dbc289f8141d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86e809f6347968… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 18:42:00 2014 +0100 #1656 FIX cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs Improved check in different ways: - When configuring OK as failed tunnel state, this was not handled correctly by the check. - Clarified the valuespec titles and help texts. - Check did not process multiple VPN tunnel configurations defined in a single rule. - Cleaned up check code Sadly had no data for testing here... Let's hope for the best. --- .werks/1656 | 16 ++++++++++++++++ ChangeLog | 1 + checks/cisco_vpn_tunnel | 31 +++++++++++-------------------- web/plugins/wato/check_parameters.py | 24 ++++++++++++++---------- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/.werks/1656 b/.werks/1656 new file mode 100644 index 0000000..09422b3 --- /dev/null +++ b/.werks/1656 @@ -0,0 +1,16 @@ +Title: cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417714529 +Class: fix + +Improved check in different ways: + +- When configuring OK as failed tunnel state, this was not handled correctly by the check. +- Clarified the valuespec titles and help texts. +- Check did not process multiple VPN tunnel configurations defined in a single rule. +- Cleaned up check code + +Sadly had no data for testing here... Let's hope for the best. diff --git a/ChangeLog b/ChangeLog index 6f34768..d323b6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * 1653 FIX: megaraid_pdisks: Resulting states are now hard coded within the check... * 1654 FIX: statgrab_disk: Fixed scaling of values shown in PNP graphs... * 1655 FIX: AIX Agent: Fixed broken filesystem checks when having PowerHA installed... + * 1656 FIX: cisco_vpn_tunnel: Refactored complete check, fixed threshold bugs... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index ebc1fed..3b2e573 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -35,28 +35,20 @@ # remote peer." def check_cisco_vpn_tunnel(item, params, info): - if not info: - return 3, "SNMP Data for VPN Tunnel Missing" + tunnel_not_found_state = params.get('state', 2) # default error state - tunnels = params.get('tunnels',[]) - tunnel_alias = "" - if not params.get('state'): - tunnel_worst_state = 2 - else: - tunnel_worst_state = params.get('state') - if item in [tunnel[0] for tunnel in tunnels]: - if tunnel[1]: - tunnel_alias = " (%s)" % tunnel[1] - tunnel_worst_state = tunnel[2] + # Try to find individual error states by tunnel IP/name + tunnel_alias = "" + for tunnel in params.get('tunnels', []): + if item == tunnel[0]: + if tunnel[1]: + tunnel_alias = "[%s] " % tunnel[1] + tunnel_not_found_state = tunnel[2] - extra_info = "" - state = 0 if [item] not in info: - extra_info = " - Tunnel is missing" - state = tunnel_worst_state - - result = "%s%s%s" % (item, tunnel_alias, extra_info) - return state, result + return tunnel_not_found_state, "%sTunnel is missing" % tunnel_alias + else: + return state, "%sTunnel is OK" % tunnel_alias check_info["cisco_vpn_tunnel"] = { "check_function" : check_cisco_vpn_tunnel, @@ -67,4 +59,3 @@ check_info["cisco_vpn_tunnel"] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.171.1.2.3.1", [ 7 ] ), } - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c357cb9..860c29a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1596,25 +1596,29 @@ register_check_parameters( title = ("VPN Tunnel Endpoints"), elements = [ IPv4Address( - title = _("IP-Address of Tunnel Endpoint"), + title = _("IP-Address or Name of Tunnel Endpoint"), + help = _("The configured value must match a tunnel reported by the monitored " + "device."), allow_empty = False, - ), + ), TextAscii( - title = _("Name of Tunnel"), - ), + title = _("Tunnel Alias"), + help = _("You can configure an individual alias here for the tunnel matching " + "the IP-Address or Name configured in the field above."), + ), MonitoringState( default_value = 2, - title = _("State if this tunnel is not found"), + title = _("State if tunnel is not found"), )]), - add_label = _("Add another Tunnel"), + add_label = _("Add tunnel"), movable = False, - title = _("VPN Tunnel"), + title = _("VPN tunnel specific configuration"), )), ( "state", MonitoringState( - title = _("Default state if inventorized, unregistered tunnel is not found"), - help = _("Default state if a tunnel, which was inventorized but is not listed in this rule, " - "is not longer present in the snmp data"), + title = _("Default state to report when tunnel can not be found anymore"), + help = _("Default state if a tunnel, which is not listed above in this rule, " + "can no longer be found."), ), ), ],

9 years, 9 months

Check_MK Git: check_mk: #1655 FIX AIX Agent: Fixed broken filesystem checks when having PowerHA installed

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ee869cc787290296dd8e791e881160a5d84a35d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ee869cc787290… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 18:01:46 2014 +0100 #1655 FIX AIX Agent: Fixed broken filesystem checks when having PowerHA installed When installing PowerHA, a new filesystem is /aha is created and reported by the Check_MK agent. This line seems useless and causes trouble duing checking. We excluded this line now in the agent. --- .werks/1655 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.hpux | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1655 b/.werks/1655 new file mode 100644 index 0000000..0dd1e13 --- /dev/null +++ b/.werks/1655 @@ -0,0 +1,11 @@ +Title: AIX Agent: Fixed broken filesystem checks when having PowerHA installed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417712407 +Class: fix + +When installing PowerHA, a new filesystem is /aha is created and reported by +the Check_MK agent. This line seems useless and causes trouble duing checking. +We excluded this line now in the agent. diff --git a/ChangeLog b/ChangeLog index 7dd3850..6f34768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1652 FIX: kaspersky_av_quarantine: Fixed exception when a file was found in quarantine * 1653 FIX: megaraid_pdisks: Resulting states are now hard coded within the check... * 1654 FIX: statgrab_disk: Fixed scaling of values shown in PNP graphs... + * 1655 FIX: AIX Agent: Fixed broken filesystem checks when having PowerHA installed... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index b47f23b..a355ff9 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -58,7 +58,7 @@ echo AgentDirectory: $MK_CONFDIR # modern systems with vxfs only here. The filesystem type is currently # not used by the check anyway. echo '<<<df>>>' -df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -v ^/proc | grep -v ^Filesystem | grep -v : +df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" # Process table: HP-UX does not provide a resident size of processes. # We send a 0 here for RSZ.

9 years, 9 months

Check_MK Git: check_mk: Renamed inventory to service discovery in some places

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cd9cccae40516d008678a3c0bc87b0fe75ea806 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd9cccae40516… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 17:56:41 2014 +0100 Renamed inventory to service discovery in some places --- web/htdocs/wato.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4e72df9..9e2cf6f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -844,7 +844,7 @@ def mode_folder(phase): html.context_button(_("New cluster"), make_link([("mode", "newcluster")]), "new_cluster") html.context_button(_("Bulk Import"), make_link_to([("mode", "bulk_import")], g_folder), "bulk_import") if config.may("wato.services"): - html.context_button(_("Bulk Inventory"), make_link([("mode", "bulkinventory"), ("all", "1")]), + html.context_button(_("Bulk Discovery"), make_link([("mode", "bulkinventory"), ("all", "1")]), "inventory") if not g_folder.get(".lock_hosts") and config.may("wato.parentscan") and auth_write: html.context_button(_("Parent scan"), make_link([("mode", "parentscan"), ("all", "1")]), @@ -1353,7 +1353,7 @@ def show_hosts(folder): html.button("_bulk_edit", _("Edit")) html.button("_bulk_cleanup", _("Cleanup")) if config.may("wato.services"): - html.button("_bulk_inventory", _("Inventory")) + html.button("_bulk_inventory", _("Discovery")) if not g_folder.get(".lock_hosts"): if config.may("wato.parentscan"): html.button("_parentscan", _("Parentscan")) @@ -1442,11 +1442,11 @@ def show_hosts(folder): html.icon_button(edit_url, _("Edit the properties of this host"), "edit") html.icon_button(params_url, _("View the rule based parameters of this host"), "rulesets") if check_host_permissions(hostname, False) == True: - msg = _("Edit the services of this host, do an inventory") + msg = _("Edit the services of this host, do a service discovery") image = "services" if host.get("inventory_failed"): image = "inventory_failed" - msg += ". " + _("The inventory of this host failed during a previous bulk inventory.") + msg += ". " + _("The service discovery of this host failed during a previous bulk service discovery.") html.icon_button(services_url, msg, image) if not g_folder.get(".lock_hosts") and config.may("wato.manage_hosts"): if config.may("wato.clone_hosts"): @@ -2066,8 +2066,8 @@ def mode_edithost(phase, new, cluster): return elif new: if host.get('tag_agent') != 'ping': - create_result = 'folder', _('Successfully created the host. Now you should do an ' - '<a href="%s">inventory</a> in order to auto-configure ' + create_result = 'folder', _('Successfully created the host. Now you should do a ' + '<a href="%s">service discovery</a> in order to auto-configure ' 'all services to be checked on this host.') % \ make_link([("mode", "inventory"), ("host", hostname)]) else: @@ -2592,7 +2592,7 @@ def mode_object_parameters(phase): rulespec = g_rulespecs.get("static_checks:" + checkgroup) if rulespec: url = make_link([('mode', 'edit_ruleset'), ('varname', "static_checks:" + checkgroup), ('host', hostname)]) - render_rule_reason(_("Parameters"), url, _("Determined by inventory"), None, False, + render_rule_reason(_("Parameters"), url, _("Determined by discovery"), None, False, rulespec["valuespec"]._elements[2].value_to_text(serviceinfo["parameters"])) else: render_rule_reason(_("Parameters"), None, "", "", True, _("This check is not configurable via WATO")) @@ -3683,7 +3683,7 @@ def mode_bulk_import(phase): def mode_bulk_inventory(phase): if phase == "title": - return _("Bulk service detection (inventory)") + return _("Bulk Service Discovery") elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") @@ -3693,8 +3693,8 @@ def mode_bulk_inventory(phase): if html.var("_item"): if not html.check_transaction(): html.write(repr([ 'failed', 0, 0, 0, 0, 0, 0, ]) + "\n") - html.write(_("Error during inventory: Maximum number of retries reached. " - "You need to restart the bulk inventory")) + html.write(_("Error during discovery: Maximum number of retries reached. " + "You need to restart the bulk service discovery")) return "" how = html.var("how") @@ -3842,7 +3842,7 @@ def mode_bulk_inventory(phase): # Start interactive progress interactive_progress( items, - _("Bulk inventory"), # title + _("Bulk Service Discovery"), # title [ (_("Total hosts"), 0), (_("Failed hosts"), 0), (_("Services added"), 0),

9 years, 9 months

← Newer
1
...
30
31
32
33
34
35
36
...
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