Merge pull request #4 from stakater/release-v.0.1.0

Release v.0.1.0
stakater · May 31, 2018 · 79bf26d · 79bf26d
2 parents 54ae94a + a556531
commit 79bf26d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/curator/curator.service b/curator/curator.service
@@ -5,20 +5,20 @@ Requires=docker.service consul-agent.service elasticsearch.service
 
 [Service]
 ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment IPV4=$(curl http://169.254.169.254/latest/meta-data/local-ipv4)"
-ExecStartPre=/usr/bin/docker pull stakater/elasticsearch-curator:3.5.1
+ExecStartPre=/usr/bin/docker pull stakater/elasticsearch-curator:5.5.4
 ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/sh -c "/usr/bin/docker run --rm --name %n \
                           --dns=${IPV4} \
                           --dns-search=service.consul \
-                          -e ELASTICSEARCH_HOST=elasticsearch \
+                          -e ELASTICSEARCH_HOST=elasticsearch-9200 \
                           -e ELASTICSEARCH_PORT=9200 \
                           -e OLDER_THAN=6 \
                           -e TIME_UNIT=months \
                           -e DO_SNAPSHOT='' \
-                          stakater/elasticsearch-curator:3.5.1"
+                          stakater/elasticsearch-curator:5.5.4"
 ExecStop=/usr/bin/docker stop %n
 RestartSec=10
 Restart=always
 
 [X-Fleet]
-Global=true
+Global=true
diff --git a/elasticsearch/elasticsearch.service b/elasticsearch/elasticsearch.service
@@ -12,7 +12,7 @@ ExecStart=/usr/bin/sh -c "/usr/bin/docker run --rm --name %n \
                           -p 9200:9200 -p 9300:9300 \
                           --dns=${IPV4} \
                           --dns-search=service.consul \
-                          -v /docker-data/esdata:/usr/share/elasticsearch/data \
+                          -v /docker-data/elasticsearch:/usr/share/elasticsearch/data \
                           --label SERVICE_NAME=elasticsearch \
                           --label SERVICE_TAGS=infra-app \
                           stakater/elasticsearch:5.2"

diff --git a/filebeat/consul-templates/filebeat.ctmpl b/filebeat/consul-templates/filebeat.ctmpl
@@ -281,7 +281,7 @@ output:
   ### Logstash as output
   logstash:
     # The Logstash hosts
-    hosts: [{{range $index, $service := service "logstash"}}{{if ne $index 0}},{{end}}"{{.Address}}:{{.Port}}"{{end}}]
+    hosts: [{{range $index, $service := service "logstash-5044"}}{{if ne $index 0}},{{end}}"{{.Address}}:{{.Port}}"{{end}}]
 
     # Number of workers per Logstash host.
     #worker: 1

diff --git a/filebeat/filebeat.service b/filebeat/filebeat.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Filebeat service, for beating logs and sending them to Logstash
-After=docker.service consul-agent.service
-Requires=docker.service consul-agent.service
+After=docker.service consul-agent.service logstash.service
+Requires=docker.service consul-agent.service logstash.service
 
 [Service]
 ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment IPV4=$(curl http://169.254.169.254/latest/meta-data/local-ipv4)"