Merge pull request #86 from rchicoli/organize-code

Organize code

Author: rchicoli

Gopkg.lock

@@ -183,7 +183,7 @@ $ docker run --rm -ti \
     --log-opt elasticsearch-username=elastic \
     --log-opt elasticsearch-password=changeme \
     --log-opt elasticsearch-sniff=false \
-    --log-opt elasticsearch-index=docker \
+    --log-opt elasticsearch-index=docker-%F \
     --log-opt elasticsearch-type=log \
     --log-opt elasticsearch-timeout=10 \
     --log-opt elasticsearch-version=5 \
@@ -193,7 +193,7 @@ $ docker run --rm -ti \
     --log-opt elasticsearch-bulk-size=1024 \
     --log-opt elasticsearch-bulk-flush-interval=1s \
     --log-opt elasticsearch-bulk-stats=false \
-        alpine echo this is a test logging message
+        alpine echo -n "this is a test logging message"
 ```
 
 Search in Elasticsearch for the log message:
@@ -202,7 +202,7 @@ Search in Elasticsearch for the log message:
 $ curl 127.0.0.1:9200/docker/log/_search\?pretty=true
 
 {
-  "_index" : "docker",
+  "_index" : "docker-2006.01.02",
   "_type" : "log",
   "_id" : "AWCywmj6Dipxk6-_e8T5",
   "_score" : 1.0,
@@ -215,7 +215,7 @@ $ curl 127.0.0.1:9200/docker/log/_search\?pretty=true
     "source" : "stdout",
     "timestamp" : "2018-01-18T21:45:30.294363869Z",
     "partial" : false,
-    "message" : "this is a test message\r"
+    "message" : "this is a test message"
   }
 }
 ```

README.md

@@ -10,6 +10,7 @@ Goals:
  - [ ] Create an API for dumping or changing config on the fly
  - [ ] Parse partial log messages and merge them, if wished
  - [ ] Add performance tests
+ - [ ] Implement Readlog capability
  - [ ] Add metrics
 
 ## Docker Log Elasticsearch 1.0.0
@@ -18,7 +19,7 @@ Goals:
 
  - [ ] Write unit tests
  - [X] Create a Continuous Integration of this project in order to avoid lots of manual interventions.
- - [ ] Captch labels and environments
+ - [X] Captch labels and environments
  - [X] Add an extra user option, e.g. `--log-opt elasticsearch-fields=containerName,containerID,containerLogLine` so for a free pick of docker info log
  - [ ] Add the capability of multilines for Java Exceptions
  - [X] Add HTTPS Support and Skip Certificate Verify
@@ -28,6 +29,5 @@ Goals:
  - [X] Implement bulk inserts
  - [X] Implement queue size and batch size
    - [X] if number of requests or batch size have been reached, send messages to elasticsearch
- - [ ] Implement Readlog capability
  - [X] Implement grok for parsing docker logs
  - [ ] Add CONTRIBUTING file

ROADMAP.md

@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/sdk"
 
 	"github.com/rchicoli/docker-log-elasticsearch/pkg/docker"
 )
 
-var logLevels = map[string]logrus.Level{
-	"debug": logrus.DebugLevel,
-	"info":  logrus.InfoLevel,
-	"warn":  logrus.WarnLevel,
-	"error": logrus.ErrorLevel,
+var logLevels = map[string]log.Level{
+	"debug": log.DebugLevel,
+	"info":  log.InfoLevel,
+	"warn":  log.WarnLevel,
+	"error": log.ErrorLevel,
 }
 
 func main() {
@@ -24,8 +24,8 @@ func main() {
 		levelVal = "info"
 	}
 	if level, exists := logLevels[levelVal]; exists {
-		logrus.SetLevel(level)
-		logrus.SetFormatter(&logrus.TextFormatter{
+		log.SetLevel(level)
+		log.SetFormatter(&log.TextFormatter{
 			DisableTimestamp: true,
 		})
 	} else {