Merge the Elastic Logging Plugin to master (#15085)

* Add a docker plugin - Elastic Log Driver (#13761)
elastic · Dec 13, 2019 · 4a7a8c3 · 4a7a8c3
1 parent 4d9a3ce
commit 4a7a8c3
Show file tree

Hide file tree

Showing 375 changed files with 62,395 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ beat.db
 mage_output_file.go
 x-pack/functionbeat/*/fields.yml
 x-pack/functionbeat/provider/*/functionbeat-*
+x-pack/dockerlogbeat/temproot.tar
 
 # Editor swap files
 *.swp

diff --git a/.travis.yml b/.travis.yml
@@ -134,6 +134,12 @@ jobs:
       go: $TRAVIS_GO_VERSION
       stage: test
 
+    # Docker Log Driver
+    - os: linux
+      env: TARGETS="-C x-pack/dockerlogbeat testsuite"
+      go: $TRAVIS_GO_VERSION
+      stage: test
+
     # Journalbeat
     - os: linux
       env: TARGETS="-C journalbeat testsuite"

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,6 +51,7 @@ pipeline {
           env.BUILD_METRICBEAT = isChanged(["^metricbeat/.*"])
           env.BUILD_PACKETBEAT = isChanged(["^packetbeat/.*"])
           env.BUILD_WINLOGBEAT = isChanged(["^winlogbeat/.*"])
+          env.BUILD_DOCKERLOGBEAT = isChanged(["^x-pack/dockerlogbeat/.*"])
           env.BUILD_FUNCTIONBEAT = isChanged(["^x-pack/functionbeat/.*"])
           env.BUILD_JOURNALBEAT = isChanged(["^journalbeat/.*"])
           env.BUILD_GENERATOR = isChanged(["^generator/.*"])
@@ -325,6 +326,25 @@ pipeline {
             }
           }
         }
+        stage('dockerlogbeat'){
+          agent { label 'ubuntu && immutable' }
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            expression {
+              return env.BUILD_DOCKERLOGBEAT != "false"
+            }
+          }
+          stages {
+            stage('Dockerlogbeat'){
+              steps {
+                withBeatsEnv(){
+                  makeTarget("Elastic Log Plugin unit tests", "-C x-pack/dockerlogbeat testsuite")
+                }
+              }
+            }
+          }
+        }
         stage('Winlogbeat'){
           agent { label 'ubuntu && immutable' }
           options { skipDefaultCheckout() }