cf_light_api 2.2.1.pre1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af7fcf04ef598fcbec339627bd9bd62a67c58b8
-  data.tar.gz: faaa4ed3a0f4c77c52dbcb2b619d956cc641bed9
+  metadata.gz: d48a0a566e7cbb841e1b577f71058c3d4b1a25ef
+  data.tar.gz: 9362b13d934a01239131c2ef93e63f2b9ec84111
 SHA512:
-  metadata.gz: a488db386f9f03bf105aa1f26a50c899e8c95f0e37741d1d9c9c464c22512d21f4e5f9ab1390ea6c5fa1a524fac668fd72f33c162de93496f21aa600a41026f9
-  data.tar.gz: 0988cab3f0e16eda16faa982c0d9ebd7d0cb8c87323c87ba008055709dcb908067113af4ccd82c3fa8b825429abcdb4b5f478ebb08a3c1234b902406a3bdd3ae
+  metadata.gz: 786bc3faae369178e518d5762455c9f0eaa372fcd78ef448638cce2e2b54f906dce9ddc9ad6ed5820c27791816c82e922e9d0e7e8ed363acb86d83d3e5048371
+  data.tar.gz: 809390e230760ed3a8c3264a36c2d1ddc600fb365ff6c5879c936be139a53e8170633fd6ab70f79a147469c098b0449c410039a0547567553560cf318f6e0de5

data/lib/cf_light_api/worker.rb

@@ -26,9 +26,10 @@ class CFLightAPIWorker
       end
     end
 
-    # If either of the Graphite settings are set, verify that they are both set, or exit with an error.
+    # If either of the Graphite settings are set, verify that they are both set, or exit with an error. CF_ENV_NAME is used
+    # to prefix the Graphite key, to allow filtering by environment if you run more than one.
     if ENV['GRAPHITE_HOST'] or ENV['GRAPHITE_PORT']
-      ['GRAPHITE_HOST', 'GRAPHITE_PORT'].each do |env|
+      ['GRAPHITE_HOST', 'GRAPHITE_PORT', 'CF_ENV_NAME'].each do |env|
         unless ENV[env]
           @logger.info "Error: please set the '#{env}' environment variable to enable exporting to Graphite."
           exit 1
@@ -46,7 +47,7 @@ class CFLightAPIWorker
     @logger.info "Update timeout:  '#{@update_timeout}'"
 
     if ENV['GRAPHITE_HOST'] and ENV['GRAPHITE_PORT']
-      @logger.info "Graphite server: #{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}" 
+      @logger.info "Graphite server: #{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}"
     else
       @logger.info 'Graphite server: Disabled'
     end
@@ -68,9 +69,9 @@ class CFLightAPIWorker
 
     resources = []
     response = JSON.parse(@cf_client.base.rest_client.request(method, path)[1][:body])
-    
+
     # Some endpoints return a 'resources' array, others are flat, depending on the path.
-    if response['resources'] 
+    if response['resources']
       resources << response['resources']
     else
       resources << response
@@ -92,7 +93,7 @@ class CFLightAPIWorker
     sanitised_app_name = app_name.gsub ".", "_" # Some apps have dots in the app name which breaks the Graphite key path
 
     instance_stats.each_with_index do |instance_data, index|
-      graphite_base_key = "cf_apps.#{org}.#{space}.#{sanitised_app_name}.#{index}"
+      graphite_base_key = "cf_apps.#{ENV['CF_ENV_NAME']}.#{org}.#{space}.#{sanitised_app_name}.#{index}"
       @logger.info "  Exporting app instance \##{index} usage statistics to Graphite, path '#{graphite_base_key}'"
 
       # Quota data
@@ -133,7 +134,7 @@ class CFLightAPIWorker
 
   def update_cf_data
     @cf_client = nil
-    @graphite  = GraphiteAPI.new(graphite: "#{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}") if ENV['GRAPHITE_HOST'] and ENV['GRAPHITE_PORT']
+    @graphite  = GraphiteAPI.new(graphite: "#{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}") if ENV['GRAPHITE_HOST'] and ENV['GRAPHITE_PORT'] and ENV['CF_ENV_NAME']
 
     begin
       @lock_manager.lock("#{ENV['REDIS_KEY_PREFIX']}:lock", 5*60*1000) do |lock|
@@ -200,7 +201,7 @@ class CFLightAPIWorker
                 instance_stats = formatted_instance_stats_for_app(app)
                 running_instances = instance_stats.select{|instance| instance['stats']['uris'] if instance['state'] == 'RUNNING'}
                 raise "There are no running instances of this app." if running_instances.empty?
-                
+
                 if @graphite
                   send_instance_usage_data_to_graphite(instance_stats, org['entity']['name'], space['entity']['name'], app['entity']['name'])
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.2.1.pre1
+  version: 2.3.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -135,9 +135,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14