From 6b3284acd2da0573018cc84b409d4c4b76e5a1c7 Mon Sep 17 00:00:00 2001 From: Janis Meybohm Date: Fri, 13 Jan 2017 10:26:23 +0100 Subject: [PATCH] Use $HOSTNAME as node.name by default Allows to identify elasticsearch instances more easily. As $HOSTNAME of a pod is unique, this should be no problem. --- .../fluentd-elasticsearch/es-image/config/elasticsearch.yml | 1 + cluster/addons/fluentd-elasticsearch/es-image/run.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/config/elasticsearch.yml b/cluster/addons/fluentd-elasticsearch/es-image/config/elasticsearch.yml index 848a07a2bd2..a2ea62e9b83 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/config/elasticsearch.yml +++ b/cluster/addons/fluentd-elasticsearch/es-image/config/elasticsearch.yml @@ -1,5 +1,6 @@ cluster.name: kubernetes-logging +node.name: ${NODE_NAME} node.master: ${NODE_MASTER} node.data: ${NODE_DATA} diff --git a/cluster/addons/fluentd-elasticsearch/es-image/run.sh b/cluster/addons/fluentd-elasticsearch/es-image/run.sh index 5d5f026d716..6d334f693f1 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/run.sh +++ b/cluster/addons/fluentd-elasticsearch/es-image/run.sh @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +export NODE_NAME=${NODE_NAME:-${HOSTNAME}} export NODE_MASTER=${NODE_MASTER:-true} export NODE_DATA=${NODE_DATA:-true} export HTTP_PORT=${HTTP_PORT:-9200}