af_elastic 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b769c2f7953a5708eb342ce3956df980b6de344
-  data.tar.gz: e1bfae5ba4e3b1c02aa18c31d57df702b2ab507d
+  metadata.gz: e40b877a2ebefa25b9cd6ed36c3e52602c559dee
+  data.tar.gz: 3d6bc2d863cc8d684ed89ba2dadeaf99072c8173
 SHA512:
-  metadata.gz: 03f7a559a8b8eed3645838c7ace73f4a8c654190bf47523253f5941fe5ab6837e91127706779118a8d36e6e9ec56d3c1fb494fb982ada3e0d4ee86e1ee0154e4
-  data.tar.gz: 0255295e1a48a42e81c9e69fd8c5e3d0b96d6bdc2285fa5d299126873b7bf105902d9f75f63c23f6448b2858e64e2103657b54b1eb944da075693c5a9c1d04c6
+  metadata.gz: 160aef4827c499c02965167cc72c23d9c06df9a100fc7d0e9e294ea2b0790ce84a07713a302ed1ff9bbb3aabc684fa196880e7b9a690cb0efc5609acb38a5b13
+  data.tar.gz: 22ff24a730e8a237d1949e01a0830f57617395f75e51e392f09b35f473c82ab2ac631855a65d847e1f4403ea9a1c3584081df639dccec96a8be589cfa1ae3c69

data/lib/af_elastic.rb

@@ -1,5 +1,10 @@
-require "af_elastic/version"
-require 'elasticsearch'
+require 'af_elastic/version'
+require 'set'
+require 'uri'
+require 'net/http'
+require 'net/https'
+require 'json'
+require 'timeout'
 
 module AfElastic
 
@@ -14,13 +19,13 @@ module AfElastic
   end
 
   class Configuration
-  	attr_accessor :es
+    attr_accessor :flask
   	attr_accessor :index
     attr_accessor :capacity
 
   	def initialize
-  		@es = Elasticsearch::Client.new
-  		@index = 'gem-test'
+      @flask = 'http://54.69.74.245/myapi'
+      @index = 'gem-test'
       @capacity = 1000
   	end
   end
@@ -57,24 +62,11 @@ module AfElastic
 		  def add_event(type, data={})
         begin
   		  	@types ||= Set.new
-  		  	unless @types.include? type
-  		  	# check mapping through network
-  			  	unless AfElastic.configuration.es.indices.exists_type? index: AfElastic.configuration.index, type: type
-  			  		dynamic = [{:simple_def=>{:match=>"*",:match_mapping_type=> "string",:mapping=> {:type=> "string",:index=> "not_analyzed"}}}]
-  			  		map = {}
-  			  		map[type] = {properties:{timestamp:{type:"date"}},dynamic_templates:dynamic}
-  		        unless AfElastic.configuration.es.indices.exists? index: AfElastic.configuration.index
-  		        	AfElastic.configuration.es.indices.create index: AfElastic.configuration.index
-  				  	end
-  		  			AfElastic.configuration.es.indices.put_mapping index: AfElastic.configuration.index, type: type, body: map
-  			  	end
-  			  	@types.add type
-  			  end
-
+          @types << type
   		  	@events ||= []
   		  	# add timestamp
   		  	data['timestamp'] = Time.now.to_i
-  		  	@events << {index: {_index: AfElastic.configuration.index, _type: type, data: data}}
+  		  	@events << {_index: AfElastic.configuration.index, _type: type, _source: data}
         rescue Exception => e
           puts e
           Rails.logger.error("AfElastic::EventReporter::add_event: something wrong with elasticsearch")
@@ -90,14 +82,21 @@ module AfElastic
   			events_to_report = AfElastic::EventStore.events || []
   			return if events_to_report.length < AfElastic.configuration.capacity
   			AfElastic::EventStore.events = []
-  			# puts "about to bulk"
 
   			th = Thread.new do 
   			  begin
-            AfElastic.configuration.es.bulk body: events_to_report
-  			  	# puts "bulk suceeded"
+            Timeout::timeout(3) {
+              uri = URI.parse(AfElastic.configuration.flask)
+              params = {credential: "kqjD93ZJoSkAVNW0pjTqrVNubLCLK3pP", 
+                        types: AfElastic::EventStore.types.to_a,
+                        index: AfElastic.configuration.index,
+                        data: events_to_report}
+              header = {"Content-Type" => "application/json"}
+              http = Net::HTTP.new(uri.host, uri.port)
+              response = http.post(uri.path, params.to_json, header)
+            }
   				rescue Exception => e
-  					# puts "error bulk"
+            puts e
   					Rails.logger.error("AfElastic::EventReporter::report_events: error doing bulk inserting")
   				end  				
   			end

data/lib/af_elastic/version.rb

@@ -1,3 +1,3 @@
 module AfElastic
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

data/lib/generators/templates/af_elastic_initializer.rb

@@ -1,12 +1,10 @@
-require 'elasticsearch'
-
 AfElastic.configure do |config|
   # Set the elastic search client to receive data
-  # config.es = Elasticsearch::Client.new host: '54.69.240.186'
+  # config.flask = 'http://54.69.74.245/myapi'
 
   # Set the database name to store the data
   # config.index = 'gem-test'
 
   # Set the capacity of events to store before pushing to elastic search
   # config.capacity = 1000
-end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: af_elastic
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Appfolio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: elasticsearch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+date: 2015-08-31 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: 
 executables: []