internet_box_logger 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59ffcb1c5b1539ebbd924f9ab72bc88258d4f46
-  data.tar.gz: 36e2d9162001a46547a45967370391ff01a1ff00
+  metadata.gz: c305e96215335116ad8992df4ed772f4bcf403f6
+  data.tar.gz: b1650145719338b358050e0da49071bbec255198
 SHA512:
-  metadata.gz: b680ac59f0250ec7f86ed70aef66203696d3eb5cd9d93436f2200779594a3b9503b2eb3cda37e23bcd79c1ad42e03398c9cf03e13c533b96328cd8584c026eb1
-  data.tar.gz: 33c31ae69d29a7ba714349e621d0fff4d4a514135530547424d7eda388dcc38b34a97fb3b521038eddffb68f73124f873bc7e4d051f0502c3205c38738e093df
+  metadata.gz: 3b4ec3fd4ce43328add4b810bcb9ec525bb31f7207a363666f18d3bb8a3d90fbbe49915b56eddeff2b5bb8bf4cfa2a7ce64eeadfbc7374ddd2667ec13abf1915
+  data.tar.gz: 74a2431827daed9e6d17b06568228f59106e9328352bec25f0fc9c8940066cf2250467ffc189339648382cffb797ac5c43376638d1a3e5ff1e81aebb77fd8f29

data/README.md

@@ -57,10 +57,9 @@ kibana_path: /opt/kibana
 
 server_port: 5000
 
-default_elastic_search:
-  elastic_servers:
-    - 127.0.0.1:9200
-  elastic_binary: /opt/elasticsearch/bin/elasticsearch
+elastic_servers:
+  - 127.0.0.1:9200
+elastic_binary: /opt/elasticsearch/bin/elasticsearch
 ```
 
 * `box_type` specifies the module in charge of gathering data from your box. it Should not be changed but you can define
@@ -75,8 +74,6 @@ ElasticSearch on the same machine as the gem is installed, then it should alread
 * `elastic_binary` defines where your [ElasticSearch][ELK] is installed. This one is only used by a rake task
 (to stop/start and get info) about the ElasticSearch cluster. This is not really needed for the log process to work.
 Only to enable stop/start of the server.
-When you change it in your config, you do not need to set it in the `default_elastic_search` hash, but instead you can
-directly set it at the root.
 
 **These values are the default and you don't need to create a new config file if they already fit your needs.**
 And it should be the case if you installed [ELK] as a whole on the machine you are using this gem.

data/config/internet_box_logger.conf

@@ -1,13 +1,19 @@
+# These are the default values for some mandatory settings
+# Feel free to override these values in any of the config files you choose to use.
 
+# The type of box.
 box_type: InternetBoxLogger::Parsers::FreeboxV5Parser
 
+# Defines the interval between two calls as defined in cron
 cron_interval: 1
 
+# Where is Kibana installed
 kibana_path: /opt/kibana
 
+# When running this gem as a server, which port to bind to
 server_port: 5000
 
-default_elastic_search:
-  elastic_servers:
-    - 127.0.0.1:9200
-  elastic_binary: /opt/elasticsearch/bin/elasticsearch
+# ElasticSearch default installation parameters
+elastic_binary: /opt/elasticsearch/bin/elasticsearch
+elastic_servers:
+  - 127.0.0.1:9200

data/lib/internet_box_logger/elastic_search.rb

@@ -4,11 +4,11 @@ module InternetBoxLogger
     module Server
 
       def self.[]
-        EasyAppHelper.config[:elastic_servers] || EasyAppHelper.config[:default_elastic_search]['elastic_servers']
+        EasyAppHelper.config[:elastic_servers]
       end
 
       def self.local_path
-        EasyAppHelper.config[:elastic_binary] || EasyAppHelper.config[:default_elastic_search]['elastic_binary']
+        EasyAppHelper.config[:elastic_binary]
       end
 
       def self.local?

data/lib/internet_box_logger/version.rb

@@ -1,3 +1,3 @@
 module InternetBoxLogger
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: internet_box_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Laurent B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler