logstash-input-meetup 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85492b95be62dcfc91d477af8bc8f69b1b925c47e6823163901f57b545adc8c8
-  data.tar.gz: f35a4f5dd80b76d9fcd9b7ef26411c812796efc31ffec2fb3b80ce26d6ca6747
+  metadata.gz: 2f6ab92cf304bd94da5ef0bb206faf9ddc21084174aa2a8a997b4269e7487d86
+  data.tar.gz: d039428b1d05c3c458ee2ed264f3132a60eb5948d7c4ba9bfc8118cb7564a885
 SHA512:
-  metadata.gz: d82de4e2e417fa910095ed0103da0fc9cdb91f92faf6ff34dfd6a60631357ffd5ba63aef20d8e46a6d4d0acad53047bc29539882e1a16eecf2929002a4172126
-  data.tar.gz: a30cf11209dccdc9abc577a8cfd08cf3aa318f0566e8a00af1ad6c521f4b411d8e89bafc9c18534b2150d380e2ad6fc5a0eb08fdb193967a6378766bcd2c7aba
+  metadata.gz: f0391c930d88fee52f976beac1eec5b9e4db16f0c3dbbde08fd1eacfab01c5b58766b5200664add5ea0ce5026570f1751c9d6cefcee8503f93f92f8d4146b02f
+  data.tar.gz: 51846ba01c949db6e1985b3e30e59f6bc1278df2a546a56044e9818aea1f182a884b081f5b6179867fff2f2fcf9c2b550b613454fc910dc7c92f34a66e11dea0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.0
+  - Add support for text search (siobahnv) [#13](https://github.com/logstash-plugins/logstash-input-meetup/pull/13)
+
 ## 3.0.4
   - Fix syntax errors (tylerjl) [#11](https://github.com/logstash-plugins/logstash-input-meetup/pull/11)
   - Minor logging and validation updates

data/CONTRIBUTORS

@@ -5,6 +5,8 @@ Contributors:
 * Jason Kendall (coolacid)
 * Pier-Hugues Pellerin (ph)
 * Suyog Rao (suyograo)
+* tylerjl
+* siobahnv
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/docs/index.asciidoc

@@ -20,7 +20,7 @@ include::{include_path}/plugin_header.asciidoc[]
 
 ==== Description
 
-Periodically query meetup.com regarding updates on events for the given meetupkey
+Periodically query meetup.com regarding updates on events for the given Meetup key.
 
 [id="plugins-{type}s-{plugin}-options"]
 ==== Meetup Input Configuration Options
@@ -36,6 +36,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-meetupkey>> |<<string,string>>|Yes
 | <<plugins-{type}s-{plugin}-urlname>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-venueid>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-text>> |<<string,string>>|No
 |=======================================================================
 
 Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -46,25 +47,25 @@ input plugins.
 [id="plugins-{type}s-{plugin}-eventstatus"]
 ===== `eventstatus` 
 
-  * Value type is <<string,string>>
-  * Default value is `"upcoming,past"`
+  * Value type is <<string,string>>.
+  * Default value is `"upcoming,past"`.
 
-Event Status'
+Event Status can be one of `"upcoming"`, `"past"`, or `"upcoming,past"`. Default is `"upcoming,past"`.
 
 [id="plugins-{type}s-{plugin}-groupid"]
 ===== `groupid` 
 
-  * Value type is <<string,string>>
+  * Value type is <<string,string>>.
   * There is no default value for this setting.
 
-The Group ID, multiple may be specified seperated by commas
-Must have one of `urlname`, `venueid`, `groupid`
+The Group ID, multiple may be specified seperated by commas. 
+Must have one of `urlname`, `venueid`, `groupid`, `text`.
 
 [id="plugins-{type}s-{plugin}-interval"]
 ===== `interval` 
 
   * This is a required setting.
-  * Value type is <<number,number>>
+  * Value type is <<number,number>>.
   * There is no default value for this setting.
 
 Interval to run the command. Value is in minutes.
@@ -73,29 +74,37 @@ Interval to run the command. Value is in minutes.
 ===== `meetupkey` 
 
   * This is a required setting.
-  * Value type is <<string,string>>
+  * Value type is <<string,string>>.
   * There is no default value for this setting.
 
-Meetup Key
+Meetup Key, aka personal token.
 
 [id="plugins-{type}s-{plugin}-urlname"]
 ===== `urlname` 
 
-  * Value type is <<string,string>>
+  * Value type is <<string,string>>.
   * There is no default value for this setting.
 
-URLName - the URL name ie `ElasticSearch-Oklahoma-City`
-Must have one of urlname, venue_id, group_id
+URLName - the URL name ie `ElasticSearch-Oklahoma-City`.
+Must have one of urlname, venue_id, group_id, `text`.
 
 [id="plugins-{type}s-{plugin}-venueid"]
 ===== `venueid` 
 
-  * Value type is <<string,string>>
+  * Value type is <<string,string>>.
   * There is no default value for this setting.
 
 The venue ID
-Must have one of `urlname`, `venue_id`, `group_id`
+Must have one of `urlname`, `venue_id`, `group_id`, `text`.
 
+[id="plugins-{type}s-{plugin}-text"]
+===== `text` 
+
+  * Value type is <<string,string>>.
+  * There is no default value for this setting.
+
+A text string to search meetup events by.
+Must have one of `urlname`, `venue_id`, `group_id`, `text`.
 
 
 [id="plugins-{type}s-{plugin}-common-options"]

data/lib/logstash/inputs/meetup.rb

@@ -10,17 +10,21 @@ class LogStash::Inputs::Meetup < LogStash::Inputs::Base
   config_name "meetup"
 
   # URLName - the URL name ie `ElasticSearch-Oklahoma-City`
-  # Must have one of urlname, venue_id, group_id
+  # Must have one of urlname, venue_id, group_id, or text
   config :urlname, :validate => :string
 
   # The venue ID
-  # Must have one of `urlname`, `venue_id`, `group_id`
+  # Must have one of `urlname`, `venue_id`, `group_id`, or 'text'
   config :venueid, :validate => :string
 
   # The Group ID, multiple may be specified seperated by commas
-  # Must have one of `urlname`, `venueid`, `groupid`
+  # Must have one of `urlname`, `venueid`, `groupid`, or 'text'
   config :groupid, :validate => :string
 
+  # A text string, AND_text is set to true
+  # Must have one of urlname, venue_id, group_id, or text
+  config :text, :validate => :string
+
   # Interval to run the command. Value is in minutes.
   config :interval, :validate => :number, :required => true
 
@@ -33,21 +37,30 @@ class LogStash::Inputs::Meetup < LogStash::Inputs::Base
   public
   def register
     require "faraday"
-    # group_id
-    if groupid
-      addon = "group_id=#{ @groupid }"
-      # group_urlname
-    elsif urlname
-      addon = "group_urlname=#{ @urlname }"
-      # venue_id
-    elsif venueid
-      addon = "venue_id=#{ @venueid }"
+
+    if text
+      # do this
+        addon = "text=#{ @text }&and_text=true"
+        @url = "https://api.meetup.com/2/open_events.json?key=#{ @meetupkey.value }&#{ addon }"
     else
-      # None Selected, raise an error
-      raise "Configuration error! -  Must have one of `urlname`, `venue_id`, or `group_id` defined"
-      addon = ""
+        # group_id
+      if groupid
+        addon = "group_id=#{ @groupid }"
+        # group_urlname
+      elsif urlname
+        addon = "group_urlname=#{ @urlname }"
+        # venue_id
+      elsif venueid
+        addon = "venue_id=#{ @venueid }"
+      else
+        # None Selected, raise an error
+        raise "Configuration error! -  Must have one of `urlname`, `venue_id`, or `group_id` defined"
+        addon = ""
+      end
+
+      @url = "https://api.meetup.com/2/events.json?key=#{ @meetupkey.value }&status=#{ @eventstatus }&#{ addon }"
     end
-    @url = "https://api.meetup.com/2/events.json?key=#{ @meetupkey.value }&status=#{ @eventstatus }&#{ addon }"
+
     @logger.info("Registering meetup Input", :url => @url.gsub(@meetupkey.value, "xxxx"), :interval => @interval)
   end  # def register
 
@@ -68,6 +81,12 @@ class LogStash::Inputs::Meetup < LogStash::Inputs::Base
       end
 
       result["results"].each do |rawevent|
+        # handling MU's "relevant" but not matching results
+        if text
+          next if rawevent['description'].nil? 
+          next unless rawevent['description'].downcase.include? @text.downcase
+        end
+        
         event = LogStash::Event.new(rawevent)
         # Convert the timestamps into Ruby times
         event.set('created', LogStash::Timestamp.at(event.get('created') / 1000, (event.get('created') % 1000) * 1000))
@@ -76,6 +95,7 @@ class LogStash::Inputs::Meetup < LogStash::Inputs::Base
         event.set('updated', LogStash::Timestamp.at(event.get('updated') / 1000, (event.get('updated') % 1000) * 1000))
         event.set('[venue][lonlat]', [event.get('[venue][lon]'), event.get('[venue][lat]')]) if rawevent.has_key?('venue')
         event.set('[group][lonlat]', [event.get('[group][group_lon]'), event.get('[group][group_lat]')]) if rawevent.has_key?('group')
+        event.set('[rating][average]', event.get('[rating][average]').round) if rawevent.has_key?('rating')       
         decorate(event)
         queue << event
       end

data/logstash-input-meetup.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-meetup'
-  s.version         = '3.0.4'
+  s.version         = '3.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Captures the output of command line tools as an event"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-meetup
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement