[checkmk-commits] Check_MK Git: check_mk: Fix problem in WATO inventory with g_service_description

Module: check_mk Branch: master Commit: aa0b2f65ed33777a0fe53afa7133e5293568dc2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0b2f65ed3377… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 12:38:31 2013 +0100 Fix problem in WATO inventory with g_service_description --- modules/automation.py | 2 ++ pnp-templates/.f12 | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 8eb3c4d..a0ed7e9 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -254,6 +254,8 @@ def automation_try_inventory_node(hostname): params = None if state_type not in [ 'legacy', 'active' ]: descr = service_description(ct, item) + global g_service_description + g_service_description = descr infotype = ct.split('.')[0] opt_use_cachefile = True opt_no_tcp = True diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index 909a51f..832634b 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -1,4 +1,5 @@ -sudo cp * /omd/versions/default/share/check_mk/pnp-templates +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo cp * /omd/sites/$SITE/share/check_mk/pnp-templates echo 'location.reload();' | nc -w 0 localhost 32000