Merge pull request #62 from rchicoli/development

new minor release

Author: rchicoli

README.md

@@ -120,7 +120,7 @@ Before creating a docker container, a healthy instance of Elasticsearch service
 
 ### How to test ###
 
-1. Creating and running a container:
+1 - Creating and running a container:
 
 ```bash
 $ docker run --rm -ti \
@@ -162,7 +162,7 @@ $ curl 127.0.0.1:9200/docker/log/_search\?pretty=true
 }
 ```
 
-2. Using grok extension for parsing the log messages:
+2 - Using grok extension for parsing the log messages:
 
 ```bash
 docker run --rm -ti \
@@ -234,7 +234,7 @@ In case you want to save the complete log line and its meta fields, you can set
 }
 ```
 
-3. There are two different ways of adding custom grok patterns.
+3 - There are two different ways of adding custom grok patterns.
 
 a. by providing the grok pattern as parameter, e.g.:
 
@@ -278,7 +278,7 @@ docker run -ti --rm --log-driver rchicoli/docker-log-elasticsearch:development -
   rchicoli/webapper
 ```
 
-4. If grok is not able to parse the log line, then it will still send the unparsed message to Elasticsearch with an error description, e.g.:
+4 - If grok is not able to parse the log line, then it will still send the unparsed message to Elasticsearch with an error description, e.g.:
 
 ```bash
 "grok": {

ROADMAP.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
+ - [ ] Add metrics
 
 ## Docker Log Elasticsearch 1.0.0
 
@@ -27,5 +28,5 @@ Goals:
    - [ ] if queue is full, then write to file
    - [ ] if file buffer is full, discard messages
  - [ ] Implement Readlog capability
- - [ ] Implement grok for parsing docker logs
+ - [X] Implement grok for parsing docker logs
  - [ ] Add CONTRIBUTING file

main.go

@@ -1,33 +1,12 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/docker/go-plugins-helpers/sdk"
-	"github.com/sirupsen/logrus"
 
 	"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,
-}
-
 func main() {
-	levelVal := os.Getenv("LOG_LEVEL")
-	if levelVal == "" {
-		levelVal = "info"
-	}
-	if level, exists := logLevels[levelVal]; exists {
-		logrus.SetLevel(level)
-	} else {
-		fmt.Fprintln(os.Stderr, "invalid log level: ", levelVal)
-		os.Exit(1)
-	}
 
 	h := sdk.NewHandler(`{"Implements": ["LoggingDriver"]}`)
 	d := docker.NewDriver()

pkg/docker/config.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/docker/docker/daemon/logger"
-	"github.com/pkg/errors"
 )
 
+// LogOpt ...
 type LogOpt struct {
 	index    string
 	tzpe     string
@@ -26,6 +26,7 @@ type LogOpt struct {
 	Grok
 }
 
+// Grok ...
 type Grok struct {
 	grokPattern         string
 	grokPatternFrom     string
@@ -109,33 +110,33 @@ func (c *LogOpt) validateLogOpt(cfg map[string]string) error {
 				case "daemonName":
 				case "none", "null", "":
 				default:
-					return fmt.Errorf("elasticsearch-fields: invalid parameter %s", v)
+					return fmt.Errorf("error: invalid parameter elasticsearch-fields: %s", v)
 				}
 			}
 			c.fields = v
 		case "elasticsearch-sniff":
 			s, err := strconv.ParseBool(v)
 			if err != nil {
-				return errors.Wrapf(err, "error: elasticsearch-sniff: %q", err)
+				return fmt.Errorf("error: parsing elasticsearch-sniff: %q", err)
 			}
 			c.sniff = s
 		case "elasticsearch-insecure":
 			s, err := strconv.ParseBool(v)
 			if err != nil {
-				return errors.Wrapf(err, "error: elasticsearch-insecure: %q", err)
+				return fmt.Errorf("error: parsing elasticsearch-insecure: %q", err)
 			}
 			c.insecure = s
 		case "elasticsearch-version":
 			switch v {
 			case "1", "2", "5", "6":
 				c.version = v
 			default:
-				return fmt.Errorf("elasticsearch-version: version not support %s", v)
+				return fmt.Errorf("error: elasticsearch-version not supported: %s", v)
 			}
 		case "elasticsearch-timeout":
 			timeout, err := strconv.Atoi(v)
 			if err != nil {
-				return errors.Wrapf(err, "error: elasticsearch-timeout: %q", err)
+				return fmt.Errorf("error: parsing elasticsearch-timeout: %q", err)
 			}
 			c.timeout = timeout
 		case "grok-pattern":
@@ -149,14 +150,14 @@ func (c *LogOpt) validateLogOpt(cfg map[string]string) error {
 		case "grok-named-capture":
 			s, err := strconv.ParseBool(v)
 			if err != nil {
-				return errors.Wrapf(err, "error: grok-named-capture: %q", err)
+				return fmt.Errorf("error: parsing grok-named-capture: %q", err)
 			}
 			c.grokNamedCapture = s
 		// case "tag":
 		// case "labels":
 		// case "env":
 		default:
-			return fmt.Errorf("unknown log opt %q for elasticsearch log Driver", key)
+			return fmt.Errorf("error: unknown log-opt: %q", v)
 		}
 	}