kubernetes-deploy 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ad1fea429ff09ad76f943268e282f118187bcf
-  data.tar.gz: 2f97506d2a4c07a2c21702dbfbc9586785efa303
+  metadata.gz: 05fd6f9e6d7f1ed75f28c9bf9c25508be5a8ce84
+  data.tar.gz: 8712e70aab07e4ce005feff75c4bad5441242508
 SHA512:
-  metadata.gz: 5057c2c5ffcb7ddc6891cabc150e4f27028c8d75ecbcd5e46a56ffe87f7d61d731597e26d4bd23a989dc07fbf11bdea75efda55c61d08357d2a9f538eaf74553
-  data.tar.gz: 913bed4cd01a854b2a2b39cde61582e409be306a9309f4708d8d46eb9c03f6ddf2e1f7bad1f0a54900d742333abc85d1f5395813ff4a51902c521887d2018150
+  metadata.gz: c426af3a8c735dbf2c4543fb11ed84c7ae177a047790b4e53bf725124bd01ba1d77d0923da9123fb491bd6f1e982e7c99de287799b622e4bfc16e1a1e379fdc6
+  data.tar.gz: 2f18a43c9929f2148ed9b614f46d7af115fec162235368301c9e3600bdd953c8f82c601bfa8e8d1687a8aa864746a103ddedecb4687df77b4a464404326733fa

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -187,18 +187,7 @@ module KubernetesDeploy
 
     def report_status_to_statsd(watch_time)
       unless @statsd_report_done
-        status = if deploy_failed?
-          "failure"
-        elsif deploy_timed_out?
-          "timeout"
-        elsif deploy_succeeded?
-          "success"
-        else
-          "unknown"
-        end
-        tags = %W(namespace:#{namespace} resource:#{id} type:#{type} sha:#{ENV['REVISION']} status:#{status})
-        ::StatsD.measure('resource.duration', watch_time * 1000, tags: tags)
-        ::StatsD.increment('resource.status', 1, tags: tags)
+        ::StatsD.measure('resource.duration', watch_time, tags: statsd_tags)
         @statsd_report_done = true
       end
     end
@@ -272,5 +261,18 @@ module KubernetesDeploy
     ensure
       file.close if file
     end
+
+    def statsd_tags
+      status = if deploy_failed?
+        "failure"
+      elsif deploy_timed_out?
+        "timeout"
+      elsif deploy_succeeded?
+        "success"
+      else
+        "unknown"
+      end
+      %W(context:#{context} namespace:#{namespace} resource:#{id} type:#{type} sha:#{ENV['REVISION']} status:#{status})
+    end
   end
 end

data/lib/kubernetes-deploy/runner.rb

@@ -105,9 +105,9 @@ module KubernetesDeploy
 
       if deploy_has_priority_resources?(resources)
         @logger.phase_heading("Predeploying priority resources")
-        ::StatsD.measure('duration.priority_resources', tags: statsd_tags) do
-          predeploy_priority_resources(resources)
-        end
+        start_priority_resource = Time.now.utc
+        predeploy_priority_resources(resources)
+        ::StatsD.measure('priority_resources.duration', statsd_duration(start_priority_resource), tags: statsd_tags)
       end
 
       @logger.phase_heading("Deploying all resources")
@@ -116,9 +116,9 @@ module KubernetesDeploy
       end
 
       if verify_result
-        ::StatsD.measure('duration.normal_resources', tags: statsd_tags) do
-          deploy_resources(resources, prune: prune, verify: true)
-        end
+        start_normal_resource = Time.now.utc
+        deploy_resources(resources, prune: prune, verify: true)
+        ::StatsD.measure('normal_resources.duration', statsd_duration(start_normal_resource), tags: statsd_tags)
         record_statuses(resources)
         success = resources.all?(&:deploy_succeeded?)
       else
@@ -136,7 +136,8 @@ module KubernetesDeploy
       success = false
     ensure
       @logger.print_summary(success)
-      ::StatsD.measure('duration.total', (Time.now.utc - start) * 1000.0, tags: statsd_tags)
+      status = success ? "success" : "failed"
+      ::StatsD.measure('all_resources.duration', statsd_duration(start), tags: statsd_tags << "status:#{status}")
       success
     end
 
@@ -441,7 +442,11 @@ module KubernetesDeploy
     end
 
     def statsd_tags
-      %W(namespace:#{@namespace} sha:#{@current_sha})
+      %W(namespace:#{@namespace} sha:#{@current_sha} context:#{@context})
+    end
+
+    def statsd_duration(start_time)
+      (Time.now.utc - start_time).round(1)
     end
   end
 end

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Katrina Verey