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

Clean up elkstack's workarounds, java, deps #141

Merged
merged 6 commits into from
May 4, 2015
Merged

Conversation

martinb3
Copy link
Contributor

@martinb3 martinb3 commented May 1, 2015

  • Remove the kibana.yml Kibana 4 workaround, now that kibana works again out of the box.
  • Fixes Clean up Java dependencies #138, stop shipping Java wrappers. You must include java::default or get Java some other way.
  • Clean up Berksfile. Many dependencies have since been fixed and/or released to Supermarket.
  • Move back to logstash-forwarder pkg repos. Fixes Go back to logstash-forwarder from package #139, reverts 1fe2ff6 and 4106b75. Also remove golang deps.
  • Fixes Get rid of distinction between cluster and single #135, stop making a distinction between a cluster install vs. a single all-in-one install without any agent.
  • Merge default and cluster and single recipes. Default is now a clustered elkstack.
  • Tags and search/discovery all operate off 'elkstack' tag. There is no more 'elkstack_cluster' tag.
  • Fixed some of the rspec/chefspec unit tests as well.
  • The lumberjack protocol will no longer be the default for Logstash to communicate, due to hosted chef changes and golang runtime SSL changes (fixes Elkstack logstash-forwarder (AKA lumberjack) SSL auth #56, Do we need beaver/logstash-forwarder? #14).
  • Don't test the lumberjack protocol with the server install by default, removes lumberjack test suite in .kitchen.yml
  • Default to tcp/udp for communication between logstash instances, add flag:
    node['elkstack']['config']['agent_protocol'] = 'tcp_udp' # could also be lumberjack
  • Don't try to load lumberjack secrets by default for agent, don't fail if they aren't present (rename recipes/_secrets.rb -> recipes/_lumberjack_secrets.rb)
  • elkstack::acl recipe changes to support tcp/udp communication
  • add logstash configs for tcp/udp communication
  • remove tests for lumberjack.key/crt now from default test suites, remove extra data bags with lumberjack keypairs

- The lumberjack protocol will no longer be the default for Logstash to communicate, due to hosted chef changes and golang runtime SSL changes (fixes #56, #14)
- Don't test the lumberjack protocol with the server install by default, removes lumberjack test suite in .kitchen.yml
- Default to tcp/udp for communication between logstash instances, add flag:
  `node['elkstack']['config']['agent_protocol'] = 'tcp_udp' # could also be lumberjack`
- Don't try to load lumberjack secrets by default for agent, don't fail if they aren't present (rename recipes/_secrets.rb -> recipes/_lumberjack_secrets.rb)
- elkstack::acl recipe changes to support tcp/udp communication
- add logstash configs for tcp/udp communication
- remove tests for lumberjack.key/crt now from default test suites
- remove extra data bags with lumberjack keypairs
- Fixes #135, stop making a distinction between a cluster install vs. a single all-in-one install without any agent.
- Merge default and cluster and single recipes. Default is now a clustered elkstack.
- Tags and search/discovery all operate off 'elkstack' tag. There is no more 'elkstack_cluster' tag.
- Fixed some of the rspec/chefspec unit tests as well.
- Fixes #139, reverts 1fe2ff6 and 4106b75.

- Remove golang deps.
- Many dependencies have since been fixed and/or released to Supermarket.
- Fixes #138, stop shipping Java wrappers. You must include `java::default` or get Java some other way.
- Remove the kibana.yml workaround, now that kibana works again out of the box.
@schwing schwing self-assigned this May 4, 2015
schwing added a commit that referenced this pull request May 4, 2015
Clean up elkstack's workarounds, java, deps
@schwing schwing merged commit ced49b6 into master May 4, 2015
@schwing schwing deleted the cleanup_martinb3 branch May 4, 2015 18:30
martinb3 added a commit that referenced this pull request May 13, 2015
- Add additional guards for chef-solo before calling elasticsearch::search_discovery
- Ensure node.deep_fetch is used when getting unicast hosts, handle empty / not found case
- RE: #141.
martinb3 added a commit that referenced this pull request May 13, 2015
- Add additional guards for chef-solo before calling elasticsearch::search_discovery
- Ensure node.deep_fetch is used when getting unicast hosts, handle empty / not found case
- RE: #141.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants