From efa2fe826a455ea0783c3ce18e4d65a43bece7bf Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Mon, 20 Jun 2016 10:04:38 -0600
Subject: [PATCH] Modify influx port to avoid conflict

Moved an internal influx port to avoid conflict with zuul's
console log module

Add influx log to collected log files

Change-Id: I3efe1ebdce881dd4f4e14b9817d016c5da0ef82a
---
 devstack/files/influxdb/influxdb.conf |  2 +-
 devstack/plugin.sh                    | 41 ++++++++++++++-------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/devstack/files/influxdb/influxdb.conf b/devstack/files/influxdb/influxdb.conf
index 157021ded..513bb1670 100644
--- a/devstack/files/influxdb/influxdb.conf
+++ b/devstack/files/influxdb/influxdb.conf
@@ -27,7 +27,7 @@ reporting-disabled = false
 [meta]
   dir = "/var/lib/influxdb/meta"
   hostname = "localhost"
-  bind-address = ":8088"
+  bind-address = ":8089"
   retention-autocreate = true
   election-timeout = "1s"
   heartbeat-timeout = "1s"
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8d47f873c..1c9421e62 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -69,6 +69,27 @@ function pre_install_monasca {
 }
 
 function install_monasca {
+    if [[ -n ${SCREEN_LOGDIR} ]]; then
+        sudo ln -sf /var/log/influxdb/influxd.log ${SCREEN_LOGDIR}/screen-influxdb.log
+
+        sudo ln -sf /var/log/monasca/api/monasca-api.log ${SCREEN_LOGDIR}/screen-monasca-api.log
+
+        sudo ln -sf /var/log/monasca/persister/persister.log ${SCREEN_LOGDIR}/screen-monasca-persister.log || true
+
+        sudo ln -sf /var/log/monasca/notification/notification.log ${SCREEN_LOGDIR}/screen-monasca-notification.log || true
+
+        sudo ln -sf /var/log/monasca/agent/statsd.log ${SCREEN_LOGDIR}/screen-monasca-agent-statsd.log
+        sudo ln -sf /var/log/monasca/agent/supervisor.log ${SCREEN_LOGDIR}/screen-monasca-agent-supervisor.log
+        sudo ln -sf /var/log/monasca/agent/collector.log ${SCREEN_LOGDIR}/screen-monasca-agent-collector.log
+        sudo ln -sf /var/log/monasca/agent/forwarder.log ${SCREEN_LOGDIR}/screen-monasca-agent-forwarder.log
+
+        sudo ln -sf /var/log/storm/access.log ${SCREEN_LOGDIR}/screen-monasca-thresh-access.log
+        sudo ln -sf /var/log/storm/supervisor.log ${SCREEN_LOGDIR}/screen-monasca-thresh-supervisor.log
+        sudo ln -sf /var/log/storm/metrics.log ${SCREEN_LOGDIR}/screen-monasca-thresh-metrics.log
+        sudo ln -sf /var/log/storm/nimbus.log  ${SCREEN_LOGDIR}/screen-monasca-thresh-nimbus.log
+        sudo ln -sf /var/log/storm/worker-6701.log ${SCREEN_LOGDIR}/screen-monasca-thresh-worker-6701.log
+        sudo ln -sf /var/log/storm/worker-6702.log ${SCREEN_LOGDIR}/screen-monasca-thresh-worker-6702.log
+    fi
 
     install_git
 
@@ -179,26 +200,6 @@ function extra_monasca {
     if is_service_enabled monasca-smoke-test; then
         install_monasca_smoke_test
     fi
-
-    if [[ -n ${SCREEN_LOGDIR} ]]; then
-        sudo ln -sf /var/log/monasca/api/monasca-api.log ${SCREEN_LOGDIR}/screen-monasca-api.log
-
-        sudo ln -sf /var/log/monasca/persister/persister.log ${SCREEN_LOGDIR}/screen-monasca-persister.log || true
-
-        sudo ln -sf /var/log/monasca/notification/notification.log ${SCREEN_LOGDIR}/screen-monasca-notification.log || true
-
-        sudo ln -sf /var/log/monasca/agent/statsd.log ${SCREEN_LOGDIR}/screen-monasca-agent-statsd.log
-        sudo ln -sf /var/log/monasca/agent/supervisor.log ${SCREEN_LOGDIR}/screen-monasca-agent-supervisor.log
-        sudo ln -sf /var/log/monasca/agent/collector.log ${SCREEN_LOGDIR}/screen-monasca-agent-collector.log
-        sudo ln -sf /var/log/monasca/agent/forwarder.log ${SCREEN_LOGDIR}/screen-monasca-agent-forwarder.log
-
-        sudo ln -sf /var/log/storm/access.log ${SCREEN_LOGDIR}/screen-monasca-thresh-access.log
-        sudo ln -sf /var/log/storm/supervisor.log ${SCREEN_LOGDIR}/screen-monasca-thresh-supervisor.log
-        sudo ln -sf /var/log/storm/metrics.log ${SCREEN_LOGDIR}/screen-monasca-thresh-metrics.log
-        sudo ln -sf /var/log/storm/nimbus.log  ${SCREEN_LOGDIR}/screen-monasca-thresh-nimbus.log
-        sudo ln -sf /var/log/storm/worker-6701.log ${SCREEN_LOGDIR}/screen-monasca-thresh-worker-6701.log
-        sudo ln -sf /var/log/storm/worker-6702.log ${SCREEN_LOGDIR}/screen-monasca-thresh-worker-6702.log
-    fi
 }