cloudscale 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c3a384bcb365307be67e2390acb8ca9ab27cc0
-  data.tar.gz: 874fffa112bfdcb158f02339a7cf4cdbbd1cc8c2
+  metadata.gz: 07a34393d2ffd100908ce523865bc2110c3d3f36
+  data.tar.gz: 352f6af0a202322466cf411ff34357a4eececc67
 SHA512:
-  metadata.gz: 2b28c28ed9a347c008ca6bb7cdcc3334bf4f6e54dbc7aea82dd94c7cfee7ee0ef8c399fd6750c9bce26ca190ceb2e1864b57d4eb17ee1bb083fb0a35fca887ee
-  data.tar.gz: b24d86fff46bc0c31b5fe19bd05cca0970f185a89543d2f67917e0b75dbb56d93619f9f8587706e8ca50dc4816d4b5da0ed0de8800adc73476c72d414e238af2
+  metadata.gz: 426faf03ecdcc811bda61727dd8143a24d3c10700946138bb1414223d1a07b06ff408f88cf2151d23545072ca8264eb026dae952a1414cdbd2c743a7185aea89
+  data.tar.gz: 184c0f8e96e05e61ec362eeda9658f2e66782a51d33c1beb052f67329f37814150deea184fea17ff533b8f611647dda36d60030f5319f37ec1137af77cdcc9e1

data/lib/cloudscale.rb

@@ -7,6 +7,7 @@ require "#{File.dirname(__FILE__)}/cloudscale/monitor/agent/init"
 require "#{File.dirname(__FILE__)}/cloudscale/schedule"
 require "#{File.dirname(__FILE__)}/cloudscale/monitor/agent/preops/general_preop"
 require "#{File.dirname(__FILE__)}/cloudscale/plugins/plugin"
+require "#{File.dirname(__FILE__)}/cloudscale/monitor/model/constants/agent_store"
 Dir["#{File.dirname(__FILE__)}/cloudscale/plugins/*/*.rb"].each { | f | require f }
 
 ##
@@ -93,6 +94,16 @@ module Cloudscale
       puts parser
       exit
     end
+    
+    begin
+        host = GeneralPreop.instance.get_option_value("host")
+        port = GeneralPreop.instance.get_option_value("port")
+
+        config = Constants::Agent.load()
+        if (port != nil) then config["port"] = port end
+        if (host != nil) then config["host"] = host end
+        Constants::Agent.save(config)
+    end
 
     agent_instance = Monitor::Init.new(GeneralPreop.instance.get_option_value("token"))
     agent_instance_id = registry = Monitor::Registry.instance.agent_instance_id

data/lib/cloudscale/monitor/agent/init.rb

@@ -51,7 +51,7 @@ module Cloudscale
           Constants::AgentInstance.create(agent_instance.to_h)
         else
           puts "    Instance has been started previously, loading settings and existing data... \n\n"
-          
+
           agent_instance["lastInitialization"] = Time.now.to_i * 1000
 
           client.patch('agentInstances', RestClientWrapper.load_entity_id(agent_instance), agent_instance)

data/lib/cloudscale/monitor/agent/preops/general_preop.rb

@@ -19,6 +19,18 @@ module Cloudscale
           :required => true,
           :value => nil
         },
+        :host => {
+          :argument => "--host",
+          :description => "The host endpoint for the agent registration",
+          :required => false,
+          :value => nil
+        },
+        :port => {
+          :argument => "--port",
+          :description => "The port of the endpoint for the agent registration",
+          :required => false,
+          :value => nil
+        }
       }
 
       def options

data/lib/cloudscale/monitor/agent/preops/preop.rb

@@ -28,7 +28,11 @@ module Cloudscale
       end
 
       def get_option_value(key)
-        options[key.to_sym][:value] #|| @plugin_settings_db[key.to_s]
+        if (options[key.to_sym] != nil)
+          options[key.to_sym][:value] #|| @plugin_settings_db[key.to_s]
+        else
+          nil
+        end
       end
 
       def init_options

data/lib/cloudscale/monitor/model/constants/agent_store.rb

@@ -8,16 +8,28 @@ require "yaml/store"
 module Cloudscale
   module Constants
     class Agent
