Use $ELASTIC_PASSWORD, not $ELASTIC_PWD

Toby McLaughlin · Toby McLaughlin · commit 79f6ecd56696 · 2017-08-01T03:21:18.000+02:00
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
 TAG=6.0.0-beta1-3eab5b40
 ELASTIC_VERSION=6.0.0-beta1
 SHORT_VERSION=6.0.0
-ELASTIC_PWD=changeme
+ELASTIC_PASSWORD=changeme
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,21 +19,21 @@ services:
   #
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
-    environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PWD=${ELASTIC_PWD}']
+    environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
     ports: ['127.0.0.1:9200:9200']
     networks: ['stack']
 
   kibana:
     image: docker.elastic.co/kibana/kibana:${TAG}
-    environment: ['ELASTICSEARCH_PASSWORD=${ELASTIC_PWD}']
+    environment: ['ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}']
     ports: ['127.0.0.1:5601:5601']
     networks: ['stack']
     depends_on: ['elasticsearch']
 
   logstash:
     image: docker.elastic.co/logstash/logstash:${TAG}
     environment:
-      - 'xpack.monitoring.elasticsearch.password=${ELASTIC_PWD}'
+      - 'xpack.monitoring.elasticsearch.password=${ELASTIC_PASSWORD}'
     # Provide a simple pipeline configuration for Logstash with a bind-mounted file.
     volumes:
       - ./config/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
@@ -90,7 +90,7 @@ services:
     # The script may have CR/LF linefeeds if using Docker for Windows, so make
     # sure that they don't confuse Bash.
     command: ['/bin/bash', '-c', 'cat /usr/local/bin/configure-kibana.sh | tr -d "\r" | bash']
-    environment: ['ELASTIC_VERSION=${SHORT_VERSION}', 'ELASTIC_PWD=${ELASTIC_PWD}']
+    environment: ['ELASTIC_VERSION=${SHORT_VERSION}', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
     networks: ['stack']
     depends_on: ['kibana']
 
@@ -101,7 +101,7 @@ services:
     command: >-
       bash -c
         'until curl -XPUT \
-           http://elastic:${ELASTIC_PWD}@elasticsearch:9200/.kibana/index-pattern/logstash-* \
+           http://elastic:${ELASTIC_PASSWORD}@elasticsearch:9200/.kibana/index-pattern/logstash-* \
            -d '{"title" : "logstash-*",  "timeFieldName": "@timestamp"}'
          do sleep 1;
          done'
@@ -114,7 +114,7 @@ services:
         'until filebeat setup \
           -E setup.kibana.host=kibana \
           -E setup.kibana.username=elastic \
-          -E setup.kibana.password=${ELASTIC_PWD};
+          -E setup.kibana.password=${ELASTIC_PASSWORD};
          do sleep 1;
          done'
     networks: ['stack']
@@ -127,7 +127,7 @@ services:
         'until heartbeat setup \
           -E setup.kibana.host=kibana \
           -E setup.kibana.username=elastic \
-          -E setup.kibana.password=${ELASTIC_PWD};
+          -E setup.kibana.password=${ELASTIC_PASSWORD};
          do sleep 1;
          done'
     networks: ['stack']
@@ -140,7 +140,7 @@ services:
         'until metricbeat setup \
           -E setup.kibana.host=kibana \
           -E setup.kibana.username=elastic \
-          -E setup.kibana.password=${ELASTIC_PWD};
+          -E setup.kibana.password=${ELASTIC_PASSWORD};
          do sleep 1;
          done'
     networks: ['stack']
@@ -154,7 +154,7 @@ services:
         'until packetbeat setup \
           -E setup.kibana.host=kibana \
           -E setup.kibana.username=elastic \
-          -E setup.kibana.password=${ELASTIC_PWD};
+          -E setup.kibana.password=${ELASTIC_PASSWORD};
          do sleep 1;
          done'
     networks: ['stack']
diff --git a/scripts/configure-kibana.sh b/scripts/configure-kibana.sh
@@ -8,9 +8,9 @@ done
 
 # Create a Kibana index pattern for Logstash.
 # There's currently no API for creating index patterns, so this is a bit hackish.
-#curl -s -H 'Content-Type:application/json' -XPUT http://elastic:${ELASTIC_PWD}@elasticsearch:9200/.kibana/index-pattern/logstash-* \
+#curl -s -H 'Content-Type:application/json' -XPUT http://elastic:${ELASTIC_PASSWORD}@elasticsearch:9200/.kibana/index-pattern/logstash-* \
 #     -d '{"title" : "logstash-*",  "timeFieldName": "@timestamp"}'
 
 # Set the default index pattern.
-curl -s -H 'Content-Type:application/json' -XPUT http://elastic:${ELASTIC_PWD}@elasticsearch:9200/.kibana/config/${ELASTIC_VERSION} \
+curl -s -H 'Content-Type:application/json' -XPUT http://elastic:${ELASTIC_PASSWORD}@elasticsearch:9200/.kibana/config/${ELASTIC_VERSION} \
      -d '{"defaultIndex" : "metricbeat-*"}'
