Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the Elastic Logging Plugin to master #15085

Merged
merged 21 commits into from
Dec 13, 2019
Merged

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Dec 12, 2019

See #13990 and #13761

What is this?

This is a new beat that takes the form of a docker plugin for logs. The only release artifact takes the form of a plugin (which is basically a runc container) which lives in a docker repo. Aside from the different release artifacts, this operates under the hood as a normal beat. It uses libbeat, and takes many of the same configuration options as any other beat.

How to test

Once you have the branch checked out, navigate to x-pack/dockerlogbeat. Run mage package on a host with docker to generate the plugin.

You can test like this:

docker run --log-driver=elastic/elastic-logging-driver:8.0.0 \
--log-opt output.elasticsearch.hosts="172.18.0.2:9200" \
--log-opt output.elasticsearch.index="dockerbeat-test" \ 
-it debian:jessie /bin/bash`

I've never merged a new beat to master, so I'm not entirely sure what needs to happen.

fearful-symmetry and others added 21 commits October 9, 2019 12:51
* init commit of dockerlogbeat
* make locking more fine-grained on client close
* refactor pipeline reader for data safety
… checking (#14523)

* shuffle around docker deps due to import path checking
…peration (#14518)

* move pipeline check + creation to single atomic operation
* more cleanup

* fix godocs and readme
* add a release target, cleanup magefile
* add test and fix copy bug

* remove debug lines

* add header
Add more integration tests and a mock framework
…at name (#15032)

* add strings.Trim to container.name

* fix beat name
@fearful-symmetry fearful-symmetry added new beat Team:Integrations Label for the Integrations team labels Dec 12, 2019
@fearful-symmetry fearful-symmetry requested review from a team December 12, 2019 17:47
@fearful-symmetry fearful-symmetry self-assigned this Dec 12, 2019
@urso
Copy link

urso commented Dec 12, 2019

@fearful-symmetry @dedemorton Do we have any docs planned for this project?

@fearful-symmetry
Copy link
Contributor Author

fearful-symmetry commented Dec 12, 2019

@urso @dedemorton Docs are on my list on #13990 honestly have No idea where to start with proper asciidocs.

@dedemorton
Copy link
Contributor

dedemorton commented Dec 12, 2019

I told Alex that I would help them set up some skeleton asciidoc files when I get back from vacation in January. I'm planning some structural changes that I want to make in parallel for some stuff that I've been stalled on for awhile.

Forgot to add...for now, I think it's OK for Alex to capture some basic docs in a readme file.

@urso
Copy link

urso commented Dec 12, 2019

@dedemorton @fearful-symmetry Thanks for the clarification. I guess we can proceed merging the plugin then.

@fearful-symmetry fearful-symmetry merged commit 4a7a8c3 into master Dec 13, 2019
fearful-symmetry added a commit to fearful-symmetry/beats that referenced this pull request Dec 16, 2019
* Add a docker plugin - Elastic Log Driver (elastic#13761)

(cherry picked from commit 4a7a8c3)
fearful-symmetry added a commit that referenced this pull request Dec 16, 2019
* Add a docker plugin - Elastic Log Driver (#13761)

(cherry picked from commit 4a7a8c3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new beat Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants