ffwd-google-cloud 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ce27fdf5b4be025672e1f9976f65b8f0cf6b20
-  data.tar.gz: 73692e2a3c6ed2f31cd7a1a282d447ecb122cc57
+  metadata.gz: 85933ad63b1c5d571fc088d5d36083a703b132c5
+  data.tar.gz: 7efaf4b8b585240dca680c11a18fa12a291ad3a8
 SHA512:
-  metadata.gz: 05ee2f2a30305b29b0755b04b1ca591ba11e7d6121f3dfd0307ed5e730c0323b95f04663b234cdd18c776c578debbe390f22500061d78d808cdae51e89c0af10
-  data.tar.gz: a826644b2b8c4a1ceb3a12ed50ebae350bd6c0bc77e71a0a8571264c31f8903a1ee661a3366c0d1a7136680939f7ab70ded31a2be53124ca2589a7f11fc2f06f
+  metadata.gz: 2d7b1e2c7190804535447aa2b3a6e41d78b040f7ad9c87cca55b8ce4d46f373329945392bb92a627adde052ed1cb6a14a57479f88cd1f7bd846846df4d7ce97d
+  data.tar.gz: f54fc5d8ca85a7345d281a897b6d4a4b8a394451e34033eff4c5f1c42a3efcba4198a720bd6c5391f8ead7eef7d45197c4cea221190bfc92acceecf051e20e5b

data/lib/ffwd/plugin/google_cloud/utils.rb

@@ -30,11 +30,11 @@ module FFWD::Plugin::GoogleCloud
 
         if seen.member?(d[:metric])
           dropped += 1
-          next 
+          next
         end
 
         seen.add(d[:metric])
-        result << {:timeseriesDesc => make_desc(m), :point => make_point(m)}
+        result << {:timeseriesDesc => d, :point => make_point(m)}
       end
 
       [dropped, result]
@@ -50,13 +50,21 @@ module FFWD::Plugin::GoogleCloud
     end
 
     def self.make_key m
-      what ||= m.attributes[:what]
-      what ||= m.attributes["what"]
+      attributes = Hash[m.attributes]
 
-      if what.nil?
-        "#{CUSTOM_PREFIX}/#{m.key}"
+      entries = []
+
+      what ||= attributes.delete(:what)
+      what ||= attributes.delete("what")
+
+      entries << what unless what.nil?
+      entries += attributes.keys.sort.map(&:to_s)
+      entries = entries.join('.')
+
+      unless entries.empty?
+        "#{CUSTOM_PREFIX}/#{m.key}/#{entries}"
       else
-        "#{CUSTOM_PREFIX}/#{m.key}.#{what}"
+        "#{CUSTOM_PREFIX}/#{m.key}"
       end
     end
 

data/lib/ffwd/plugin/google_cloud/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module GoogleCloud
-      VERSION = "0.4.1"
+      VERSION = "0.4.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - John-John Tedro
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement