cf_light_api 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2598bd90a4e0453de25c9cd8e0247c528cdb9a85
-  data.tar.gz: 87cadea0817776aafb744ad4448d4a87a8d496c4
+  metadata.gz: c695feed1d26f00127af6fac5fb24de9d64e0b56
+  data.tar.gz: 42228f7a1efecd0f66f4f3ac0a1f31ad8de6d734
 SHA512:
-  metadata.gz: af22c2c73a60c6a73c4317f85b7ce0929136fe288f290cc740d054de132e0e84571585eeaa4ec4fec2b5b1c475cc1a8043444a28f1b4fe034611afba1c4aa3ff
-  data.tar.gz: d54ac8cac0621763770844fc75637ccd52c713b45f81db54ef6f2f383e1b239e2d70cd294cc88711b4026f1c38af7ace0fa4f0b5aa3e5a6bd36ffaac45c5adf2
+  metadata.gz: 6a412171a1799c8797bcd53e064cdad186154c42ab01d2bf46145b15f2d56ac9b3fbb6303f9140546478bbfc48e9bcba0d832b777b26ae280850acf15222772e
+  data.tar.gz: 5de6fde920e3ad043ed7673a8fe0b70500665e377f076b1844a1f053b6c004180a95e87943a9c8f3fe028fedc525325e2ce51567db6f6463b5036ed4f57da00a

data/lib/cf_light_api/lib.rb

@@ -58,3 +58,16 @@ def format_duration(elapsed_seconds)
   hours   = elapsed_seconds / (60 * 60)
   format("%02d hrs, %02d mins, %02d secs", hours, minutes, seconds)
 end
+
+def format_routes_for_app app
+  routes = cf_rest app['entity']['routes_url']
+  routes.collect do |route|
+    host   = route['entity']['host']
+    path   = route['entity']['path']
+
+    domain = @domains.find{|a_domain| a_domain['metadata']['guid'] == route['entity']['domain_guid']}
+    domain = domain['entity']['name']
+
+    "#{host}.#{domain}#{path}"
+  end
+end

data/lib/cf_light_api/worker.rb

@@ -63,6 +63,7 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
         @quotas    = cf_rest('/v2/quota_definitions?results-per-page=100')
         @spaces    = cf_rest('/v2/spaces?results-per-page=100')
         @stacks    = cf_rest('/v2/stacks?results-per-page=100')
+        @domains   = cf_rest('/v2/domains?results-per-page=100')
 
         formatted_orgs = @orgs.map do |org|
           quota = @quotas.find{|a_quota| a_quota['metadata']['guid'] == org['entity']['quota_definition_guid']}
@@ -81,38 +82,39 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
 
         formatted_apps = @apps.map do |app|
           # TODO: This is a bit repetative, could maybe improve?
-          space = @spaces.find{|a_space| a_space['metadata']['guid'] == app['entity']['space_guid']}
-          org   = @orgs.find{|an_org|     an_org['metadata']['guid'] == space['entity']['organization_guid']}
-          stack = @stacks.find{|a_stack| a_stack['metadata']['guid'] == app['entity']['stack_guid']}
+          space  = @spaces.find{|a_space| a_space['metadata']['guid'] == app['entity']['space_guid']}
+          org    = @orgs.find{|an_org|     an_org['metadata']['guid'] == space['entity']['organization_guid']}
+          stack  = @stacks.find{|a_stack| a_stack['metadata']['guid'] == app['entity']['stack_guid']}
+          routes = format_routes_for_app(app)
 
           running = (app['entity']['state'] == "STARTED")
 
           base_data = {
+            :buildpack     => app['entity']['buildpack'],
+            :data_from     => Time.now.to_i,
+            :diego         => app['entity']['diego'],
+            :docker        => app['entity']['docker_image'] ? true : false,
+            :docker_image  => app['entity']['docker_image'],
             :guid          => app['metadata']['guid'],
+            :last_uploaded => app['metadata']['updated_at'] ? DateTime.parse(app['metadata']['updated_at']).strftime('%Y-%m-%d %T %z') : nil,
             :name          => app['entity']['name'],
             :org           => org['entity']['name'],
+            :routes        => routes,
             :space         => space['entity']['name'],
             :stack         => stack['entity']['name'],
-            :buildpack     => app['entity']['buildpack'],
-            :data_from     => Time.now.to_i,
-            :last_uploaded => app['metadata']['updated_at'] ? DateTime.parse(app['metadata']['updated_at']).strftime('%Y-%m-%d %T %z') : nil
+            :state         => app['entity']['state']
           }
 
-          # Add additional data, such as instance usage statistics, and routes - but this is only possible
-          # if the instance is running.
+          # Add additional data, such as instance usage statistics - but this is only possible if the instances are running.
           additional_data = {}
 
           begin
             instance_stats = []
-            routes         = []
             if running
-              # Finds the first running app instance that has a set of routes, in case there are stopped/crashed app instances that don't have any routes.
               instance_stats = formatted_instance_stats_for_app(app)
               running_instances = instance_stats.select{|instance| instance['stats']['uris'] if instance['state'] == 'RUNNING'}
-              raise "Unable to retrieve app routes - no app instances are running." if running_instances.empty?
+              raise "There are no running instances of this app." if running_instances.empty?
               
-              routes = running_instances.first['stats']['uris']
-
               if @graphite
                 send_instance_usage_data_to_graphite(instance_stats, org['entity']['name'], space['entity']['name'], app['entity']['name'])
               end
@@ -121,7 +123,6 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
             additional_data = {
              :running   => running,
              :instances => instance_stats,
-             :routes    => routes,
              :error     => nil
             }
 
@@ -133,7 +134,6 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
             additional_data = {
               :running   => 'error',
               :instances => [],
-              :routes    => [],
               :error     => e.message
             }
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry