/layer-filebeat

Review Comments #4

Merged
merged 4 commits into from Apr 29, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@chuckbutler @johnsca
@chuckbutler
Collaborator

chuckbutler commented Apr 28, 2016 •
Edited 1 time

Various fixes:

  • chmod +x on tests/20-deploy-with-elasticsearch
  • Bumped log stash revision in 10-deploy-with-logstash
  • Avoids starting the daemon without a datasource being attached
  • Adds tox configuration for makefile

DEBUG:bundletester.utils:Updating JUJU_ENV: "amazon" -> ""

PASS: 4 Total: 4 (1139.414418 sec)

chuckbutler added some commits Apr 28, 2016

@chuckbutler
Project support bump 
Adds repo in layer.yaml
Adds series in metdata
Corrects make test target during bundletester execution (via tox)
f273f23
@chuckbutler
Test Bump 
Adds +x to 20-deploy-with-elasticsearch
Bumps logstash revision in logstash test
punts on restarting service if no data-receiver is available
b6fc0b0
reactive/filebeat.py
@@ -31,7 +33,8 @@ def render_filebeat_template():
@when('config.changed.install_sources')
@when('config.changed.install_keys')
def reinstall_filebeat():
- remove_state('filebeat.installed')
+ if is_state('elasticsearch.available') or is_state('logstash.available'):
@johnsca

johnsca Apr 28, 2016

Owner

Why are these not @when decorators?

@chuckbutler

chuckbutler Apr 28, 2016

Collaborator

I thought @Whens were 'and''ed not 'or''ed

chuckbutler added some commits Apr 28, 2016

@chuckbutler
Moved state evaluation from reinstall to restart 
This guard is used in an 'or' fashion to only trigger when one or the other is true, which prevents them from being @when()'d.

We only want to cycle the service if a data-source is attached otherwise, we're effectively trying to start a broken configuration.
7179bb7
@chuckbutler
removed when_file_changed event 
This moves the restart inline to rendering the template, and removes the when_file_changed event.
a8aee35
@chuckbutler
Collaborator

chuckbutler commented Apr 28, 2016

@johnsca
This is ready for re-review whenever you're ready. I'll catch up with the bundle tomorrow, and we'll throw a party 🎉

@johnsca johnsca merged commit ac66f50 into master Apr 29, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment