From a5afa45f4eecec48a888a54ceeff57b680d733e1 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sun, 16 Oct 2016 08:00:04 +0800
Subject: Configure log path for kibana

Closes-Bug: #1635989
Change-Id: I99402e54e7cc2f1ad972021bb1056966f5c08bff
---
 docker/kibana/Dockerfile.j2   |  4 +++-
 docker/kibana/extend_start.sh | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 docker/kibana/extend_start.sh

(limited to 'docker')

diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2
index 9ea010a73..a41c86d85 100644
--- a/docker/kibana/Dockerfile.j2
+++ b/docker/kibana/Dockerfile.j2
@@ -5,8 +5,10 @@ MAINTAINER {{ maintainer }}
 
 {% import "macros.j2" as macros with context %}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN useradd -r -m --user-group kibana \
-    && usermod -a -G kolla kibana
+    && usermod -a -G kolla kibana \
+    && chmod 755 /usr/local/bin/kolla_extend_start
 
 {% set kibana_packages = ['kibana'] %}
 {{ macros.install_packages(kibana_packages | customizable("packages")) }}
diff --git a/docker/kibana/extend_start.sh b/docker/kibana/extend_start.sh
new file mode 100644
index 000000000..4f6143181
--- /dev/null
+++ b/docker/kibana/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+KIBANA_LOG_DIR="/var/log/kolla/kibana"
+
+if [[ ! -d "${KIBANA_LOG_DIR}" ]]; then
+    mkdir -p "${KIBANA_LOG_DIR}"
+fi
+if [[ $(stat -c %U:%G "${KIBANA_LOG_DIR}") != "kibana:kolla" ]]; then
+    chown kibana:kolla "${KIBANA_LOG_DIR}"
+fi
-- 
cgit v1.2.3