From 3998d615a84b4b267d6cca13df6cb68858645483 Mon Sep 17 00:00:00 2001 From: Pere Urbon-Bayes Date: Thu, 26 Feb 2015 17:58:27 +0100 Subject: [PATCH] Remove traces and references the meta logstash gem and change it to use the new logstash-core gem. --- Gemfile | 3 +-- README.md | 33 ++++++++++++-------------------- logstash-output-influxdb.gemspec | 4 ++-- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index c48c3d1..d926697 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,2 @@ source 'https://rubygems.org' -gemspec -gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5" +gemspec \ No newline at end of file diff --git a/README.md b/README.md index 4b24b48..185c839 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com #### Code - To get started, you'll need JRuby with the Bundler gem installed. -- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. +- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example). - Install dependencies ```sh @@ -31,26 +31,15 @@ bundle install #### Test -```sh -bundle exec rspec -``` +- Update your dependencies -The Logstash code required to run the tests/specs is specified in the `Gemfile` by the line similar to: -```ruby -gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5" -``` -To test against another version or a local Logstash, edit the `Gemfile` to specify an alternative location, for example: -```ruby -gem "logstash", :github => "elasticsearch/logstash", :ref => "master" -``` -```ruby -gem "logstash", :path => "/your/local/logstash" +```sh +bundle install ``` -Then update your dependencies and run your tests: +- Run tests ```sh -bundle install bundle exec rspec ``` @@ -58,13 +47,13 @@ bundle exec rspec #### 2.1 Run in a local Logstash clone -- Edit Logstash `tools/Gemfile` and add the local plugin path, for example: +- Edit Logstash `Gemfile` and add the local plugin path, for example: ```ruby gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome" ``` -- Update Logstash dependencies +- Install plugin ```sh -rake vendor:gems +bin/plugin install --no-verify ``` - Run Logstash with your plugin ```sh @@ -74,6 +63,8 @@ At this point any modifications to the plugin code will be applied to this local #### 2.2 Run in an installed Logstash +You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using: + - Build your plugin gem ```sh gem build logstash-filter-awesome.gemspec @@ -90,6 +81,6 @@ All contributions are welcome: ideas, patches, documentation, bug reports, compl Programming is not a required skill. Whatever you've seen about open source and maintainers or community members saying "send patches or die" - you will not see that here. -It is more important to me that you are able to contribute. +It is more important to the community that you are able to contribute. -For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file. +For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file. \ No newline at end of file diff --git a/logstash-output-influxdb.gemspec b/logstash-output-influxdb.gemspec index babb8ed..ce0454c 100644 --- a/logstash-output-influxdb.gemspec +++ b/logstash-output-influxdb.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-output-influxdb' - s.version = '0.1.2' + s.version = '0.1.3' s.licenses = ['Apache License (2.0)'] s.summary = "This output lets you output Metrics to InfluxDB" s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program" @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" } # Gem dependencies - s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0' + s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0' s.add_runtime_dependency 'stud' s.add_runtime_dependency 'ftw', ['~> 0.0.40']