summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBala.FA <barumuga@redhat.com>2014-06-13 12:52:20 +0530
committerSahina Bose <sabose@redhat.com>2014-06-16 04:15:05 -0700
commitda82641c100a4e21d00d823a1dfdbc4eb068b1a2 (patch)
tree596ef842da8bfe5e56e17d9165daaccf09ebf720
parent4d6eb013493642736b9168c047f793888ded864c (diff)
interfaces: set rrd configuration to multiple
By default perfdata are created in single rrd file which causes failure of fetching DS for newly configured network interfaces. This patch fixes this by setting pnp4nagios rrd configuration to multiple rrd file for each DS of network interfaces. Change-Id: I3e6fa0e4336fb866ceb37a5e3165a515d42bfae6 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1087837 Signed-off-by: Bala.FA <barumuga@redhat.com> Reviewed-on: http://review.gluster.org/8059 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
-rw-r--r--nagios-server-addons.spec.in1
-rw-r--r--templates/Makefile.am6
-rw-r--r--templates/check_interfaces.cfg1
3 files changed, 8 insertions, 0 deletions
diff --git a/nagios-server-addons.spec.in b/nagios-server-addons.spec.in
index c0174ab..ea6a6e0 100644
--- a/nagios-server-addons.spec.in
+++ b/nagios-server-addons.spec.in
@@ -231,6 +231,7 @@ fi
%attr(-, root, nagios) %{_sysconfdir}/nagios/gluster/snmpmanagers.conf
%{_sysconfdir}/nagios/gluster/*
%{_sysconfdir}/sudoers.d/nagios
+%{_sysconfdir}/pnp4nagios/check_commands/check_interfaces.cfg
/usr/share/snmp/mibs/*
%files tests
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 25ebd19..c54953e 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -1,3 +1,8 @@
+pnp4nagioscheckcommanddir = $(sysconfdir)/pnp4nagios/check_commands
+pnp4nagioscheckcommand_DATA = \
+ check_interfaces.cfg \
+ $(NULL)
+
pnp4nagiostemplatedir = $(datarootdir)/nagios/html/pnp4nagios/templates.dist
pnp4nagiostemplate_DATA = \
check_cpu_multicore.php \
@@ -10,5 +15,6 @@ pnp4nagiostemplate_DATA = \
$(NULL)
EXTRA_DIST = \
+ $(pnp4nagioscheckcommand_DATA) \
$(pnp4nagiostemplate_DATA) \
$(NULL)
diff --git a/templates/check_interfaces.cfg b/templates/check_interfaces.cfg
new file mode 100644
index 0000000..718dc42
--- /dev/null
+++ b/templates/check_interfaces.cfg
@@ -0,0 +1 @@
+RRD_STORAGE_TYPE = MULTIPLE