cf_light_api 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be10be33cf01b43330ee3aaee4f001f0f247437
-  data.tar.gz: 9df2e44bac564c56b13da916bfeb8a251e037c5c
+  metadata.gz: 892f44f1093e2c4dbe2e195463dafbe2a4038ec3
+  data.tar.gz: 516a3ddd90bc674dd5ccb9dd8ff4fbaefb3ce586
 SHA512:
-  metadata.gz: e275f663dd7baa03b7c4f61d9f477b943d9e9ca50c79d44bd6a47a897dd7ad2aa7bdf928fb384197162ac3d0092b9920341928da1d68841f5aa487f19c2f5671
-  data.tar.gz: 7d113cc505ae09a1922bc2b1202f99bdff42c21659215cc6b89d23a6ee148e8fd51890f0f8810fc5b451d15eb56b0524efbc315bb312779579da71e891d17133
+  metadata.gz: 2b4a1be614230c15fea449956cb6935648ddddbe5add1a750c390cca984531b1e385d4b6581f9fc7d0e36c8a774dc094dbb9a1f3d26a46afd78dc0fb9662b999
+  data.tar.gz: 40fe1395ff99687ecce09ddc7ee9fdb16a0447889d2af427780d83964b3afbd8582d131bd9f79d4f55c6cd6d6a2e2b6a3075a3b72b6e55c01ab2012d2257b742

data/lib/cf_light_api/worker.rb

@@ -4,6 +4,7 @@ require 'rufus-scheduler'
 require 'parallel'
 require 'redlock'
 require 'logger'
+require 'graphite-api'
 
 @logger = Logger.new(STDOUT)
 @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -28,6 +29,10 @@ scheduler = Rufus::Scheduler.new
 
 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
+
   begin
     lock_manager.lock("#{ENV['REDIS_KEY_PREFIX']}:lock", 5*60*1000) do |lock|
       if lock
@@ -38,7 +43,7 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
         cf_client = get_client()
 
         org_data = get_org_data(cf_client)
-        app_data = get_app_data(cf_client)
+        app_data = get_app_data(cf_client, graphite)
 
         put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:orgs", org_data
         put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", app_data
@@ -64,7 +69,22 @@ def get_client(cf_api=ENV['CF_API'], cf_user=ENV['CF_USER'], cf_password=ENV['CF
   client
 end
 
-def get_app_data(cf_client)
+def send_data_to_graphite(data, graphite)
+  org = data[:org]
+  space = data[:space]
+  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
+    end
+  end
+end
+
+def get_app_data(cf_client, graphite)
   Parallel.map(cf_client.organizations, :in_processes => PARALLEL_MAPS) do |org|
     org_name = org.name
     Parallel.map(org.spaces, :in_processes => PARALLEL_MAPS) do |space|
@@ -73,7 +93,11 @@ def get_app_data(cf_client)
       Parallel.map(space.apps, :in_processes => PARALLEL_MAPS) do |app|
         begin
           # It's possible for an app to have been terminated before this stage is reached.
-          format_app_data(app, org_name, space_name)
+          formatted_app_data = format_app_data(app, org_name, space_name)
+          if graphite
+            send_data_to_graphite(formatted_app_data, graphite)
+          end
+          formatted_app_data
         rescue CFoundry::AppNotFound
           next
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: graphite-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 description: A super lightweight API for reading App and Org data from CloudFoundry,
   cached in Redis.
 email: ''
@@ -102,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:
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A super lightweight API for reading App and Org data from CloudFoundry, cached