From 388eee2eabf4c20d8f5aa477d99e4f6c77d61fc8 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Mon, 12 Sep 2016 13:28:14 +0000
Subject: [PATCH] add telegraf log directory /var/log/kolla/telegraf
Closes-Bug: #1622609
Change-Id: I89d4059e2c31b7f1737c147479cdc3c36b06fa69
---
docker/telegraf/Dockerfile.j2 | 3 +++
docker/telegraf/extend_start.sh | 10 ++++++++++
2 files changed, 13 insertions(+)
create mode 100644 docker/telegraf/extend_start.sh
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
index 2e2811b7de..81906ced7b 100644
--- a/docker/telegraf/Dockerfile.j2
+++ b/docker/telegraf/Dockerfile.j2
@@ -6,8 +6,11 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(telegraf_packages | customizable("packages")) }}
COPY telegraf_sudoers /etc/sudoers.d/kolla_telegraf_sudoers
+COPY extend_start.sh /usr/local/bin/kolla_telegraf_extend_start
+
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_telegraf_sudoers \
+ && chmod 755 /usr/local/bin/kolla_telegraf_extend_start \
&& usermod -a -G kolla telegraf
{% block telegraf_footer %}{% endblock %}
diff --git a/docker/telegraf/extend_start.sh b/docker/telegraf/extend_start.sh
new file mode 100644
index 0000000000..2830da1cb0
--- /dev/null
+++ b/docker/telegraf/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+TELEGRAF_LOG_DIR="/var/log/kolla/telegraf"
+
+if [[ ! -d "${TELEGRAF_LOG_DIR}" ]]; then
+ mkdir -p ${TELEGRAF_LOG_DIR}
+fi
+if [[ $(stat -c %a ${TELEGRAF_LOG_DIR}) != "755" ]]; then
+ chmod 755 ${TELEGRAF_LOG_DIR}
+fi