internet_box_logger 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f69484736a27ed6581b71b29430e0076a8d4763
-  data.tar.gz: 0b12a37fc30bea8aecf8b07e407db37804cc03c4
+  metadata.gz: 5b44b7b9c4985e89a6936e0a2ef501325e03cd59
+  data.tar.gz: e94ade0de0cc57f260d765257d5ce1fa9b85d374
 SHA512:
-  metadata.gz: 1f35b1d29f2cf65cf1372603bb00736eca23f55435ecf3f966eca8d0db52f0e28132a1d39345e6bd516d2db02afb093c165853e1b7454ac34b880ab8dc04c18c
-  data.tar.gz: f5731a0172a32eb356e6342f681d3b2376c1a40d0b63ee0e9f19ba8e9ac518d8d4c19c9c86379c2eef45b16e93105b6473af09e922863095f991a9b5f79ce529
+  metadata.gz: 3d1a3ee9fe32fcaf1cf8bc8e89857d42ceef3956b170ef9480b2a031cc0af4d799b55f22b94c35bc2df450da6b9edb0b39b5137215525217580123dc7a76d13d
+  data.tar.gz: b40b5c66bf3d14a13949aa60be00b3ec51051c02a877ed1b991e7188204537d3d2dde18f76568ef53daba6c989aaa57cbecc19de1c6ad5562c13da9a4265732c

data/lib/internet_box_logger/elastic_search.rb

@@ -20,13 +20,6 @@ module InternetBoxLogger
       end
 
       def self.remote?
-        # res = true
-        # return nil if Server[].nil? || Server.empty?
-        # Server[].each do |addr|
-        #   if
-        #
-        #   end
-        # end
         local_path.nil?
       end
 
@@ -40,21 +33,19 @@ module InternetBoxLogger
     end
 
     def save
-      internal_representation = []
-      EasyAppHelper.logger.debug 'Saving measurements to ElasticSearch'
-      self.as_es_documents.each do |document|
-        begin
-          EasyAppHelper.logger.debug " - #{document[:body][:name]}"
-          internal_representation << elasticsearch_client.index(**document)
-        rescue => e
-          EasyAppHelper.logger.error e.message
-        end
-      end
-      @internal_es_representation = internal_representation
-      EasyAppHelper.puts_and_logs 'Your box metrics have been indexed into Elastic Search'
-      self
-    rescue
-      EasyAppHelper.logger.error 'Unable to save to ElasticSearch !!'
+      measured_at = Time.now
+      index_day = sprintf '%04d%02d%02d', measured_at.year, measured_at.month, measured_at.mday
+
+      data = self.attributes.dup
+      data[:measured_at] = measured_at
+
+      es_document = {
+          index: "box_metrics-#{index_day}",
+          type: box_type,
+          body: data
+      }
+
+      elasticsearch_client.index es_document
     end
 
   end

data/lib/internet_box_logger/generic_box.rb

@@ -4,10 +4,13 @@ module InternetBoxLogger
 
     include InternetBoxLogger::ElasticSearch
 
+    attr_reader :box_type
+
     def initialize(box_type)
-      box_type = box_type.to_s if box_type.is_a? Symbol
-      box_type = self.class.const_get box_type if box_type.is_a? String
-      box_parser_module = box_type if InternetBoxLogger::Parsers[].include? box_type
+      @box_type = box_type
+      @box_type = @box_type.to_s if @box_type.is_a? Symbol
+      @box_type = self.class.const_get @box_type if @box_type.is_a? String
+      box_parser_module = @box_type if InternetBoxLogger::Parsers[].include? @box_type
       self.extend box_parser_module
     end
 
@@ -15,7 +18,5 @@ module InternetBoxLogger
       save if get_box_data
     end
 
-
-
   end
 end

data/lib/internet_box_logger/parsers/freebox_v5_parser.rb

@@ -121,45 +121,6 @@ module InternetBoxLogger
         self.send FIELD_POST_PROCESSING[field_name], field_name, match_data[field_name]
       end
 
-      def as_es_documents(created_at=Time.now)
-        res = []
-        self.up_down_reports.each_pair do |measurement, name|
-          %w(up down).each do |measurement_type|
-            data_name = "#{measurement}_#{measurement_type}"
-            es_object = {
-                index: "#{self.class.name.underscore.tr('/', '_')}_#{measurement}",
-                type: measurement_type
-            }
-            data = {
-                created_at: created_at,
-                name: data_name,
-                description: name,
-                value: attributes[data_name.to_sym]
-            }
-            es_object[:body] = data
-            res << es_object
-          end
-        end
-        generic_info = {}
-
-        attributes.each do |attr_name, content|
-          # Tries to remove data that are up/down measurements already covered by previous collection
-          data_key = attr_name.to_s.gsub(/_(up|down)$/, '').to_sym
-          next if attr_name.length > 3 && self.up_down_reports.keys.include?(data_key)
-          # Else adds info to generic info
-          generic_info[attr_name] = content
-        end
-        generic_info[:name] = 'generic'
-        generic_info[:created_at] = created_at
-
-        res << {
-            index: "#{self.class.name.underscore.tr('/', '_')}_generic",
-            type: :info.to_s,
-            body: generic_info
-        }
-
-        res
-      end
 
     end
   end

data/lib/internet_box_logger/version.rb

@@ -1,3 +1,3 @@
 module InternetBoxLogger
-  VERSION = '0.2.2'
+  VERSION = '1.0.0'
 end

data/spec/elastic_search_spec.rb

@@ -2,5 +2,12 @@ require 'spec_helper'
 
 describe InternetBoxLogger::ElasticSearch do
 
+  subject {InternetBoxLogger::GenericBox.new InternetBoxLogger::Parsers::FreeboxV5Parser}
+
+  it 'should be able to save it' do
+    subject.get_box_data
+    subject.save
+  end
+
 
 end

data/spec/parsers_spec.rb

@@ -31,31 +31,32 @@ describe InternetBoxLogger::Parsers do
         expect(subject.get_box_data).not_to be_nil
       end
 
-      it 'should export data as an array' do
-        subject.get_box_data
-        expect(subject.as_es_documents is_a? Array).to be_truthy
-      end
 
-      it 'should have many up/down documents and one info' do
-        subject.get_box_data
-        docs = subject.as_es_documents
-        up, down, info, unknown = 0, 0, 0, 0
-        docs.each do |doc|
-          case doc[:type]
-            when 'up'
-              up += 1
-            when 'down'
-              down += 1
-            when 'info'
-              info += 1
-            else
-              unknown += 1
-          end
-        end
-        expect(up == down).to be_truthy
-        expect(info == 1).to be_truthy
-        expect(unknown == 0).to be_truthy
-      end
+      # it 'should export data as an array' do
+      #   subject.get_box_data
+      #   expect(subject.as_es_documents is_a? Array).to be_truthy
+      # end
+
+      # it 'should have many up/down documents and one info' do
+      #   subject.get_box_data
+      #   docs = subject.as_es_documents
+      #   up, down, info, unknown = 0, 0, 0, 0
+      #   docs.each do |doc|
+      #     case doc[:type]
+      #       when 'up'
+      #         up += 1
+      #       when 'down'
+      #         down += 1
+      #       when 'info'
+      #         info += 1
+      #       else
+      #         unknown += 1
+      #     end
+      #   end
+      #   expect(up == down).to be_truthy
+      #   expect(info == 1).to be_truthy
+      #   expect(unknown == 0).to be_truthy
+      # end
 
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: internet_box_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Laurent B