Merge branch '1.0.0-beta2'

Ingensi · Jan 19, 2016 · cc36dce · cc36dce
2 parents c44a468 + 5125830
commit cc36dce
Show file tree

Hide file tree

Showing 444 changed files with 119,563 additions and 9,747 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# script python
+scripts/env
+
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 dockerbeat
 *.o

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,29 @@
+# Contributing to Dockerbeat
+
+Dockerbeat is an open source project and we love to receive contribution from the community!
+
+You can contribute to Dockerbeat by many ways:
+
+* write documentation, tutorial, blog posts
+* submit bug reports, new github issues for bugs or new features
+* implement new feature
+
+Docker is based on the [Libbeat](https://github.com/elastic/libbeat), an open source
+project managed by [Elastic](http://elastic.co).
+
+# Setup a development environment
+
+Dockerbeat development environment is similar to other beats. Please read the official [Beats CONTRIBUTING file](https://github.com/elastic/beats/blob/master/CONTRIBUTING.md)
+
+## Make targets
+
+This repository provide a `makefile` with the following targets:
+
+* **dockerbeat**: make the project (default target)
+* **getdeps**: get project dependencies
+* **test**: run unit tests
+* **updatedeps**: update `Godeps` dependencies
+* **dockermake**: build the project into a docker container (this allow to build project on a system without golang dev environment)
+* **gofmt**: format go source code
+* **cover**: run test and generate cover reports
+* **clean**: clean repository
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,12 @@
 FROM golang:1.5.1
 MAINTAINER Ingensi labs <contact@ingensi.com>
 
-COPY . /usr/src/dockerbeat
-RUN cd /usr/src/dockerbeat && make
+COPY . /go/src/github.com/ingensi/dockerbeat
+RUN cd /go/src/github.com/ingensi/dockerbeat && make
 
 RUN mkdir -p /etc/dockerbeat/ \
-    && cp /usr/src/dockerbeat/dockerbeat /etc/dockerbeat/ \
-    && cp /usr/src/dockerbeat/etc/dockerbeat-docker.yml /etc/dockerbeat/dockerbeat.yml \
-    && rm -rf /usr/src/dockerbeat
+    && cp /go/src/github.com/ingensi/dockerbeat/dockerbeat /etc/dockerbeat/ \
+    && cp /go/src/github.com/ingensi/dockerbeat/etc/dockerbeat-docker.yml /etc/dockerbeat/dockerbeat.yml
 
 WORKDIR /etc/dockerbeat
 

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypass.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypass.go
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypasssafe.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypasssafe.go