[checkmk-commits] Check_MK Git: check_mk: perfdata_format now defaults to "pnp"

Module: check_mk Branch: master Commit: 73c3b1766c50da8c13d8f15981e467b3f596e0f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c3b1766c50da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 10:08:04 2010 +0100 perfdata_format now defaults to "pnp" --- ChangeLog | 3 +++ LIESMICH.zutun | 2 -- main.mk | 5 ----- modules/check_mk.py | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc78dae..73bc1e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ * Inventory: Better error handling on invalid inventory result of checks * setup.sh: fix problem with missing package_info (only appears if setup is called from another directory) + * 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) Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 57f7413..5985abe 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. -Perfdatenformat per Default auf 'pnp' - aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe Direct rrd updates ganz entfernen. diff --git a/main.mk b/main.mk index 1f33794..ecd627c 100644 --- a/main.mk +++ b/main.mk @@ -1,8 +1,3 @@ # Put your host names here # all_hosts = [ 'localhost' ] all_hosts = [ ] - -# Are you using PNP4Nagios and MRPE checks? This will make PNP -# choose the correct template for standard Nagios checks: -# perfdata_format = "pnp" - diff --git a/modules/check_mk.py b/modules/check_mk.py index 7d45f4b..e9d5236 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -206,7 +206,7 @@ agent_min_version = 0 # warn, if plugin has not at least versio check_max_cachefile_age = 0 # per default do not use cache files when checking cluster_max_cachefile_age = 90 # secs. simulation_mode = False -perfdata_format = "standard" # also possible: "pnp" +perfdata_format = "pnp" # also possible: "standard" debug_log = None monitoring_host = "localhost" # your Nagios host max_num_processes = 50