[checkmk-commits] Check_MK Git: check_mk: aggregation_output_format now defaults to multiline

Module: check_mk Branch: master Commit: 0e30525fcef8f1c55be4e6b418c9ec8c05b670a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e30525fcef8f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 10:37:40 2010 +0100 aggregation_output_format now defaults to multiline --- ChangeLog | 3 ++- LIESMICH.zutun | 2 -- modules/check_mk.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0d938b..11fac0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,8 @@ * perfdata_format now defaults to "pnp". Previous default was "standard". You might have to change that in main.mk if you are not using PNP (only relevant for MRPE checks) - * inventory_check_severity default to 1 now (WARNING) + * inventory_check_severity defaults to 1 now (WARNING) + * aggregation_output_format now defaults to "multiline" Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 61a2842..fa64229 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -96,8 +96,6 @@ nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen! filesystem_levels rausnehmen. Hinweis, dass check_parameters verwendet werden soll. -aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe - Direct rrd updates ganz entfernen. snmp_communities: dictionary nicht mehr verwenden, aus Doku raus, Defaultwert diff --git a/modules/check_mk.py b/modules/check_mk.py index 7289b7f..ddd8628 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -268,7 +268,7 @@ service_aggregations = [] service_dependencies = [] non_aggregated_hosts = [] aggregate_check_mk = False -aggregation_output_format = "single" # new in 1.1.6. Possible also: "multiline" +aggregation_output_format = "multiline" # new in 1.1.6. Possible also: "multiline" summary_host_groups = [] summary_service_groups = [] # service groups for aggregated services summary_service_contactgroups = [] # service contact groups for aggregated services