Remove always pull image/Switch ENV for free input/Update maintainer info/MAX RANCHER VERSION

templates/filebeat/0/docker-compose.yml

@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:5.3.1
     container_name: filebeat-alpine-5.3.1
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}

templates/filebeat/0/rancher-compose.yml

@@ -4,20 +4,15 @@ catalog:
   version: "5.3.1"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
+      type: "string"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"

templates/filebeat/1/docker-compose.yml

@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:5.6.3
     container_name: filebeat-alpine-5.6.3
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}

templates/filebeat/1/rancher-compose.yml

@@ -4,20 +4,15 @@ catalog:
   version: "5.6.3"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
+      type: "string"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"

templates/filebeat/2/docker-compose.yml

@@ -4,8 +4,6 @@ services:
     image: eason02/filebeat-alpine:6.1.1
     container_name: filebeat-alpine-6.1.1
     restart: always
-    labels:
-      io.rancher.container.pull_image: always
     environment:
       - env=${ENV}
       - logstash=${LOGSTASH}

templates/filebeat/2/rancher-compose.yml

@@ -4,20 +4,15 @@ catalog:
   version: "6.1.1"
   description: "Catalog's rancher-compose"
   minimun_rancher_version: v1.0.1
-  maximun_rancher_version: v1.6.12
+  maximun_rancher_version: v1.6.14
   upgrade_from: "1.0.0"
   questions:
     - variable: "ENV"
       label: "Environment Name"
-      description: "Environment to distinguish data source"
+      description: "Environment to distinguish data source, you can set it as QA/PP/PROD or your preference."
       default: "QA"
       required: true
-      type: "enum"
+      type: "string"
-      options:
-        - QA
-        - PP
-        - INT
-        - PROD
     - variable: "PROJECT"
       label: "Project Name"
       description: "Indicated log of which project"

templates/filebeat/config.yml

@@ -3,6 +3,6 @@ description: Log Shipper to logstash
 
 version: 6.1.1
 category: Shipper
-#maintainer: eason.lau02@hotmail.com
+maintainer: "Eason Lau <eason.lau02@hotmail.com>"
 #license: MIT
 projectURL: https://github.com/easonlau02/filebeat-alpine