From eeed373b6ca488571ddc35324c192d2cf1cd140d Mon Sep 17 00:00:00 2001
From: Nick Haynes <nick.t.haynes@gmail.com>
Date: Fri, 18 Aug 2017 14:09:18 -0700
Subject: [PATCH 1/4] Added the official logentries docker agent to templates.

---
 templates/logentries/0/docker-compose.yml     |  9 +++
 templates/logentries/0/rancher-compose.yml    | 16 ++++
 templates/logentries/README.md                |  3 +
 .../logentries/catalogIcon-logentries.svg     | 77 +++++++++++++++++++
 templates/logentries/config.yml               |  7 ++
 5 files changed, 112 insertions(+)
 create mode 100644 templates/logentries/0/docker-compose.yml
 create mode 100644 templates/logentries/0/rancher-compose.yml
 create mode 100644 templates/logentries/README.md
 create mode 100644 templates/logentries/catalogIcon-logentries.svg
 create mode 100644 templates/logentries/config.yml

diff --git a/templates/logentries/0/docker-compose.yml b/templates/logentries/0/docker-compose.yml
new file mode 100644
index 0000000..0846c23
--- /dev/null
+++ b/templates/logentries/0/docker-compose.yml
@@ -0,0 +1,9 @@
+docker-logentries:
+  image: logentries/docker-logentries:0.2.1
+  command: ${logentries_command}
+  restart: always
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+  labels:
+    io.rancher.scheduler.global: "true"
+    io.rancher.container.hostname_override: container_name
\ No newline at end of file
diff --git a/templates/logentries/0/rancher-compose.yml b/templates/logentries/0/rancher-compose.yml
new file mode 100644
index 0000000..3d9b392
--- /dev/null
+++ b/templates/logentries/0/rancher-compose.yml
@@ -0,0 +1,16 @@
+version: '2'
+catalog:
+  name: logentries
+  version: 0.2.1
+  description: "logentries: The Fastest Way to Analyze Your Log Data"
+  questions:
+    - variable: logentries_command
+      label: Command
+      type: "string" 
+      required: true
+      default: "-t <TOKEN> -j -a host=`uname -n`"
+      description: |
+        The command used to configure the logentries container.
+services:
+  docker-logentries:
+    start_on_create: true
\ No newline at end of file
diff --git a/templates/logentries/README.md b/templates/logentries/README.md
new file mode 100644
index 0000000..30bcc3c
--- /dev/null
+++ b/templates/logentries/README.md
@@ -0,0 +1,3 @@
+# logentries
+
+This template deploys a [logentries](https://logentries.com/) stack running the official [docker-logentries](https://github.com/rapid7/docker-logentries) image.
diff --git a/templates/logentries/catalogIcon-logentries.svg b/templates/logentries/catalogIcon-logentries.svg
new file mode 100644
index 0000000..66a5327
--- /dev/null
+++ b/templates/logentries/catalogIcon-logentries.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 288 72" enable-background="new 0 0 288 72" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<g>
+				<path fill="#F47721" d="M52.3,46c0,5.2-4.2,9.4-9.4,9.4H16.8c-5.2,0-9.4-4.2-9.4-9.4V19.8c0-5.2,4.2-9.4,9.4-9.4h26.1
+					c5.2,0,9.4,4.2,9.4,9.4V46z"/>
+			</g>
+			<g>
+				<path fill="#FFFFFF" d="M43,23c0.4-0.3,0.9-0.6,1.3-0.9c-0.2-0.7-0.6-1.3-1-1.9c-0.5,0.2-0.9,0.5-1.4,0.7
+					c-0.3-0.2-0.6-0.5-1-0.7c0.1-0.5,0.2-1.1,0.3-1.6c-0.7-0.2-1.4-0.5-2.1-0.6c-0.2,0.5-0.3,1-0.5,1.5c-0.4,0-0.8,0.1-1.1,0.2
+					c-0.3-0.4-0.6-0.9-0.9-1.3c-0.7,0.2-1.3,0.6-1.9,1.1c0.2,0.5,0.4,1,0.7,1.5c-0.3,0.3-0.5,0.6-0.7,0.9c-0.5-0.1-1.1-0.2-1.6-0.3
+					c-0.2,0.7-0.4,1.4-0.6,2.1c0.5,0.2,1,0.4,1.5,0.5c0,0.4,0.1,0.8,0.1,1.2c-0.4,0.3-0.9,0.6-1.3,0.9c0.2,0.7,0.6,1.3,1.1,1.9
+					c0.5-0.2,1-0.5,1.5-0.7c0.3,0.3,0.6,0.5,0.9,0.7c-0.1,0.5-0.2,1.1-0.3,1.6c0.7,0.3,1.4,0.4,2.1,0.5c0.1-0.5,0.3-1,0.5-1.5
+					c0.4,0,0.8-0.1,1.2-0.1c0.3,0.4,0.6,0.9,0.9,1.3c0.7-0.3,1.3-0.6,1.8-1.1c-0.2-0.5-0.5-1-0.7-1.5c0.2-0.3,0.5-0.6,0.7-0.9
+					c0.5,0.1,1.1,0.2,1.6,0.3c0.2-0.7,0.5-1.4,0.6-2.1c-0.5-0.1-1-0.3-1.5-0.5C43.2,23.8,43.1,23.4,43,23z M40.8,24.4
+					c0,1.3-1.4,2.2-2.6,1.8c-1.1-0.3-1.8-1.6-1.4-2.7c0.2-0.7,0.8-1.1,1.4-1.3C39.5,21.8,40.9,23,40.8,24.4z"/>
+			</g>
+			<g>
+				<circle fill="#F36D21" cx="38.6" cy="24.2" r="3"/>
+			</g>
+			<g>
+				<path fill="#FFFFFF" d="M29.8,44.4c2.4-0.1,4,1.6,5.9,2.6c2.8,1.5,5.5,1.2,7.6-1.3c1-1.2,1.5-2.4,1.5-3.7v0
+					c0-1.2-0.5-2.5-1.4-3.6c-2.1-2.6-4.8-2.6-7.6-1.2c-1,0.5-1.9,1.3-3,1.8c-2.6,1.2-5.1,1.1-7.4-1c-2.3-2.2-3.1-4.7-1.7-7.6
+					c0.5-1,1.2-2,1.7-3c1.6-2.9,1.9-5.8-0.8-8.1c-1.1-1-2.4-1.4-3.6-1.4h0c-1.2,0-2.5,0.5-3.7,1.4c-2.8,2.2-3.1,5.3-1.2,8
+					c2.8,3.9,3.1,7.4,0.1,11.3c-1.9,2.5-1.9,5.4,0.5,7.7c1.2,1.2,2.5,1.7,3.8,1.7h0c1.3,0,2.7-0.5,4-1.3
+					C26.2,45.6,27.7,44.2,29.8,44.4z"/>
+			</g>
+		</g>
+		<g>
+			<path fill="#010101" d="M72.6,50.5h-5.3V15.4h5.3V50.5z"/>
+			<path fill="#010101" d="M102.3,38c0,4.1-1,7.3-3.1,9.6c-2.1,2.3-5,3.4-8.7,3.4c-2.3,0-4.4-0.5-6.2-1.6c-1.8-1.1-3.2-2.6-4.1-4.5
+				c-1-2-1.4-4.3-1.4-6.9c0-4,1-7.2,3.1-9.5c2.1-2.3,5-3.4,8.8-3.4c3.6,0,6.5,1.2,8.6,3.5C101.3,30.9,102.3,34,102.3,38z M84.2,38
+				c0,5.8,2.1,8.6,6.4,8.6c4.2,0,6.3-2.9,6.3-8.6c0-5.7-2.1-8.6-6.4-8.6c-2.2,0-3.8,0.7-4.8,2.2C84.7,33.1,84.2,35.2,84.2,38z"/>
+			<path fill="#010101" d="M129.5,25.5v2.9l-4.3,0.8c0.4,0.5,0.7,1.2,1,1.9c0.3,0.8,0.4,1.6,0.4,2.4c0,2.6-0.9,4.6-2.7,6.1
+				s-4.2,2.2-7.3,2.2c-0.8,0-1.5-0.1-2.2-0.2c-1.1,0.7-1.7,1.5-1.7,2.5c0,0.6,0.3,1,0.8,1.3c0.5,0.3,1.5,0.4,2.9,0.4h4.4
+				c2.8,0,4.8,0.6,6.3,1.8c1.4,1.2,2.1,2.9,2.1,5.1c0,2.8-1.2,5-3.5,6.5c-2.3,1.5-5.7,2.3-10.1,2.3c-3.4,0-6-0.6-7.8-1.8
+				c-1.8-1.2-2.7-2.9-2.7-5.1c0-1.5,0.5-2.8,1.5-3.9c1-1,2.3-1.8,4.1-2.2c-0.7-0.3-1.3-0.8-1.8-1.5c-0.5-0.7-0.7-1.4-0.7-2.1
+				c0-0.9,0.3-1.7,0.8-2.4s1.3-1.3,2.3-1.9c-1.3-0.6-2.3-1.5-3.1-2.7c-0.8-1.3-1.2-2.7-1.2-4.4c0-2.7,0.9-4.8,2.6-6.3
+				s4.1-2.2,7.3-2.2c0.7,0,1.4,0,2.2,0.1c0.8,0.1,1.4,0.2,1.8,0.3H129.5z M109.9,54.4c0,1.1,0.5,2,1.5,2.6s2.5,0.9,4.3,0.9
+				c2.9,0,5-0.4,6.5-1.2c1.4-0.8,2.1-1.9,2.1-3.3c0-1.1-0.4-1.9-1.2-2.3c-0.8-0.5-2.2-0.7-4.3-0.7h-4c-1.5,0-2.7,0.4-3.6,1.1
+				C110.3,52.2,109.9,53.1,109.9,54.4z M112.2,33.6c0,1.6,0.4,2.8,1.2,3.6c0.8,0.8,2,1.3,3.5,1.3c3.1,0,4.6-1.6,4.6-4.9
+				c0-1.6-0.4-2.9-1.1-3.8c-0.8-0.9-1.9-1.3-3.5-1.3c-1.5,0-2.7,0.4-3.5,1.3C112.6,30.7,112.2,31.9,112.2,33.6z"/>
+			<path fill="#010101" d="M144.4,50.9c-3.6,0-6.3-1.1-8.3-3.3c-2-2.2-3-5.3-3-9.2c0-3.9,1-7,2.9-9.4c1.9-2.4,4.5-3.5,7.8-3.5
+				c2.9,0,5.2,1,6.8,3s2.5,4.8,2.5,8.2v1.8h-17.7c0,3.4,0.8,5.9,2.4,7.7c1.5,1.8,3.8,2.7,6.6,2.7c1.4,0,2.6-0.1,3.7-0.3
+				s2.4-0.6,4-1.3v2c-1.4,0.6-2.7,1-3.8,1.2C147.1,50.8,145.8,50.9,144.4,50.9z M143.7,27.5c-2.4,0-4.3,0.8-5.7,2.3
+				c-1.4,1.6-2.3,3.8-2.5,6.7h15.2c0-2.8-0.6-5.1-1.9-6.7C147.6,28.3,145.9,27.5,143.7,27.5z"/>
+			<path fill="#010101" d="M177,50.5V34.6c0-2.5-0.5-4.3-1.6-5.4c-1-1.1-2.6-1.7-4.8-1.7c-2.9,0-5.1,0.7-6.4,2.2
+				c-1.4,1.5-2,3.9-2,7.2v13.5h-2.2V25.9h1.9l0.4,3.4h0.1c1.6-2.6,4.4-3.8,8.5-3.8c5.6,0,8.4,3,8.4,9v16.1H177z"/>
+			<path fill="#010101" d="M193.6,49c1.4,0,2.6-0.1,3.7-0.4v1.8c-1.1,0.4-2.3,0.5-3.7,0.5c-2.2,0-3.8-0.6-4.8-1.7s-1.5-3-1.5-5.5
+				V27.9h-3.6v-1.3l3.6-1l1.1-5.6h1.2v5.9h7.2v1.9h-7.2v15.5c0,1.9,0.3,3.3,1,4.2C191.1,48.5,192.2,49,193.6,49z"/>
+			<path fill="#010101" d="M212.3,25.5c1,0,2.2,0.1,3.3,0.3l-0.4,2.1c-1-0.3-2.1-0.4-3.2-0.4c-2.1,0-3.8,0.9-5.1,2.7
+				c-1.3,1.8-2,4-2,6.7v13.5h-2.2V25.9h1.9l0.2,4.4h0.2c1-1.8,2.1-3.1,3.2-3.8C209.3,25.8,210.6,25.5,212.3,25.5z"/>
+			<path fill="#010101" d="M220.3,19.1c0-1.4,0.5-2.2,1.4-2.2c0.5,0,0.8,0.2,1.1,0.6c0.3,0.4,0.4,0.9,0.4,1.6c0,0.7-0.1,1.2-0.4,1.6
+				c-0.3,0.4-0.6,0.6-1.1,0.6C220.8,21.3,220.3,20.6,220.3,19.1z M222.8,50.5h-2.2V25.9h2.2V50.5z"/>
+			<path fill="#010101" d="M241,50.9c-3.6,0-6.3-1.1-8.3-3.3c-2-2.2-3-5.3-3-9.2c0-3.9,1-7,2.9-9.4c1.9-2.4,4.5-3.5,7.8-3.5
+				c2.9,0,5.2,1,6.8,3s2.5,4.8,2.5,8.2v1.8H232c0,3.4,0.8,5.9,2.4,7.7s3.8,2.7,6.6,2.7c1.4,0,2.6-0.1,3.7-0.3s2.4-0.6,4-1.3v2
+				c-1.4,0.6-2.7,1-3.8,1.2C243.7,50.8,242.4,50.9,241,50.9z M240.3,27.5c-2.4,0-4.3,0.8-5.7,2.3c-1.4,1.6-2.3,3.8-2.5,6.7h15.2
+				c0-2.8-0.6-5.1-1.9-6.7C244.2,28.3,242.5,27.5,240.3,27.5z"/>
+			<path fill="#010101" d="M271.7,44.1c0,2.2-0.8,3.9-2.5,5.1c-1.7,1.2-4,1.8-7.1,1.8c-3.3,0-5.9-0.5-7.8-1.5V47
+				c2.5,1.2,5.1,1.9,7.8,1.9c2.4,0,4.3-0.4,5.5-1.2c1.3-0.8,1.9-1.9,1.9-3.2c0-1.2-0.5-2.3-1.5-3.1c-1-0.8-2.6-1.7-4.9-2.5
+				c-2.5-0.9-4.2-1.7-5.2-2.3c-1-0.6-1.7-1.4-2.2-2.2c-0.5-0.8-0.8-1.8-0.8-2.9c0-1.8,0.8-3.3,2.3-4.4c1.5-1.1,3.7-1.6,6.5-1.6
+				c2.6,0,5.2,0.5,7.5,1.5l-0.8,2c-2.4-1-4.6-1.5-6.7-1.5c-2,0-3.6,0.3-4.8,1c-1.2,0.7-1.8,1.6-1.8,2.8c0,1.3,0.5,2.3,1.4,3.1
+				c0.9,0.8,2.7,1.6,5.3,2.6c2.2,0.8,3.8,1.5,4.8,2.2c1,0.6,1.8,1.4,2.3,2.2C271.4,42,271.7,43,271.7,44.1z"/>
+		</g>
+	</g>
+	<g>
+		<path fill="#231F20" d="M273.2,18.4h-1.1v-4.1h-1.4v-0.9h3.8v0.9h-1.4V18.4z"/>
+		<path fill="#231F20" d="M277.4,18.4l-1.2-3.9h0c0,0.8,0.1,1.3,0.1,1.6v2.3h-0.9v-5h1.4l1.2,3.8h0l1.3-3.8h1.4v5h-1V16
+			c0-0.1,0-0.2,0-0.4c0-0.1,0-0.5,0-1.2h0l-1.3,3.9H277.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/templates/logentries/config.yml b/templates/logentries/config.yml
new file mode 100644
index 0000000..689950b
--- /dev/null
+++ b/templates/logentries/config.yml
@@ -0,0 +1,7 @@
+name: Logentries
+description: |
+  Forward all your Docker logs to logentries, like a breeze.
+version: "0.2.1"
+category: Logging
+maintainer: "Nick Haynes <nick.t.haynes@gmail.com>"
+license: The MIT License

From 77b31bf01faaf5f19924153c78dcd65e99dff2ed Mon Sep 17 00:00:00 2001
From: Nick Haynes <nick.t.haynes@gmail.com>
Date: Fri, 18 Aug 2017 14:12:22 -0700
Subject: [PATCH 2/4] Removed the -a flag from the default value.

---
 templates/logentries/0/rancher-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/logentries/0/rancher-compose.yml b/templates/logentries/0/rancher-compose.yml
index 3d9b392..c52ed0c 100644
--- a/templates/logentries/0/rancher-compose.yml
+++ b/templates/logentries/0/rancher-compose.yml
@@ -8,9 +8,9 @@ catalog:
       label: Command
       type: "string" 
       required: true
-      default: "-t <TOKEN> -j -a host=`uname -n`"
+      default: "-t <TOKEN> -j"
       description: |
         The command used to configure the logentries container.
 services:
   docker-logentries:
-    start_on_create: true
\ No newline at end of file
+    start_on_create: true

From 2ef92160a071b7f25161c9cbec6d2982d5c7e382 Mon Sep 17 00:00:00 2001
From: Nick Haynes <nick.t.haynes@gmail.com>
Date: Fri, 18 Aug 2017 14:17:25 -0700
Subject: [PATCH 3/4] Added the new line at the end of the yml files for
 logentries template.

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

diff --git a/templates/logentries/0/docker-compose.yml b/templates/logentries/0/docker-compose.yml
index 0846c23..371a753 100644
--- a/templates/logentries/0/docker-compose.yml
+++ b/templates/logentries/0/docker-compose.yml
@@ -6,4 +6,4 @@ docker-logentries:
     - /var/run/docker.sock:/var/run/docker.sock
   labels:
     io.rancher.scheduler.global: "true"
-    io.rancher.container.hostname_override: container_name
\ No newline at end of file
+    io.rancher.container.hostname_override: container_name

From 4bf85c9137cb0ccb17eba10a043362feefdc26bf Mon Sep 17 00:00:00 2001
From: Nick Haynes <nick.t.haynes@gmail.com>
Date: Mon, 21 Aug 2017 03:46:32 -0700
Subject: [PATCH 4/4] Updated logentries docker-compose.yml to use compose
 version 2 format.

---
 templates/logentries/0/docker-compose.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/templates/logentries/0/docker-compose.yml b/templates/logentries/0/docker-compose.yml
index 371a753..2cea085 100644
--- a/templates/logentries/0/docker-compose.yml
+++ b/templates/logentries/0/docker-compose.yml
@@ -1,9 +1,11 @@
-docker-logentries:
-  image: logentries/docker-logentries:0.2.1
-  command: ${logentries_command}
-  restart: always
-  volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
-  labels:
-    io.rancher.scheduler.global: "true"
-    io.rancher.container.hostname_override: container_name
+version: '2'
+services:
+  docker-logentries:
+    image: logentries/docker-logentries:0.2.1
+    command: ${logentries_command}
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    labels:
+      io.rancher.scheduler.global: "true"
+      io.rancher.container.hostname_override: container_name