Merge pull request #736 from easonlau02/filebeat-6.1.1

Add README.md for filebeat and update description for rancher-compose.yml
rancher · Feb 12, 2018 · f0f3f6d · f0f3f6d
2 parents ff140fc + 004ace0
commit f0f3f6d
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 6 deletions.
diff --git a/templates/filebeat/0/README.md b/templates/filebeat/0/README.md
@@ -0,0 +1,12 @@
+### Log Shipper to logstash
+* Before choose your filebeat version to launch, please make sure Beats [Support Matrix](https://www.elastic.co/support/matrix#matrix_compatibility)
+* Support ship APP log and Nginx log or one of both to Logstash
+* Let it default if you only have one log type of both APP log and Ningx log.
+* Also you can put all any type log(include app/nginx/other type) to Application Log Path with below pattern.
+```bash
+eg:
+${HOME_PATH}/app/logs/xxx.log
+${HOME_PATH}/nginx/logs/xxx.log
+${HOME_PATH}/others/logs/xxx.log
+```
+And set Application Log Path as your `${HOME_PATH}`
diff --git a/templates/filebeat/0/rancher-compose.yml b/templates/filebeat/0/rancher-compose.yml
@@ -25,13 +25,13 @@ catalog:
       type: "string"
     - variable: "APPLOG_PATH"
       label: "Application Log Path"
-      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/, let it default if there is no app log."
       required: true
       default: "/home/user/"
       type: "string"
     - variable: "NGINXLOG_PATH"
       label: "Nginx Log Path"
-      description: "Default it as /var/log/nginx/"
+      description: "Default it as /var/log/nginx/, let it default if there is no nginx log."
       default: "/var/log/nginx/"
       type: "string"
       required: true

diff --git a/templates/filebeat/1/README.md b/templates/filebeat/1/README.md
@@ -0,0 +1,12 @@
+### Log Shipper to logstash
+* Before choose your filebeat version to launch, please make sure Beats [Support Matrix](https://www.elastic.co/support/matrix#matrix_compatibility)
+* Support ship APP log and Nginx log or one of both to Logstash
+* Let it default if you only have one log type of both APP log and Ningx log.
+* Also you can put all any type log(include app/nginx/other type) to Application Log Path with below pattern.
+```bash
+eg:
+${HOME_PATH}/app/logs/xxx.log
+${HOME_PATH}/nginx/logs/xxx.log
+${HOME_PATH}/others/logs/xxx.log
+```
+And set Application Log Path as your `${HOME_PATH}`
diff --git a/templates/filebeat/1/rancher-compose.yml b/templates/filebeat/1/rancher-compose.yml
@@ -25,13 +25,13 @@ catalog:
       type: "string"
     - variable: "APPLOG_PATH"
       label: "Application Log Path"
-      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/, let it default if there is no app log."
       required: true
       default: "/home/user/"
       type: "string"
     - variable: "NGINXLOG_PATH"
       label: "Nginx Log Path"
-      description: "Default it as /var/log/nginx/"
+      description: "Default it as /var/log/nginx/, let it default if there is no nginx log."
       default: "/var/log/nginx/"
       type: "string"
       required: true

diff --git a/templates/filebeat/2/README.md b/templates/filebeat/2/README.md
@@ -0,0 +1,12 @@
+### Log Shipper to logstash
+* Before choose your filebeat version to launch, please make sure Beats [Support Matrix](https://www.elastic.co/support/matrix#matrix_compatibility)
+* Support ship APP log and Nginx log or one of both to Logstash
+* Let it default if you only have one log type of both APP log and Ningx log.
+* Also you can put all any type log(include app/nginx/other type) to Application Log Path with below pattern.
+```bash
+eg:
+${HOME_PATH}/app/logs/xxx.log
+${HOME_PATH}/nginx/logs/xxx.log
+${HOME_PATH}/others/logs/xxx.log
+```
+And set Application Log Path as your `${HOME_PATH}`
diff --git a/templates/filebeat/2/rancher-compose.yml b/templates/filebeat/2/rancher-compose.yml
@@ -25,13 +25,13 @@ catalog:
       type: "string"
     - variable: "APPLOG_PATH"
       label: "Application Log Path"
-      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/."
+      description: "For alignment, put your log into below path: ${HOME_PATH}/App1/logs/xxx.log, assume your HOME_PATH=/home/user, then set Application log Path as /home/user/, let it default if there is no app log."
       required: true
       default: "/home/user/"
       type: "string"
     - variable: "NGINXLOG_PATH"
       label: "Nginx Log Path"
-      description: "Default it as /var/log/nginx/"
+      description: "Default it as /var/log/nginx/, let it default if there is no nginx log."
       default: "/var/log/nginx/"
       type: "string"
       required: true

diff --git a/templates/filebeat/README.md b/templates/filebeat/README.md
@@ -0,0 +1,12 @@
+### Log Shipper to logstash
+* Before choose your filebeat version to launch, please make sure Beats [Support Matrix](https://www.elastic.co/support/matrix#matrix_compatibility)
+* Support ship APP log and Nginx log or one of both to Logstash
+* Let it default if you only have one log type of both APP log and Ningx log.
+* Also you can put all any type log(include app/nginx/other type) to Application Log Path with below pattern.
+```bash
+eg:
+${HOME_PATH}/app/logs/xxx.log
+${HOME_PATH}/nginx/logs/xxx.log
+${HOME_PATH}/others/logs/xxx.log
+```
+And set Application Log Path as your `${HOME_PATH}`