Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed some English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: b5da11177dc3b9d286b1b9bd4a613a9c0322b4ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5da11177dc3b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 17:36:13 2015 +0100 Fixed some English texts --- web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/check_mk_configuration.py | 9 ++++++--- web/plugins/wato/check_parameters.py | 12 ++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index d8a7206..1488d43 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1380,7 +1380,7 @@ register_rule(group, elements = [ TextAscii( title = _("Base URL (OMD Site)"), - help = _("The base URL to the monitoring instance. For example <tt>http://<hostname>/<siteid></tt>. You can use " + help = _("The base URL to the monitoring instance. For example <tt>http://mycheckmk01/mysite</tt>. You can use " "macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this URL to make them be replaced by " "the hosts values."), size = 60, diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ce8c924..6d825cb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -986,10 +986,13 @@ register_configvar(group, ('num_groups', Integer( title = _("Number of character groups to use"), minvalue = 1, - help = _("Make the user choose the password from this number of character groups. " - "Character groups are: <ul><li>lowercase letters</li>" + maxvalue = 4, + help = _("Force the user to choose a password that contains characters from at least " + "this number of different character groups. " + "Character groups are: <ul>" + "<li>lowercase letters</li>" "<li>uppercase letters</li>" - "<li>numbers</li>" + "<li>digits</li>" "<li>special characters such as an underscore or dash</li>" "</ul>"), )), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index aa2d69f..d12a487 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -528,9 +528,9 @@ register_rule(group + '/' + subgroup_inventory, Dictionary( title = _("Default parameters for detected services"), help = _("Here you can select default parameters that are being set " - "few detected services. Note: the preferred way is to use " + "for detected services. Note: the preferred way for setting parameters is to use " "the rule set <a href='wato.py?varname=checkgroup_parameters%3Apsmode=edit_ruleset'> " - "State and Count of Processes</a> instead for setting parameters. " + "State and Count of Processes</a> instead. " "A change there will immediately be active, while a change in this rule " "requires a re-discovery of the services."), elements = process_level_elements, @@ -3693,9 +3693,9 @@ register_check_parameters( "oracle_dataguard_stats", _("Oracle Data-Guard Stats"), Dictionary( - help = _("The Data-Guard are availible in Oracle Enterprise Edition with enabled Data-Guard. " - "The init.ora Parameter dg_broker_start must be TRUE for this check. The apply and " - "transport lag could be configured with this rule."), + help = _("The Data-Guard statistics are available in Oracle Enterprise Edition with enabled Data-Guard. " + "The <tt>init.ora</tt> parameter <tt>dg_broker_start</tt> must be <tt>TRUE</tt> for this check. " + "The apply and transport lag can be configured with this rule."), elements = [ ( "apply_lag", Tuple( @@ -4812,7 +4812,7 @@ register_rule(group + '/' + subgroup_inventory, ), Integer( title = _("Offset"), - help = _("The Offset of the information relative to counter base"), + help = _("The offset of the information relative to counter base"), allow_empty = False, ), ]),

9 years, 5 months

Check_MK Git: check_mk: akcp_daisy_smoke is restricted to sensors which are connected to expansion boards

by Lutz Helwing

Module: check_mk Branch: master Commit: 1fda0e588d51f308d99439a4509a7b188d08a3fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fda0e588d51f3… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Fri Jan 30 17:07:28 2015 +0100 akcp_daisy_smoke is restricted to sensors which are connected to expansion boards --- checks/akcp_daisy_smoke | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/checks/akcp_daisy_smoke b/checks/akcp_daisy_smoke index 999f3da..9779b1e 100644 --- a/checks/akcp_daisy_smoke +++ b/checks/akcp_daisy_smoke @@ -60,10 +60,7 @@ check_info['akcp_daisy_smoke'] = { 'check_function' : check_akcp_daisy_smoke, 'inventory_function' : inventory_akcp_daisy_smoke, 'service_description' : 'Smoke %s', - 'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ - '.1.3.6.1.4.1.3854.1.2.2.1.1', - '.1.3.6.1.4.1.3854.1' - ], + 'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.3854.1') and oid('.1.3.6.1.4.1.3854.2.*'), 'snmp_info' : ( '.1.3.6.1.4.1.3854.2.3.14.1', [ 2, # SPAGENT-MIB:sensorSmokeDescription 6, # SPAGENT-MIB:sensorSmokeStatus

9 years, 5 months

Check_MK Git: check_mk: #1988 FIX Gracefully handline invalid empty bulk notification files from previous buggy versions

by Mathias Kettner

Module: check_mk Branch: master Commit: f913c02449ce58473e8e97496955a40479fc3343 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f913c02449ce58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 16:19:08 2015 +0100 #1988 FIX Gracefully handline invalid empty bulk notification files from previous buggy versions --- .werks/1988 | 10 ++++++++++ ChangeLog | 1 + modules/notify.py | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.werks/1988 b/.werks/1988 new file mode 100644 index 0000000..d7ad40a --- /dev/null +++ b/.werks/1988 @@ -0,0 +1,10 @@ +Title: Gracefully handline invalid empty bulk notification files from previous buggy versions +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422631128 + + diff --git a/ChangeLog b/ChangeLog index 6cce05e..c81e3ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -193,6 +193,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 BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/modules/notify.py b/modules/notify.py index bc28896..5ea4064 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1601,13 +1601,21 @@ def notify_bulk(dirname, uuids): old_params = None unhandled_uuids = [] for mtime, uuid in uuids: - params, context = eval(file(dirname + "/" + uuid).read()) + try: + params, context = eval(file(dirname + "/" + uuid).read()) + except Exception, e: + if opt_debug: + raise + notify_log(" Deleting corrupted or empty bulk file %s/%s: %s" % (dirname, uuid, e)) + continue + if old_params == None: old_params = params elif params != old_params: notify_log(" Parameters are different from previous, postponing into separate bulk") unhandled_uuids.append((mtime, uuid)) continue + bulk_context.append("\n") for varname, value in context.items(): bulk_context.append("%s=%s\n" % (varname, value.replace("\r", "").replace("\n", "\1"))) @@ -1618,9 +1626,12 @@ def notify_bulk(dirname, uuids): plugin_name = "bulk " + (plugin or "plain email") core_notification_log(plugin_name, context) - parameter_context = create_bulk_parameter_context(old_params) - context_text = "".join(parameter_context + bulk_context) - call_bulk_notification_script(plugin, context_text) + if bulk_context: # otherwise: only corrupted files + parameter_context = create_bulk_parameter_context(old_params) + context_text = "".join(parameter_context + bulk_context) + call_bulk_notification_script(plugin, context_text) + else: + notify_log("No valid notification file left. Skipping this bulk.") # Remove sent notifications for mtime, uuid in uuids:

9 years, 5 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c94a0219faf74a821a0748df013045234c451108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c94a0219faf74a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 16:18:29 2015 +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 1cb1a4d..9142bb4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1988 +2008

9 years, 5 months

Check_MK Git: check_mk: #1971 FIX printer_input/printer_output: Discovery is using name field when available no

by Lars Michelsen

Module: check_mk Branch: master Commit: 3223e5a4a51e5ead02c1e029b9b4302a2a63b601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3223e5a4a51e5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 16:08:00 2015 +0100 #1971 FIX printer_input/printer_output: Discovery is using name field when available no The service discovery of the printer_input/printer_output checks were always using the index of the unit instead of the name. We have fixed this now. You don't have to take an immediate action, because already discovered checks will continue working. But your "Check_MK Discovery" service will report new services and when you do a re-discovery, the new services will be found. --- .werks/1971 | 15 +++++++++++++++ ChangeLog | 2 ++ checks/printer_io.include | 6 ++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/1971 b/.werks/1971 new file mode 100644 index 0000000..a4e2107 --- /dev/null +++ b/.werks/1971 @@ -0,0 +1,15 @@ +Title: printer_input/printer_output: Discovery is using name field when available no +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1422630051 + +The service discovery of the printer_input/printer_output checks were always using +the index of the unit instead of the name. We have fixed this now. + +You don't have to take an immediate action, because already discovered checks will +continue working. But your "Check_MK Discovery" service will report new services +and when you do a re-discovery, the new services will be found. diff --git a/ChangeLog b/ChangeLog index 6d1e1ce..6cce05e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,8 @@ * 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... + * 1971 FIX: printer_input/printer_output: Discovery is using name field when available no... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/printer_io.include b/checks/printer_io.include index 15ec0d1..f52dbf3 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -83,10 +83,8 @@ def inventory_printer_io(info): # When no name is set # a) try to use the description # b) try to use the type otherwise use the index - if not name and descr: - name = descr - else: - name = index.split('.')[-1] + if not name: + name = descr and descr or index.split('.')[-1] yield (name, {})

9 years, 5 months

Check_MK Git: check_mk: Fixed level description in WATO rules,

by Mathias Kettner

change from if above into at Message-ID: <54cb974e.TqjDoVnFP1OZhsQ2%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 22eaf7f30bf068b3bb2cc2d562c34da8bf4b0826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22eaf7f30bf068… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 15:38:01 2015 +0100 Fixed level description in WATO rules, change from if above into at --- .werks/1927 | 10 + ChangeLog | 1 + checks/etherbox | 10 +- web/plugins/wato/check_parameters.py | 572 +++++++++++++++++----------------- 4 files changed, 302 insertions(+), 291 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=22eaf7f30b…

9 years, 5 months

Check_MK Git: check_mk: Fixed last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f30f6947df6df1fd40cc02fa71c93475c6ec461 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f30f6947df6df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 15:26:42 2015 +0100 Fixed last commit --- checks/lparstat_aix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 732d5ce..30927bb 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -49,7 +49,7 @@ lparstat_default_levels = (5, 10) def inventory_lparstat(info): - if len(info) >= 1 and len(info[2]) >= 5: + if len(info) >= 1 and len(info[-1]) >= 5: return [(None, "", "lparstat_default_levels")] def check_lparstat(item, params, info): @@ -72,9 +72,9 @@ def check_lparstat(item, params, info): return 3, "Invalid output from agent" else: # The new agent provides three lines, the title line, spacer line and the values - cols = [ c.replace('%', '') for c in info[0] ] - uom = [ '%' in c and '%' or '' for c in info[0] ] - values = info[2] + cols = [ c.replace('%', '') for c in info[-3] ] + uom = [ '%' in c and '%' or '' for c in info[-3] ] + values = info[-1] perfdata = [ (cols[i], val+uom[i]) for i, val in enumerate(values) ] output = ', '.join([ cols[i].title()+': '+val+uom[i] for i, val in enumerate(values) ]) @@ -92,14 +92,14 @@ check_info["lparstat_aix"] = { kernel_util_default_levels = None def inventory_lparstat_aix_cpu(info): - if len(info) >= 1 and len(info[2]) >= 4: + if len(info) >= 1 and len(info[-1]) >= 4: return [(None, "kernel_util_default_levels")] def check_lparstat_aix_cpu(_no_item, params, info): if len(info) == 1: line = info[0] # old (single line) agent output else: - line = info[2] + line = info[-1] user, system, wait, idle = map(float, line[:4]) perfdata = [ ( "user", "%.3f" % user ),

9 years, 5 months

Check_MK Git: check_mk: #1970 FIX lparstat_aix: Made the check compatible to different kind of lparstat output

by Lars Michelsen

Module: check_mk Branch: master Commit: 945c1541d270642b11ccd8e0cec93e02535ff40b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=945c1541d27064… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 15:23:37 2015 +0100 #1970 FIX lparstat_aix: Made the check compatible to different kind of lparstat output 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. --- .werks/1970 | 12 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- checks/lparstat_aix | 63 +++++++++++++++++++++++++++++++-------------- 4 files changed, 57 insertions(+), 21 deletions(-) diff --git a/.werks/1970 b/.werks/1970 new file mode 100644 index 0000000..28f0a1a --- /dev/null +++ b/.werks/1970 @@ -0,0 +1,12 @@ +Title: lparstat_aix: Made the check compatible to different kind of lparstat output +Level: 1 +Component: checks +Class: fix +Compatible: compat +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. diff --git a/ChangeLog b/ChangeLog index e3bf3b2..21cbff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 1887 FIX: Logwatch event console forwarding: Better dealing with 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... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 616270e..489430e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -142,7 +142,7 @@ ps -ef -F user,vszsize,rssize,pcpu,args | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ if type lparstat >/dev/null 2>&1 then echo '<<<lparstat_aix>>>' - lparstat 1 1 | tail -n1 + lparstat 1 1 fi echo '<<<vmstat_aix>>>' diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 134f445..732d5ce 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -30,36 +30,55 @@ # | Joerg Linge 2009 <joerg.linge(a)pnp4nagios.org> Copyright 2010 | # +------------------------------------------------------------------+ -# %user %sys %wait %idle physc %entc lbusy app vcsw phint -# ----- ---- ----- ----- ----- ----- ------ --- ---- ----- -# 2.5 6.0 0.1 91.5 0.03 11.4 1.8 3.27 1976647217 490545630 +# %user %sys %wait %idle physc %entc lbusy app vcsw phint +# ----- ---- ----- ----- ----- ----- ------ --- ---- ----- +# 2.5 6.0 0.1 91.5 0.03 11.4 1.8 3.27 1976647217 490545630 +# %user %sys %wait %idle physc %entc lbusy vcsw phint %nsp %utcyc +# ----- ----- ------ ------ ----- ----- ------ ----- ----- ----- ------ +# 0.2 0.4 0.0 99.3 0.02 1.7 0.0 215 3 101 0.64 + +# %user %sys %wait %idle physc %entc lbusy app vcsw phint %nsp %utcyc +# ----- ----- ------ ------ ----- ----- ------ --- ----- ----- ----- ------ +# 0.1 0.4 0.0 99.5 0.02 1.6 0.0 3.97 297 0 101 0.64 + +# %user %sys %wait %idle physc %entc lbusy vcsw phint %nsp +# ----- ----- ------ ------ ----- ----- ------ ----- ----- ----- +# 0.1 0.2 0.0 99.6 0.04 1.8 2.3 371 0 58 lparstat_default_levels = (5, 10) def inventory_lparstat(info): - if len(info) == 1 and len(info[0]) >= 5: + if len(info) >= 1 and len(info[2]) >= 5: return [(None, "", "lparstat_default_levels")] def check_lparstat(item, params, info): - line = info[0] - if len(line) == 10: - cols = [ 'physc', 'entc', 'lbusy', 'app', 'vcsw', 'phint' ] - uom = [ '', '%', '', '', '', '' ] - values = line[-6:] - elif len(line) == 9: - cols = [ 'physc', 'entc', 'lbusy', 'app' ] - uom = [ '', '%', '', '' ] - values = line[-4:] - elif len(line) == 6: - cols = [ 'nsp', 'utcyc' ] - uom = [ '%', '%' ] - values = line[-2:] + if len(info) == 1: + # Old agent provided only the values in a single line + line = info[0] + if len(line) == 10: + cols = [ 'physc', 'entc', 'lbusy', 'app', 'vcsw', 'phint' ] + uom = [ '', '%', '', '', '', '' ] + values = line[-6:] + elif len(line) == 9: + cols = [ 'physc', 'entc', 'lbusy', 'app' ] + uom = [ '', '%', '', '' ] + values = line[-4:] + elif len(line) == 6: + cols = [ 'nsp', 'utcyc' ] + uom = [ '%', '%' ] + values = line[-2:] + else: + return 3, "Invalid output from agent" else: - return 3, "Invalid output from agent" + # The new agent provides three lines, the title line, spacer line and the values + cols = [ c.replace('%', '') for c in info[0] ] + uom = [ '%' in c and '%' or '' for c in info[0] ] + values = info[2] perfdata = [ (cols[i], val+uom[i]) for i, val in enumerate(values) ] output = ', '.join([ cols[i].title()+': '+val+uom[i] for i, val in enumerate(values) ]) + return 0, output, perfdata check_info["lparstat_aix"] = { @@ -73,11 +92,15 @@ check_info["lparstat_aix"] = { kernel_util_default_levels = None def inventory_lparstat_aix_cpu(info): - if len(info) == 1 and len(info[0]) >= 4: + if len(info) >= 1 and len(info[2]) >= 4: return [(None, "kernel_util_default_levels")] def check_lparstat_aix_cpu(_no_item, params, info): - user, system, wait, idle = map(float, info[0][:4]) + if len(info) == 1: + line = info[0] # old (single line) agent output + else: + line = info[2] + user, system, wait, idle = map(float, line[:4]) perfdata = [ ( "user", "%.3f" % user ), ( "system", "%.3f" % system ),

9 years, 5 months

Check_MK Git: check_mk: readded wato rule

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4e4e1f6420b468409da8ea4d589c420eca63c3cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e4e1f6420b468… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 30 15:14:34 2015 +0100 readded wato rule --- web/plugins/wato/check_parameters.py | 75 ++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index be61077..fd5236e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6322,6 +6322,81 @@ register_check_parameters( "jvm_memory", _("JVM memory levels"), Dictionary( + help = _("This rule allows to set the warn and crit levels of the heap / " + "non-heap and total memory area usage on web application servers. " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), + elements = [ + ( "totalheap", + Alternative( + title = _("Total Memory Levels"), + elements = [ + Tuple( + title = _("Percentage levels of used space"), + elements = [ + Percentage(title = _("Warning if above"), label = _("% usage")), + Percentage(title = _("Critical if above"), label = _("% usage")), + ] + ), + Tuple( + title = _("Absolute free space in MB"), + elements = [ + Integer(title = _("Warning if below"), unit = _("MB")), + Integer(title = _("Critical if below"), unit = _("MB")), + ] + ) + ])), + ( "heap", + Alternative( + title = _("Heap Memory Levels"), + elements = [ + Tuple( + title = _("Percentage levels of used space"), + elements = [ + Percentage(title = _("Warning if above"), label = _("% usage")), + Percentage(title = _("Critical if above"), label = _("% usage")), + ] + ), + Tuple( + title = _("Absolute free space in MB"), + elements = [ + Integer(title = _("Warning if below"), unit = _("MB")), + Integer(title = _("Critical if below"), unit = _("MB")), + ] + ) + ])), + ( "nonheap", + Alternative( + title = _("Nonheap Memory Levels"), + elements = [ + Tuple( + title = _("Percentage levels of used space"), + elements = [ + Percentage(title = _("Warning if above"), label = _("% usage")), + Percentage(title = _("Critical if above"), label = _("% usage")), + ] + ), + Tuple( + title = _("Absolute free space in MB"), + elements = [ + Integer(title = _("Warning if below"), unit = _("MB")), + Integer(title = _("Critical if below"), unit = _("MB")), + ] + ) + ])), + ]), + TextAscii( + title = _("Name of the virtual machine"), + help = _("The name of the application server"), + allow_empty = False, + ), + "dict" + ) + +register_check_parameters( + subgroup_applications, + "sym_brightmail_queues", + "Symantec Brightmail Queues", + Dictionary( help = _("This check is used to monitor successful email delivery through " "Symantec Brightmail Scanner appliances."), elements = [

9 years, 5 months

Check_MK Git: check_mk: Renamed already packend linux agent rpm to " check-mk-agent" (named like agent bakery)

by Lars Michelsen

Module: check_mk Branch: master Commit: d3c79ba4e8fa7c4dd6cbe106e831bd9a19e5dd2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3c79ba4e8fa7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 15:01:09 2015 +0100 Renamed already packend linux agent rpm to "check-mk-agent" (named like agent bakery) --- agents/Makefile | 2 +- agents/check-mk-agent-1.2.7i1-1.noarch.rpm | Bin 0 -> 20344 bytes agents/{check_mk_agent.spec => check-mk-agent.spec} | 6 +++--- agents/check-mk-agent_1.2.7i1-1_all.deb | Bin 17252 -> 17382 bytes agents/check_mk_agent-1.2.7i1-1.noarch.rpm | Bin 20211 -> 0 bytes 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index bae1e2b..5d488de 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -25,7 +25,7 @@ SHELL = /bin/bash VERSION = 1.2.7i1 RPM_VERSION = $(subst -,_,$(VERSION)) -NAME = check_mk_agent +NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) RPM_TOPDIR = $$(pwd)/.rpm.topdir RPM_BUILDROOT = $$(pwd)/.rpm.buildroot diff --git a/agents/check-mk-agent-1.2.7i1-1.noarch.rpm b/agents/check-mk-agent-1.2.7i1-1.noarch.rpm new file mode 100644 index 0000000..ad6c56d Binary files /dev/null and b/agents/check-mk-agent-1.2.7i1-1.noarch.rpm differ diff --git a/agents/check_mk_agent.spec b/agents/check-mk-agent.spec similarity index 97% rename from agents/check_mk_agent.spec rename to agents/check-mk-agent.spec index efd5610..ddafa42 100644 --- a/agents/check_mk_agent.spec +++ b/agents/check-mk-agent.spec @@ -23,13 +23,13 @@ # Boston, MA 02110-1301 USA. Summary: Check_MK Agent for Linux -Name: check_mk_agent +Name: check-mk-agent Version: (automatically inserted) Release: 1 License: GPL Group: System/Monitoring URL: http://mathias-kettner.de/check_mk.html -Source: check_mk_agent-%{_version}.tar.gz +Source: check-mk-agent-%{_version}.tar.gz BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off @@ -40,7 +40,7 @@ The Check_MK Agent uses xinetd to provide information about the system on TCP port 6556. This can be used to monitor the host via Check_MK. %prep -%setup -n check_mk_agent-%{_version} +%setup -n check-mk-agent-%{_version} %install diff --git a/agents/check-mk-agent_1.2.7i1-1_all.deb b/agents/check-mk-agent_1.2.7i1-1_all.deb index 9751285..ca12830 100644 Binary files a/agents/check-mk-agent_1.2.7i1-1_all.deb and b/agents/check-mk-agent_1.2.7i1-1_all.deb differ diff --git a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm deleted file mode 100644 index 9374805..0000000 Binary files a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm and /dev/null differ

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015