From 9b2bcf893ef959b24753e61a57205aac64684ca7 Mon Sep 17 00:00:00 2001
From: Jaroslav Safka <jaroslavx.safka@intel.com>
Date: Mon, 6 Feb 2017 13:13:31 +0000
Subject: [PATCH] Fix duplicit collectd logging

Decrease syslog verbosity when file logging is enabled.

Change-Id: If2c53556914cdc15e6442a264c44c7b9404838e8
Closes-Bug: #1644476
---
 devstack/libs/collectd           | 2 +-
 etc/collectd.conf.d/logfile.conf | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/devstack/libs/collectd b/devstack/libs/collectd
index 43ab8f1..5cbe455 100644
--- a/devstack/libs/collectd
+++ b/devstack/libs/collectd
@@ -73,7 +73,7 @@ function adapt_collectd_conf {
 
     sudo cp $COLLECTD_CEILOMETER_DIR/etc/collectd.conf.d/logfile.conf $COLLECTD_CONF_DIR/01-logfile.conf
 
-    sudo sed -i 's|LogLevel.*$|LogLevel "'$COLLECTD_LOG_LEVEL'"|g' $COLLECTD_CONF_DIR/01-logfile.conf
+    sudo sed -i '/<Plugin.*logfile/,/^<\/Plugin>/{s|LogLevel.*$|LogLevel "'$COLLECTD_LOG_LEVEL'"|}' $COLLECTD_CONF_DIR/01-logfile.conf
     sudo sed -i 's|File.*$|File "'$COLLECTD_LOG_FILE'"|g' $COLLECTD_CONF_DIR/01-logfile.conf
 
 }
diff --git a/etc/collectd.conf.d/logfile.conf b/etc/collectd.conf.d/logfile.conf
index cdc1ddd..086a43f 100644
--- a/etc/collectd.conf.d/logfile.conf
+++ b/etc/collectd.conf.d/logfile.conf
@@ -4,3 +4,8 @@ LoadPlugin "logfile"
   File "/opt/stack/screen/collectd.log"
   Timestamp true
 </Plugin>
+
+# Decrease syslog verbosity, to avoid duplicate logging
+<Plugin "syslog">
+  LogLevel "err"
+</Plugin>