Merge branch 'master' of http://git.hudongtang.cn/chenhuan/docker

filebeat/config/filebeat.yml

 filebeat.inputs:
 - type: log
   enabled: true
+  json.key_under_root: true
+  json.overwrite_keys: true
+  json.message_key: log
   paths:
-    - /var/log/nginx/*.log
+    - /var/log/nginx/h5.api.hudongtang.cn.log
+  tags: ["nginx_access"]
+  fields:
+    svcname: nginx
+    logtype: nginx_access
 
 output.logstash:
   enabled: true