-      
+
       @@AGENT_STORE = "#{File.dirname(__FILE__)}/../../../store/agent/agent.store"
-      
+
       def self.load
         begin
-          YAML.load(File.read(@@AGENT_STORE))
+          YAML.load_file(@@AGENT_STORE)
         rescue
           return nil
         end
-      end    
+      end
+
+      def self.save(config)
+        puts config
+        begin
+          File.open(@@AGENT_STORE, 'w') do | h |
+            h.write config.to_yaml
+          end
+        rescue Exception
+          return nil
+        end
+        puts load()
+      end
     end
   end
 end

data/lib/cloudscale/rest/rest_client.rb

@@ -1,8 +1,9 @@
 require "yaml"
 require "json"
-require "rest_client"
+require "rest-client"
 require "singleton"
 require "#{File.dirname(__FILE__)}/rest_client_helper"
+require "#{File.dirname(__FILE__)}/../monitor/model/constants/agent_store"
 
 ##
 #
@@ -12,21 +13,15 @@ require "#{File.dirname(__FILE__)}/rest_client_helper"
 class RestClientWrapper < RestClientHelper
   include Singleton
 
-  attr_accessor :endpoint, :key, :token, :header
-
-  def load_hash()
-    begin
-      YAML.load(File.read("#{File.dirname(__FILE__)}/../store/agent/agent.store"))
-    rescue
-      return nil
-    end
-  end
+  attr_accessor :endpoint, :host, :port, :key, :token, :header
 
   def initialize
-    if (endpoint == nil && key == nil && token == nil)
-      hash = load_hash()
+    if (key == nil && token == nil)
+      hash = Cloudscale::Constants::Agent.load()
     end
+
     @endpoint = hash["host"] + ":" + hash["port"].to_s + hash["path"].to_s
+
     @key = hash["key"]
     @token = load_token("token")
     @header = {

data/lib/cloudscale/store/agent/agent.store

@@ -1,7 +1,7 @@
 ---
-  agentId: 32093209323
-  host: "localhost"
-  path : "/service"
-  port: 8080
-  key: "monitoring"
-  token: "e2FsZz1IUzI1NiwgdHlwPUNUfQ.e3Y9MCwgZD1tb25pdG9yaW5nLCBpYXQ9MTQwNDc1NzMyNH0.rG0biCuH_-X1vulEr19H2m42i4DGRR8PGwgXastyk3Q"
+agentId: 32093209323
+host: localhost
+path: /service
+port: '8080'
+key: monitoring
+token: e2FsZz1IUzI1NiwgdHlwPUNUfQ.e3Y9MCwgZD1tb25pdG9yaW5nLCBpYXQ9MTQwNDc1NzMyNH0.rG0biCuH_-X1vulEr19H2m42i4DGRR8PGwgXastyk3Q

data/lib/cloudscale/store/agent/agent_instance.store

@@ -8,4 +8,4 @@ settings: !ruby/object:Cloudscale::Monitor::Settings
   coredataCollectionInterval: 0
   tableCollectionInterval: 1500
   reportingInterval: 5
-started: 1439644965000
+started: 1440004610000

data/lib/cloudscale/store/agent/influxdb.store

@@ -1,5 +1,5 @@
 ---
-  host: 88.198.249.51
+  host: 88.198.249.58
   port: 8086
   database: monitoring
   username: monitoring

data/lib/cloudscale/store/plugin/host

@@ -0,0 +1 @@
+I"localhost:ET

data/lib/cloudscale/store/plugin/port

@@ -0,0 +1 @@
+I"	8080:ET

data/lib/cloudscale/version.rb

@@ -4,5 +4,5 @@
 #
 ##
 module Cloudscale
-  VERSION = "0.0.3"  unless const_defined?(:VERSION)
+  VERSION = "0.0.4"  unless const_defined?(:VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudscale
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Johannes Hiemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -217,6 +217,8 @@ files:
 - lib/cloudscale/store/agent/agent.store
 - lib/cloudscale/store/agent/agent_instance.store
 - lib/cloudscale/store/agent/influxdb.store
+- lib/cloudscale/store/plugin/host
+- lib/cloudscale/store/plugin/port
 - lib/cloudscale/store/plugin/token
 - lib/cloudscale/version.rb
 - lib/cloudscale.rb