Add support for plain SOQL query

Author: Asafkbalink

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.4.0
+  - feat: Add support for plain SOQL query
+
 ## 3.3.0
   - feat: Added `timeout` configuration to control RESTForce timeout settings (defaults to `60`)
   - feat: Added support for reference fields (`parent__r.child`)

lib/logstash/inputs/salesforce.rb

@@ -94,6 +94,8 @@ class LogStash::Inputs::Salesforce < LogStash::Inputs::Base
   # SOQL statement. Additional fields can be filtered on by
   # adding field1 = value1 AND field2 = value2 AND...
   config :sfdc_filters, :validate => :string, :default => ""
+  # Plain SOQL query
+  config :sfdc_soql_query, :validate => :string, :default => ""
   # Setting this to true will convert SFDC's NamedFields__c to named_fields__c
   config :to_underscores, :validate => :boolean, :default => false
 
@@ -163,11 +165,15 @@ def client_options
 
   private
   def get_query()
-    query = ["SELECT",@sfdc_fields.join(','),
-             "FROM",@sfdc_object_name]
-    query << ["WHERE",@sfdc_filters] unless @sfdc_filters.empty?
-    query << "ORDER BY LastModifiedDate DESC" if @sfdc_fields.include?('LastModifiedDate')
-    query_str = query.flatten.join(" ")
+    if @sfdc_soql_query.empty? then
+      query = ["SELECT",@sfdc_fields.join(','),
+              "FROM",@sfdc_object_name]
+      query << ["WHERE",@sfdc_filters] unless @sfdc_filters.empty?
+      query << "ORDER BY LastModifiedDate DESC" if @sfdc_fields.include?('LastModifiedDate')
+      query_str = query.flatten.join(" ")
+    else
+      query_str = @sfdc_soql_query
+    end
     @logger.debug? && @logger.debug("SFDC Query", :query => query_str)
     return query_str
   end

logstash-input-salesforce.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-salesforce'
-  s.version         = '3.3.0'
+  s.version         = '3.4.0'
   s.licenses = ['Apache-2.0']
   s.summary = "Creates events based on a Salesforce SOQL query"
   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"