From ffdee0cc784302cb1d060978fcd8eb7419eabb5e Mon Sep 17 00:00:00 2001
From: Dominik Hahn <dominik@monostream.com>
Date: Mon, 4 Apr 2016 12:27:52 +0200
Subject: [PATCH 1/2] Add tcp socket for logstash 1.x

---
 templates/logstash/1/docker-compose.yml  | 54 +++++++++++++++++
 templates/logstash/1/rancher-compose.yml | 76 ++++++++++++++++++++++++
 templates/logstash/config.yml            |  2 +-
 3 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 templates/logstash/1/docker-compose.yml
 create mode 100644 templates/logstash/1/rancher-compose.yml

diff --git a/templates/logstash/1/docker-compose.yml b/templates/logstash/1/docker-compose.yml
new file mode 100644
index 0000000..c28ec6f
--- /dev/null
+++ b/templates/logstash/1/docker-compose.yml
@@ -0,0 +1,54 @@
+logstash-indexer-config:
+  restart: always
+  image: rancher/logstash-config:v0.2.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+redis:
+  restart: always
+  tty: true
+  image: redis:3
+  stdin_open: true
+  labels:
+    io.rancher.container.hostname_override: container_name
+logstash-indexer:
+  restart: always
+  tty: true
+  volumes_from:
+  - logstash-indexer-config
+  command:
+  - logstash
+  - -f
+  - /etc/logstash
+  image: logstash:1.5.6-1
+  links:
+  - redis:redis
+  external_links:
+  - ${elasticsearch_link}:elasticsearch
+  stdin_open: true
+  labels:
+    io.rancher.sidekicks: logstash-indexer-config
+    io.rancher.container.hostname_override: container_name
+logstash-collector-config:
+  restart: always
+  image: rancher/logstash-config:v0.2.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+logstash-collector:
+  restart: always
+  tty: true
+  links:
+  - redis:redis
+  ports:
+  - "5000/udp"
+  - "6000/tcp"
+  volumes_from:
+  - logstash-collector-config
+  command:
+  - logstash
+  - -f
+  - /etc/logstash
+  image: logstash:1.5.6-1
+  stdin_open: true
+  labels:
+    io.rancher.sidekicks: logstash-collector-config
+    io.rancher.container.hostname_override: container_name
diff --git a/templates/logstash/1/rancher-compose.yml b/templates/logstash/1/rancher-compose.yml
new file mode 100644
index 0000000..e31a2dd
--- /dev/null
+++ b/templates/logstash/1/rancher-compose.yml
@@ -0,0 +1,76 @@
+.catalog:
+  name: "Logstash"
+  version: "1.5.6-1-rancher1"
+  description: "Logstash: Process Any Data, From Any Source"
+  questions:
+    - variable: "collector_inputs"
+      description: |
+        Logstash collection tier inputs. These will be added
+        directly to input { } section of logstash.conf
+      label: "Logstash inputs"
+      type: "multiline"
+      required: true
+      default: |
+        udp {
+          port => 5000
+          codec => "json"
+        }
+        tcp {
+          port => 6000
+          codec => "json"
+        }
+    - variable: "indexer_filters"
+      description: |
+        Logstash indexing tier filters. These will be added
+        directly to filter { } section of logstash.conf
+      label: "Logstash filters"
+      type: "multiline"
+      required: false
+      default: ""
+    - variable: "indexer_outputs"
+      description: |
+        Logstash indexing tier outputs. These will be added
+        directly to output { } section of logstash.conf
+      label: "Logstash outputs"
+      type: "multiline"
+      required: true
+      default: |
+        elasticsearch {
+          host => "elasticsearch"
+          protocol => "http"
+          index => "logstash-%{+YYYY.MM.dd}"
+        }
+    - variable: "elasticsearch_link"
+      description: |
+        stack/service link or external service link to elasticsearch
+        cluster.
+      label: "Elasticsearch stack/service"
+      default: "es/elasticsearch-clients"
+      required: true
+      type: "service"
+logstash-indexer:
+  metadata:
+    logstash:
+      inputs: |
+        redis {
+          host => "redis"
+          port => "6379"
+          data_type => "list"
+          key => "logstash"
+        }
+      filters: |
+        ${indexer_filters}
+      outputs: |
+        ${indexer_outputs}
+logstash-collector:
+  metadata:
+    logstash:
+      inputs: |
+        ${collector_inputs}
+      outputs: |
+        redis {
+          host => "redis"
+          port => "6379"
+          data_type => "list"
+          key => "logstash"
+        }
diff --git a/templates/logstash/config.yml b/templates/logstash/config.yml
index 2346f10..d8bc421 100644
--- a/templates/logstash/config.yml
+++ b/templates/logstash/config.yml
@@ -1,5 +1,5 @@
 name: Logstash
 description: |
   Centralize data processing of all types
-version: 1.5.3-1-rancher1
+version: 1.5.6-1-rancher1
 category: ELK

From e863d6788f2a87926d7baec1436e59f04132546d Mon Sep 17 00:00:00 2001
From: Dominik Hahn <dominik@monostream.com>
Date: Tue, 5 Apr 2016 09:02:45 +0200
Subject: [PATCH 2/2] Static redis version

---
 templates/logstash/1/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/logstash/1/docker-compose.yml b/templates/logstash/1/docker-compose.yml
index c28ec6f..ae83d1f 100644
--- a/templates/logstash/1/docker-compose.yml
+++ b/templates/logstash/1/docker-compose.yml
@@ -6,7 +6,7 @@ logstash-indexer-config:
 redis:
   restart: always
   tty: true
-  image: redis:3
+  image: redis:3.0.7
   stdin_open: true
   labels:
     io.rancher.container.hostname_override: container_name