sidekiq-cloudwatchmetrics 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d12e8127fc1e085dfafd8812c3fca0ca8f60d84a18d0c1075df44f3d73dfa7e
-  data.tar.gz: d122fa6c24b657283c383e00a64be1d6d61ec1f22f6eabb1eb42d14b590992b9
+  metadata.gz: 8e3991b16a0ac40b697bd24d4efee3192a8d9bb5ca4c252e2f5cd6135843800d
+  data.tar.gz: 53107e6b0601740c0133b1f95396863cb3853d46628d2b4f575102aa496d4110
 SHA512:
-  metadata.gz: 86028f3e083b24983f2bf59a850e996c76bd6a0f09c200bcecb386ab914dd5fc48c70ba1fb2ac44edee0db2c22b190eeac79f46f6b609195a067ee7665841218
-  data.tar.gz: 9a0119a1004c93d68837980ed58103fe293026e89e37ef1d3d39312bdccf038152c73812f0189c1fbb82a713514804ab7e711374086bc2082c7ac6fa96d5bc0f
+  metadata.gz: 24311c4a2dca677378aa1a0b44ed33e7957b2e445c9ea39a20de21efb30acf8fc388912a9805c59651d44b822a25205a23f87d85f692d64489d020f29b6f8275
+  data.tar.gz: 188acd1c12c6b69315fb17b778ba9e56dadf7e1d05c8af0b8eb84dcddf48ce30cb9bae795ee266a60f0a0fdef1982081b0e0c3eb5cf850e310194ef296457b17

data/lib/sidekiq/cloudwatchmetrics.rb

@@ -75,8 +75,6 @@ module Sidekiq::CloudWatchMetrics
       now = Time.now
       stats = Sidekiq::Stats.new
       processes = Sidekiq::ProcessSet.new.to_enum(:each).to_a
-      utilization = calculate_utilization(processes)
-      capacity = calculate_capacity(processes)
       queues = stats.queues
 
       metrics = [
@@ -128,27 +126,37 @@ module Sidekiq::CloudWatchMetrics
           value: stats.processes_size,
           unit: "Count",
         },
+        {
+          metric_name: "DefaultQueueLatency",
+          timestamp: now,
+          value: stats.default_queue_latency,
+          unit: "Seconds",
+        },
         {
           metric_name: "Capacity",
           timestamp: now,
-          value: capacity,
+          value: calculate_capacity(processes),
           unit: "Count",
         },
         {
           metric_name: "Utilization",
           timestamp: now,
-          value: utilization * 100.0,
+          value: calculate_utilization(processes) * 100.0,
           unit: "Percent",
         },
-        {
-          metric_name: "DefaultQueueLatency",
-          timestamp: now,
-          value: stats.default_queue_latency,
-          unit: "Seconds",
-        },
       ]
 
-      queues.map do |(queue_name, queue_size)|
+      processes.each do |process|
+        metrics << {
+          metric_name: "Utilization",
+          dimensions: [{name: "Hostname", value: process["hostname"]}],
+          timestamp: now,
+          value: process["busy"] / process["concurrency"].to_f * 100.0,
+          unit: "Percent",
+        }
+      end
+
+      queues.each do |(queue_name, queue_size)|
         metrics << {
           metric_name: "QueueSize",
           dimensions: [{name: "QueueName", value: queue_name}],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cloudwatchmetrics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Cochran
@@ -28,7 +28,7 @@ cert_chain:
   ccrr0sGoLnfK6DappOwH1I5uPvQohOATNmmU0MSSWOeiggLlEWmUYE7CvzoMc8R6
   DlumKi5y9wE+XnxtyLbe6GlT3AkVGnhwPdwq2QBFLEWkTVogdCYomBCKfjY=
   -----END CERTIFICATE-----
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Publish Sidekiq metrics to AWS CloudWatch