Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: spujadas/elk-docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jlubbers08/elk-docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 19 commits
  • 5 files changed
  • 2 contributors

Commits on Dec 6, 2016

  1. Update Dockerfile

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    52b3d4a View commit details
  2. Update docker-compose.yml

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    dad8c56 View commit details
  3. Update 30-output.conf

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    76592d6 View commit details
  4. Update docker-compose.yml

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    ffc88ed View commit details
  5. Update Dockerfile

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    e61f326 View commit details
  6. Update README.md

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    287fdab View commit details
  7. Update Dockerfile

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    ea4f7ef View commit details
  8. Update Dockerfile

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    2ef4e68 View commit details
  9. Update 30-output.conf

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    b7c09b9 View commit details
  10. Create logstash.conf

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    3d23ad3 View commit details
  11. Update 10-syslog.conf

    jlubbers08 authored Dec 6, 2016
    Copy the full SHA
    b00ad58 View commit details

Commits on Dec 7, 2016

  1. Update 10-syslog.conf

    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    5e18a15 View commit details
  2. Update 30-output.conf

    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    cab231c View commit details
  3. Merge pull request #1 from jlubbers08/jlubbers08-syslog1

    Update 10-syslog.conf
    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    142a2e0 View commit details
  4. Update 30-output.conf

    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    19bf6d9 View commit details
  5. Update 02-beats-input.conf

    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    a05d4ce View commit details
  6. Update 02-beats-input.conf

    jlubbers08 authored Dec 7, 2016
    Copy the full SHA
    89c6bd7 View commit details

Commits on Apr 21, 2017

  1. Update docker-compose.yml

    jlubbers08 authored Apr 21, 2017
    Copy the full SHA
    4314e50 View commit details

Commits on Sep 26, 2017

  1. Update docker-compose.yml

    jlubbers08 authored Sep 26, 2017
    Copy the full SHA
    18a22e3 View commit details
Showing with 20 additions and 43 deletions.
  1. +2 −5 02-beats-input.conf
  2. +3 −3 Dockerfile
  3. +3 −35 README.md
  4. +3 −0 docker-compose.yml
  5. +9 −0 logstash.conf
7 changes: 2 additions & 5 deletions 02-beats-input.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
input {
beats {
port => 5044
ssl => true
ssl_certificate => "/etc/pki/tls/certs/logstash-beats.crt"
ssl_key => "/etc/pki/tls/private/logstash-beats.key"
syslog {
}

}
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
# docker run -p 5601:5601 -p 9200:9200 -p 5044:5044 -it --name elk <repo-user>/elk

FROM phusion/baseimage
MAINTAINER Sebastien Pujadas http://pujadas.net
ENV REFRESHED_AT 2016-12-04
MAINTAINER Jeffrey Lubbers www.jefflubbers.com
ENV REFRESHED_AT 2016-12-05


###############################################################################
@@ -158,7 +158,7 @@ ADD ./kibana.yml ${KIBANA_HOME}/config/kibana.yml
ADD ./start.sh /usr/local/bin/start.sh
RUN chmod +x /usr/local/bin/start.sh

EXPOSE 5601 9200 9300 5044
EXPOSE 5601 9200 9300 5044 514 51400
VOLUME /var/lib/elasticsearch

CMD [ "/usr/local/bin/start.sh" ]
38 changes: 3 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,22 @@
# Elasticsearch, Logstash, Kibana (ELK) Docker image

[![](https://badge.imagelayers.io/sebp/elk:latest.svg)](https://imagelayers.io/?images=sebp/elk:latest 'Get your own badge on imagelayers.io')


This Docker image provides a convenient centralised log server and log management web interface, by packaging Elasticsearch, Logstash, and Kibana, collectively known as ELK.

The following tags are available:

- `502`, `latest`: Elasticsearch 5.0.2, Logstash 5.0.2, and Kibana 5.0.2.

- `es501_l501_k501`: Elasticsearch 5.0.1, Logstash 5.0.1, and Kibana 5.0.1.

- `es500_l500_k500`: Elasticsearch 5.0.0, Logstash 5.0.0, and Kibana 5.0.0.

- `es241_l240_k461`: Elasticsearch 2.4.1, Logstash 2.4.0, and Kibana 4.6.1.

- `es240_l240_k460`: Elasticsearch 2.4.0, Logstash 2.4.0, and Kibana 4.6.0.

- `es235_l234_k454`: Elasticsearch 2.3.5, Logstash 2.3.4, and Kibana 4.5.4.

- `es234_l234_k453`: Elasticsearch 2.3.4, Logstash 2.3.4, and Kibana 4.5.3.

- `es234_l234_k452`: Elasticsearch 2.3.4, Logstash 2.3.4, and Kibana 4.5.2.
- `latest`: Elasticsearch 5.0.2, Logstash 5.0.2, and Kibana 5.0.2.

- `es233_l232_k451`: Elasticsearch 2.3.3, Logstash 2.3.2, and Kibana 4.5.1.

- `es232_l232_k450`: Elasticsearch 2.3.2, Logstash 2.3.2, and Kibana 4.5.0.

- `es231_l231_k450`: Elasticsearch 2.3.1, Logstash 2.3.1, and Kibana 4.5.0.

- `es230_l230_k450`: Elasticsearch 2.3.0, Logstash 2.3.0, and Kibana 4.5.0.

- `es221_l222_k442`: Elasticsearch 2.2.1, Logstash 2.2.2, and Kibana 4.4.2.

- `es220_l222_k441`: Elasticsearch 2.2.0, Logstash 2.2.2, and Kibana 4.4.1.

- `es220_l220_k440`: Elasticsearch 2.2.0, Logstash 2.2.0, and Kibana 4.4.0.

- `E1L1K4`: Elasticsearch 1.7.3, Logstash 1.5.5, and Kibana 4.1.2.

**Note** – See the documentation page for more information on pulling specific combinations of versions of Elasticsearch, Logstash and Kibana.

### Documentation

See the [ELK Docker image documentation web page](http://elk-docker.readthedocs.io/) for complete instructions on how to use this image.

### Docker Hub

This image is hosted on Docker Hub at [https://hub.docker.com/r/sebp/elk/](https://hub.docker.com/r/sebp/elk/).

### About

Written by [Sébastien Pujadas](https://pujadas.net), released under the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0).
Released under the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0).

3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -12,3 +12,6 @@ elk:
- "5601:5601"
- "9200:9200"
- "5044:5044"
- "51400:514"
environment:
EX_JAVA_OPTS: "-Xms1g -Xmx1g"
9 changes: 9 additions & 0 deletions logstash.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
input { syslog { } }

filter {

}

output {
elasticsearch { hosts => ["localhost:9200"] }
}