cloudscale 0.0.8 → 0.0.9

data/lib/cloudscale/rest/rest_client.rb

@@ -42,7 +42,12 @@ class RestClientWrapper < RestClientHelper
   end
 
   def get(entity, id)
-    uri = uriWithId(entity, id)
+    uri = uri_with_id(entity, id)
+    load(uri)
+  end
+
+  def get_with_path(entity, id, path)
+    uri = uri_with_id_and_path(entity, id, path)
     load(uri)
   end
 
@@ -69,9 +74,8 @@ class RestClientWrapper < RestClientHelper
     RestClient.get(searchQuery, header) { | response, request, result |
       case response.code
         when 200
-          responseBody = JSON.parse(response.body)
-          if (responseBody["content"].length == 1)
-            return responseBody["content"][0]
+          if (!response.body.empty?)
+            return JSON.parse(response.body)
           end
         else
           puts request.to_yaml
@@ -91,7 +95,9 @@ class RestClientWrapper < RestClientHelper
     RestClient.get(searchQuery, header) { | response, request, result |
       case response.code
         when 200
-          return JSON.parse(response.body)
+          if (!response.body.empty?)
+            return JSON.parse(response.body)
+          end
         else
           puts request.to_yaml
           puts response.code
@@ -127,7 +133,7 @@ class RestClientWrapper < RestClientHelper
       hash = value.to_dh
     end
 
-    RestClient.put(uriWithId(entity, id), hash.to_json, header) { | response, request, result |
+    RestClient.put(uri_with_id(entity, id), hash.to_json, header) { | response, request, result |
       case response.code
         when 200, 204
           if (response.body != nil && response.body.length > 2)
@@ -148,7 +154,7 @@ class RestClientWrapper < RestClientHelper
       hash = value.to_dh
     end
 
-    RestClient.patch(uriWithId(entity, id), hash.to_json, header) { | response, request, result |
+    RestClient.patch(uri_with_id(entity, id), hash.to_json, header) { | response, request, result |
       case response.code
       when 200, 204
         if (response.body != nil && response.body.length > 2)
@@ -165,7 +171,7 @@ class RestClientWrapper < RestClientHelper
   def delete(entity, id)
     id = id.to_s.gsub('{?projection}','')
 
-    RestClient.delete(uriWithId(entity, id), header) { | response, request, result |
+    RestClient.delete(uri_with_id(entity, id), header) { | response, request, result |
       case response.code
         when 200, 204
         else

data/lib/cloudscale/rest/rest_client_helper.rb

@@ -5,66 +5,73 @@
 #
 ##
 class RestClientHelper
-  
+
   def load_token(token)
     db = FSDB::Database.new("#{File.dirname(__FILE__)}/../store/plugin/")
     return db[token]
   end
-  
+
   def uri(entity)
     if (!endpoint.to_s.end_with? '/')
       @endpoint << '/'
     end
     String::new(@endpoint + entity)
   end
-  
+
   def uri_with_params(entity, params)
     if (!endpoint.to_s.end_with? '/')
       @endpoint << '/'
     end
-    
+
     uri = String::new(@endpoint + entity)
     if (params.is_a?(Hash))
       uri << '?'
       params.each { | key, value|
-        uri += key.to_s + '=' + value.to_s + '&'  
+        uri += key.to_s + '=' + value.to_s + '&'
       }
     end
     return uri
   end
-  
-  def uriWithId(entity, id)
+
+  def uri_with_id(entity, id)
     if (!endpoint.to_s.end_with? '/')
       @endpoint << '/'
     end
-    String::new(@endpoint + entity + '/' + id.to_s) 
+    String::new(@endpoint + entity + '/' + id.to_s)
   end
-  
+
+  def uri_with_id_and_path(entity, id, path)
+    if (!endpoint.to_s.end_with? '/')
+      @endpoint << '/'
+    end
+    String::new(@endpoint + entity + '/' + id.to_s + '/' + path)
+  end
+
   def self.load_entity_id(entity)
     if (entity != nil && entity["links"].is_a?(Array))
       entity["links"].each { | link |
         if (link["rel"] == "self")
           return link["href"][link["href"].rindex('/') + 1, link["href"].length]
-        end 
+        end
       }
     end
   end
-  
+
   def self.load_entity_ref(entity)
     if (entity != nil && entity["links"].is_a?(Array))
       entity["links"].each { | link |
         if (link["rel"] == "self")
           return link
-        end 
+        end
       }
     end
   end
-  
+
   def removeLinks(hash, key)
     if (hash.key?(key))
       hash.tap { | x |
-        x.delete(key)  
-      }      
+        x.delete(key)
+      }
     end
-  end  
+  end
 end

data/lib/cloudscale/schedule.rb

@@ -22,6 +22,7 @@ module Cloudscale
             end
           end
 
+          Monitor::Agent.alive(agentInstanceId)
           Monitor::InfluxDbReporter.instance.report(registry.metrics)
         end
 

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

@@ -1,5 +1,5 @@
 ---
-agentId: 32093209323
+agentId: 1395477369084
 host: localhost
 path: "/service"
 port: '8080'

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

@@ -0,0 +1,11 @@
+---
+agent: http://localhost:8080/service/agents/5315cf2d4d1a44fb9d21b1f9
+agentInstanceId: c7f9c3c2dc4d6f3e4cd46b4dda714115
+token: e2FsZz1IUzI1NiwgdHlwPUNUfQ.e3Y9MCwgZD1tb25pdG9yaW5nLCBpYXQ9MTQwNDc1NzMyNH0.rG0biCuH_-X1vulEr19H2m42i4DGRR8PGwgXastyk3Q
+server: jhiemer-evoila.fritz.box
+settings: !ruby/object:Cloudscale::Monitor::Settings
+  measurementCollectionInterval: 15
+  coredataCollectionInterval: 0
+  tableCollectionInterval: 1500
+  reportingInterval: 5
+started: 1442172827000

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

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

data/lib/cloudscale/version.rb

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

data/lib/store/plugin/host

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

data/lib/store/plugin/mongo-connect-timeout

@@ -0,0 +1 @@
+I"30:EF

data/lib/store/plugin/mongo-db

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

data/lib/store/plugin/mongo-host

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

data/lib/store/plugin/mongo-op-timeout

@@ -0,0 +1 @@
+I"30:EF

data/lib/store/plugin/mongo-password

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

data/lib/store/plugin/mongo-port

@@ -0,0 +1,2 @@
+I"
+27017:EF

data/lib/store/plugin/mongo-ssl

@@ -0,0 +1,2 @@
+I"
+false:EF

data/lib/store/plugin/mongo-username

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

data/lib/store/plugin/mysql-port

@@ -0,0 +1 @@
+I"	3306:EF

data/lib/store/plugin/port

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

data/lib/store/plugin/postgres-port

@@ -0,0 +1 @@
+I"	5432:EF

data/lib/store/plugin/redis-port

@@ -0,0 +1 @@
+I"	6379:EF

data/lib/store/plugin/redis-reconnect-attempts

@@ -0,0 +1 @@
+I"5:EF

data/lib/store/plugin/redis-timeout

@@ -0,0 +1 @@
+I"30:EF

data/lib/store/plugin/token

@@ -0,0 +1 @@
+I"{e2FsZz1IUzI1NiwgdHlwPUNUfQ.e3Y9MCwgZD1tb25pdG9yaW5nLCBpYXQ9MTQwNDc1NzMyNH0.rG0biCuH_-X1vulEr19H2m42i4DGRR8PGwgXastyk3Q:ET

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudscale
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Johannes Hiemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -195,20 +195,14 @@ dependencies:
 description: A Monitoring Client for Cloud Infrastructure provided by evoila.de
 email:
 - jhiemer@cloudscale.de
-executables: []
+executables:
+- cloudscale
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- bin/autospec
-- bin/bundler
-- bin/htmldiff
-- bin/ldiff
-- bin/monitor
-- bin/rake
-- bin/restclient
-- bin/rspec
+- bin/cloudscale
 - lib/cloudscale.rb
 - lib/cloudscale/monitor/agent/agent.rb
 - lib/cloudscale/monitor/model/agent/agent_instance.rb
@@ -228,6 +222,13 @@ files:
 - lib/cloudscale/plugins/mongo/mongo_replica_status.rb
 - lib/cloudscale/plugins/mongo/mongo_server_status.rb
 - lib/cloudscale/plugins/mongo/preops/mongodb_preop.rb
+- lib/cloudscale/plugins/mysql/data/mysql_chart.json
+- lib/cloudscale/plugins/mysql/data/mysql_menu.json
+- lib/cloudscale/plugins/mysql/mysql_counters.rb
+- lib/cloudscale/plugins/mysql/mysql_general_status.rb
+- lib/cloudscale/plugins/mysql/mysql_innodb.rb
+- lib/cloudscale/plugins/mysql/mysql_querycache.rb
+- lib/cloudscale/plugins/mysql/preops/mysql_preop.rb
 - lib/cloudscale/plugins/os/data/os_chart.json
 - lib/cloudscale/plugins/os/data/os_menu.json
 - lib/cloudscale/plugins/os/preops/os_preop.rb
@@ -244,16 +245,49 @@ files:
 - lib/cloudscale/plugins/postgres/postgres_server_status.rb
 - lib/cloudscale/plugins/postgres/preops/postgres_preop.rb
 - lib/cloudscale/plugins/preops/plugin_preop.rb
+- lib/cloudscale/plugins/redis/data/redis_chart.json
+- lib/cloudscale/plugins/redis/data/redis_menu.json
+- lib/cloudscale/plugins/redis/preops/redis_preop.rb
+- lib/cloudscale/plugins/redis/redis_server_status.rb
 - lib/cloudscale/registry.rb
 - lib/cloudscale/rest/rest_client.rb
 - lib/cloudscale/rest/rest_client_helper.rb
 - lib/cloudscale/schedule.rb
 - 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/store/plugin/host
+- lib/store/plugin/mongo-connect-timeout
+- lib/store/plugin/mongo-db
+- lib/store/plugin/mongo-host
+- lib/store/plugin/mongo-op-timeout
+- lib/store/plugin/mongo-password
+- lib/store/plugin/mongo-port
+- lib/store/plugin/mongo-ssl
+- lib/store/plugin/mongo-username
+- lib/store/plugin/mysql-db
+- lib/store/plugin/mysql-host
+- lib/store/plugin/mysql-password
+- lib/store/plugin/mysql-port
+- lib/store/plugin/mysql-username
+- lib/store/plugin/port
+- lib/store/plugin/postgres-db
+- lib/store/plugin/postgres-host
+- lib/store/plugin/postgres-password
+- lib/store/plugin/postgres-port
+- lib/store/plugin/postgres-username
+- lib/store/plugin/redis-db
+- lib/store/plugin/redis-host
+- lib/store/plugin/redis-password
+- lib/store/plugin/redis-port
+- lib/store/plugin/redis-reconnect-attempts
+- lib/store/plugin/redis-timeout
+- lib/store/plugin/redis-username
+- lib/store/plugin/token
 - lib/test/rest/rest_client_test.rb
 - lib/test/sigar/sigar_test.rb
 homepage: http://www.evoila.de

data/bin/autospec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'autospec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'autospec')

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('bundler', 'bundler')

data/bin/htmldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/monitor

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'monitor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('cloudscale', 'monitor')