Skip to content

Commit

Permalink
Issue #31: Initial work to update Kibana and use Filebeat.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Sep 5, 2016
1 parent e4ff773 commit 169b21c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 30 deletions.
2 changes: 1 addition & 1 deletion elk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To use the vagrant file, you will need to have done the following:
2. Download and Install [Vagrant](https://www.vagrantup.com/downloads.html)
3. Install [Ansible](http://ansibleworks.com/) ([guide for installing Ansible](http://docs.ansible.com/intro_installation.html))
4. Open a shell prompt (Terminal app on a Mac) and cd into the folder containing the `Vagrantfile`
5. 5. Run the following command to install the necessary Ansible roles for this profile: `$ ansible-galaxy install -r requirements.yml`
5. 5. Run the following command to install the necessary Ansible roles for this profile: `$ ansible-galaxy install -r requirements.yml --force`

Once all of that is done, you can simply type in `vagrant up`, and Vagrant will create both new VMs and configure them.

Expand Down
2 changes: 1 addition & 1 deletion elk/provisioning/elk/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
- geerlingguy.elasticsearch-curator
- geerlingguy.kibana
- geerlingguy.logstash
- geerlingguy.logstash-forwarder
- geerlingguy.filebeat
18 changes: 7 additions & 11 deletions elk/provisioning/elk/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
java_packages:
- openjdk-8-jdk

kibana_server_name: logs
kibana_username: kibana
kibana_password: password

nginx_user: www-data
nginx_worker_connections: 1024
nginx_remove_default_vhost: true
Expand All @@ -14,10 +10,10 @@ logstash_monitor_local_syslog: false
logstash_ssl_key_file: elk-vagrant-example.key
logstash_ssl_certificate_file: elk-vagrant-example.crt

logstash_forwarder_logstash_server: logs
logstash_forwarder_ssl_certificate_file: elk-vagrant-example.crt
logstash_forwarder_files:
- paths:
- /var/log/auth.log
fields:
type: syslog
# logstash_forwarder_logstash_server: logs
# logstash_forwarder_ssl_certificate_file: elk-vagrant-example.crt
# logstash_forwarder_files:
# - paths:
# - /var/log/auth.log
# fields:
# type: syslog
2 changes: 1 addition & 1 deletion elk/provisioning/web/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

roles:
- geerlingguy.nginx
- geerlingguy.logstash-forwarder
- geerlingguy.filebeat

tasks:
- name: Set up virtual host for testing.
Expand Down
24 changes: 12 additions & 12 deletions elk/provisioning/web/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ nginx_user: www-data
nginx_worker_connections: 1024
nginx_remove_default_vhost: true

logstash_forwarder_logstash_server: logs
logstash_forwarder_logstash_server_port: 5000
logstash_forwarder_ssl_certificate_file: elk-vagrant-example.crt
logstash_forwarder_files:
- paths:
- /var/log/secure
fields:
type: syslog
- paths:
- /var/log/nginx/access.log
fields:
type: nginx
# logstash_forwarder_logstash_server: logs
# logstash_forwarder_logstash_server_port: 5000
# logstash_forwarder_ssl_certificate_file: elk-vagrant-example.crt
# logstash_forwarder_files:
# - paths:
# - /var/log/secure
# fields:
# type: syslog
# - paths:
# - /var/log/nginx/access.log
# fields:
# type: nginx
8 changes: 4 additions & 4 deletions elk/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
- src: geerlingguy.elasticsearch-curator
version: 1.0.7
- src: geerlingguy.kibana
version: 1.0.8
version: 2.0.1
- src: geerlingguy.logstash
version: 2.0.0
- src: geerlingguy.logstash-forwarder
version: 1.0.3
version: 2.0.1
- src: geerlingguy.filebeat
version: 0.9.1

0 comments on commit 169b21c

Please sign in to comment.