From 64dc5e9d0042905245a9b20a4b6bae06695647c5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 17 Nov 2013 20:01:23 +0100 Subject: [PATCH] Change default directory for performance data to /var/spool/icinga2/perfdata. Fixes #5089 --- components/perfdata/perfdatawriter.ti | 2 +- doc/4.3-object-types.md | 2 +- icinga2.spec | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/perfdata/perfdatawriter.ti b/components/perfdata/perfdatawriter.ti index 0045cb36a..bb7dcd719 100644 --- a/components/perfdata/perfdatawriter.ti +++ b/components/perfdata/perfdatawriter.ti @@ -7,7 +7,7 @@ namespace icinga class PerfdataWriter : DynamicObject { [config] String perfdata_path { - default {{{ return Application::GetLocalStateDir() + "/cache/icinga2/perfdata/perfdata"; }}} + default {{{ return Application::GetLocalStateDir() + "/spool/icinga2/perfdata/perfdata"; }}} }; [config] String format_template { default {{{ diff --git a/doc/4.3-object-types.md b/doc/4.3-object-types.md index 1526bae10..70cdf8a17 100644 --- a/doc/4.3-object-types.md +++ b/doc/4.3-object-types.md @@ -472,7 +472,7 @@ Attributes: Name |Description ----------------|---------------- - perfdata\_path |**Optional.** Path to the service performance data file. Defaults to IcingaLocalStateDir + "/cache/icinga2/perfdata/perfdata". + perfdata\_path |**Optional.** Path to the service performance data file. Defaults to IcingaLocalStateDir + "/spool/icinga2/perfdata/perfdata". format\_template|**Optional.** Format template for the performance data file. Defaults to a template that's suitable for use with PNP4Nagios. rotation\_interval|**Optional.** Rotation interval for the file specified in `perfdata\_path`. Defaults to 30 seconds. diff --git a/icinga2.spec b/icinga2.spec index 7b11997c4..22c120c80 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -327,6 +327,7 @@ fi %defattr(-,root,root,-) %doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/itl %{_datadir}/%{name}/itl