cf_light_api 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892f44f1093e2c4dbe2e195463dafbe2a4038ec3
-  data.tar.gz: 516a3ddd90bc674dd5ccb9dd8ff4fbaefb3ce586
+  metadata.gz: 8ddef2bf8068ab560f90c3d7be40f48d716ca764
+  data.tar.gz: dc155276e8f19677c3ae0941f2191b0c1ca8edd3
 SHA512:
-  metadata.gz: 2b4a1be614230c15fea449956cb6935648ddddbe5add1a750c390cca984531b1e385d4b6581f9fc7d0e36c8a774dc094dbb9a1f3d26a46afd78dc0fb9662b999
-  data.tar.gz: 40fe1395ff99687ecce09ddc7ee9fdb16a0447889d2af427780d83964b3afbd8582d131bd9f79d4f55c6cd6d6a2e2b6a3075a3b72b6e55c01ab2012d2257b742
+  metadata.gz: e88464f8fce42345d6beda2536cf5b9622ac7f554af1c5c7c98ceb5036924d07a26bc0bff2c88afa5bbfee6dca1e3b4a796cb1ba3cf49f742af7a13a3d95a499
+  data.tar.gz: 0537fc2e03b21eabfce23eecfa11f0f928e10cd7ad2d1b1d300f55083d159cafbce950cbcd580bf7ac104b92eb643aaa39dd222182116596ce00d64c3d483d2b

data/lib/cf_light_api/worker.rb

@@ -21,17 +21,16 @@ UPDATE_INTERVAL = (ENV['UPDATE_INTERVAL'] || '5m').to_s
 UPDATE_TIMEOUT  = (ENV['UPDATE_TIMEOUT']  || '5m').to_s
 
 lock_manager = Redlock::Client.new([ENV['REDIS_URI']])
-scheduler = Rufus::Scheduler.new
+scheduler    = Rufus::Scheduler.new
 
 @logger.info "Parallel maps:   '#{PARALLEL_MAPS}'"
 @logger.info "Update interval: '#{UPDATE_INTERVAL}'"
 @logger.info "Update timeout:  '#{UPDATE_TIMEOUT}'"
+@logger.info "Graphite server: #{ENV['GRAPHITE']}" if ENV['GRAPHITE']
 
 scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout => UPDATE_TIMEOUT do
   cf_client = nil
-
-  graphite = if ENV['GRAPHITE'] then GraphiteAPI.new(graphite: ENV['GRAPHITE']) end
-  @logger.info "Sending data to graphite server #{ENV['GRAPHITE']}" if graphite
+  graphite  = GraphiteAPI.new(graphite: ENV['GRAPHITE']) if ENV['GRAPHITE']
 
   begin
     lock_manager.lock("#{ENV['REDIS_KEY_PREFIX']}:lock", 5*60*1000) do |lock|
@@ -70,16 +69,21 @@ def get_client(cf_api=ENV['CF_API'], cf_user=ENV['CF_USER'], cf_password=ENV['CF
 end
 
 def send_data_to_graphite(data, graphite)
-  org = data[:org]
+  org   = data[:org]
   space = data[:space]
-  name = data[:name].sub ".", "_" # Some apps have dots in the app name
+  name  = data[:name].sub ".", "_" # Some apps have dots in the app name
 
   data[:instances].each_with_index do |instance_data, index|
-    instance_data[:stats][:usage].each do |key, value|
-      if key != :time
-        graphite_key = "cf_apps.#{org}.#{space}.#{name}.#{index}.#{key}"
-        graphite.metrics graphite_key => value
-      end
+    graphite_base_key = "cf_apps.#{org}.#{space}.#{name}.#{index}"
+
+    # Quota data
+    [:mem_quota, :disk_quota].each do |key|
+      graphite.metrics "#{graphite_base_key}.#{key}" => instance_data[:stats][key]
+    end
+
+    # Usage data
+    [:mem, :disk, :cpu].each do |key|
+      graphite.metrics "#{graphite_base_key}.#{key}" => instance_data[:stats][:usage][key]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ./lib/sinatra/cf_light_api.rb
 - ./lib/cf_light_api/redis.rb
 - ./lib/cf_light_api/worker.rb
-- ./lib/sinatra/cf_light_api.rb
 - bin/cf_light_api
 homepage: https://github.com/springerpe/cf-light-api
 licenses:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A super lightweight API for reading App and Org data from CloudFoundry, cached