cloudstack_stats 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988f2e586d5ee736a7396e7c19d58554c8056af6
-  data.tar.gz: 6202f3b90f92c1eaec5d09dc72903b7073e0f09f
+  metadata.gz: e9c84e386e53ef11f8cb75da2f779edb18f3bcff
+  data.tar.gz: 6650c96957ed98ab9fb0ad78d112ddfeff5aed49
 SHA512:
-  metadata.gz: b8a5f33f6982781af2e5c0e766ff9980135d7df471845adbace4d17f498ae9c97941d6d27c7c4ca9f1eede27b4d182bdfde8ce5f598697fcdf7ee91346730d5e
-  data.tar.gz: 9f4758a4b2485375ddf1b5c7a84a0be9262b8614d9c5608eb687a970529e46ad5fd572a0a17673a169cef466d37f86abde6e629cf52a679ff247c848d671753d
+  metadata.gz: 9f9e2d5611ebc92fc6637473af883842a0e4a29c396fffde8e3ec2e17c49719bdd3414a596288c46fd0b9b8029890803496a1033ae84bc6fc2d0fa642be32320
+  data.tar.gz: 9196ef85ab3a8349bf4f81e9d628f8d582c158fb959fad516fc4d47530ebfad6404a1d77a54705421d992ebd5f3b8880a649c62566e710076d263362f21a21dd

data/lib/cloudstack_stats/cli.rb

@@ -10,7 +10,7 @@ module CloudstackStats
     package_name "cloudstack_stats"
 
     class_option :cloudstack_url,
-      default: "http://localhost:8080/client/",
+      default: "http://localhost:8080/client/api",
       aliases: '-A',
       desc: 'CloudStack API URL'
 

data/lib/cloudstack_stats/feed.rb

@@ -21,9 +21,10 @@ module CloudstackStats
       @user = opts[:influx_user]
       @password = opts[:influx_password]
       @debug = opts[:debug]
+      @total = {type: "total", stats: [{"name" => "_total_"}]}
     end
 
-    def write(stats)
+    def write(stats, total = true)
       uri = URI.parse(
         URI.join(
           @url,
@@ -43,25 +44,43 @@ module CloudstackStats
 
 
       type = stats[:type]
-      stats[:stats].map do |stat|
+      stats[:stats].each do |stat|
+        add_to_total(stat) if total
         request.body = line = stat_to_line(stat, type)
         puts line if @debug
         response = http.request(request)
         yield(stat, response) if block_given?
       end
+      if total
+        write(@total, total = false) {|stat, response| yield(stat, response)}
+      end
     end
 
     private
 
     # builds influxdb line protocol strings
     def stat_to_line(obj, type)
-      fields = CloudstackStats::CS_STATS.map {|name| "#{name}=#{obj[name] || 0}i" }
-      tags = CloudstackStats::CS_TAGS.map {|name| "#{name}=#{obj[name]}" }
-      "#{type}." +
-      obj["name"].downcase.tr(" ", "-").tr("--", "-").gsub(/[^0-9A-Za-z\-\_]/, '') +
-        ",type=#{type}" +
-        "," + tags.join(",") +
-        " " + fields.join(",")
+      fields = CloudstackStats::CS_STATS.map {|name| "#{name}=#{obj[name].to_i}i" }
+      unless type == "total"
+        tags = CloudstackStats::CS_TAGS.map {|name| "#{name}=#{obj[name]}" }
+      end
+      line = "#{type}.#{normalize_name(obj["name"])},type=#{type}"
+      line += "," + tags.join(",") if tags
+      line +=  " " + fields.join(",")
+    end
+
+    def add_to_total(obj)
+      CloudstackStats::CS_STATS.each do |stat|
+        if @total[:stats][0].key? stat
+          @total[:stats][0][stat] += obj[stat].to_i
+        else
+          @total[:stats][0][stat] = obj[stat].to_i
+        end
+      end
+    end
+
+    def normalize_name(name)
+      name.downcase.tr(" ", "-").tr("--", "-").gsub(/[^0-9A-Za-z\-\_]/, '')
     end
 
   end # class

data/lib/cloudstack_stats/version.rb

@@ -1,3 +1,3 @@
 module CloudstackStats
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_stats
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - niwo