Module: check_mk Branch: master Commit: 753c2b255f0c740650b704e7ade46526232493d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=753c2b255f0c74… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed May 22 16:02:29 2013 +0200 FIX: free_ipmi: fix name of sensor cache file if hostname contains domain part Conflicts: ChangeLog --- ChangeLog | 4 ++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 43328f4..0ebc35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -146,6 +146,7 @@ * FIX: zfsget: do not assume that devices begin with /, but mountpoints * FIX: ipmi_sensors: handle two cases for DELL correctly (thanks to Sebastian Talmon) * FIX: check_dns: enable performance data + * FIX: free_ipmi: fix name of sensor cache file if hostname contains domain part Multisite: * List of views: Output the alias of a datasource instead of internal name @@ -180,6 +181,9 @@ * FIX: Fixed exception during initial page rendering in python 2.6 in special cases (Internal error: putenv() argument 2 must be string, not list) + Livestatus: + * livestatus.log: show utf-8 decoding problems only with debug logging >=2 + Notifications: * FIX: HTML mails: Handle the case where plugin argument is not set * FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$ diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9c80562..335ba79 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -243,7 +243,7 @@ fi # for the first run (where the cache is created). If ipmi-sensors runs into # that timeout, it leaves and empty cache file. We skip this check forever # if we find that empty cache file. -sdrcache=/var/cache/.freeipmi/sdr-cache/sdr-cache-$(hostname).127.0.0.1 +sdrcache=/var/cache/.freeipmi/sdr-cache/sdr-cache-$(hostname | cut -d. -f1).127.0.0.1 if type ipmi-sensors >/dev/null && [ ! -e "$sdrcache" -o -s "$sdrcache" ] then echo '<<<ipmi_sensors>>>'