cloudcost 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b58764fd578b202e42b613003289f95b778b9c409f6bcb4c9ce6d565c90016d
-  data.tar.gz: f8137acc0b1c0529550b5a1c135fcb808ca3e1596ea6d22b018aa117c6f44311
+  metadata.gz: e1f7c30aba80a09bbcd150df43e48d0d7dfa47bd14460634e6997d451957d5f9
+  data.tar.gz: f0f628f8ffbc0f7cdcc08e9882758b11392b159e5293671ca0f24cd3a507ec68
 SHA512:
-  metadata.gz: 28a277fafc87edfc66ea733900e62bb801879cc8434974901b8e1c34532bc4e5fddbc3b3b3ba04a14c478e6045de999aaf3bbfa72297b8f69a718da5461f9751
-  data.tar.gz: 74f8f13db587ccc0bfd0ca94ac5444a6238cde48744c23957432235bb7ed2e7d06d91a6ab0ba38f7911bb2de8abe0993ccd59539c51deef20edd2ef72c5c9327
+  metadata.gz: 4bf7307e6baca20b673899a5729106114e6933e7a719022350ba9c2a14724b98b1b625503d1015d052279dfe5e2b029567dbfd7089207565ababe3cdd359ef67
+  data.tar.gz: d3abdac8948c4e93a9df63458018b390f1c1ea6d92a2365e1b99d93de973c862989f6dfca797fe3008e1796790a137c98b644bf9809fe1ed5c6f3b2535af8ae6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcost (0.3.1)
+    cloudcost (0.4.0)
       excon (~> 0.85.0)
       parseconfig (~> 1.1.0)
       terminal-table (~> 3.0.1)

data/README.md

@@ -192,3 +192,11 @@ Filter volumes by names:
 ```sh
 cloudcost volumes --name "pvc"
 ```
+
+Output as InfluxDB Line Protocol:
+
+```sh
+cloudcost volumes --output influx --profile prod --no-attached
+```
+
+NOTE: The Line Protocol output includes a tag `state` which is either "attached", "unattached" or "all".

data/Rakefile

@@ -6,3 +6,17 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[rubocop]
+
+DOCKER_REGISTRY = "registry.puzzle.ch/puzzle/cloudcost"
+
+desc "Build the docker image and tag it with the current version."
+task :docker_build do
+  puts command = "docker build -t #{DOCKER_REGISTRY}:#{Cloudcost::VERSION} ."
+  puts `#{command}`
+end
+
+desc "Push the newest docker image."
+task :docker_push do
+  puts command = "docker push #{DOCKER_REGISTRY}:#{Cloudcost::VERSION}"
+  puts `#{command}`
+end

data/lib/cloudcost/api_connection.rb

@@ -44,7 +44,11 @@ module Cloudcost
       volumes = volumes.reject { |volume| volume[:tags].key?(options[:missing_tag].to_sym) } if options[:missing_tag]
       volumes = volumes.select { |volume| /#{options[:name]}/.match? volume[:name] } if options[:name]
       volumes = volumes.select { |volume| /#{options[:type]}/.match? volume[:type] } if options[:type]
-      volumes = volumes.select { |volume| (volume[:servers].size > 0) == options[:attached] } if options[:attached] != nil
+      unless options[:attached].nil?
+        volumes = volumes.select do |volume|
+          (volume[:servers].size.positive?) == options[:attached]
+        end
+      end
       volumes
     end
 

data/lib/cloudcost/cli.rb

@@ -96,7 +96,7 @@ module Cloudcost
     option :summary, desc: "display totals only", type: :boolean, aliases: %w[-S]
     option :type, enum: %w[ssd bulk], desc: "volume type"
     option :attached, type: :boolean, desc: "volume attached to servers"
-    option :output, default: "table", enum: %w[table csv], desc: "output format", aliases: %w[-o]
+    option :output, default: "table", enum: %w[table csv influx], desc: "output format", aliases: %w[-o]
     def volumes
       volumes = load_volumes(options)
       if options[:output] == "table"
@@ -154,7 +154,7 @@ module Cloudcost
       end
 
       def output_servers(servers, options)
-        if servers.size < 1
+        if servers.empty?
           yield "WARNING: No servers found."
         elsif options[:group_by]
           yield Cloudcost::ServerList.new(servers, options).grouped_costs
@@ -170,10 +170,12 @@ module Cloudcost
       end
 
       def output_volumes(volumes, options)
-        if volumes.size < 1
+        if volumes.empty?
           yield "WARNING: No volumes found."
         elsif options[:output] == "csv"
           yield Cloudcost::VolumeList.new(volumes, options).to_csv
+        elsif options[:output] == "influx"
+          yield Cloudcost::VolumeList.new(volumes, options).totals_influx_line_protocol
         else
           yield Cloudcost::VolumeList.new(volumes, options).cost_table
         end

data/lib/cloudcost/commands/server.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 
 require_relative "server/server_tabular_output"
 require_relative "server/server_influxdb_output"
 require_relative "csv_output"
 require_relative "server/server"
-require_relative "server/server_list"
+require_relative "server/server_list"

data/lib/cloudcost/commands/volume/volume.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Cloudcost
-
   # Representation of cloudscale.ch volume object
   class Volume
     attr_accessor :data
@@ -27,11 +26,11 @@ module Cloudcost
     end
 
     def server_name
-      servers.size > 0 ? servers.first[:name] : ""
+      servers.size.positive? ? servers.first[:name] : ""
     end
 
     def attached?
-      servers.size > 0 ? true : false
+      servers.size.positive?
     end
 
     def server_uuids
@@ -53,6 +52,5 @@ module Cloudcost
     def costs_per_day
       Pricing.storage_costs_per_day(type, size_gb)
     end
-
   end
 end

data/lib/cloudcost/commands/volume/volume_influxdb_output.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Cloudcost
+  # InfluxDB output methods for the ServerList class
+  module VolumeInfluxdbOutput
+    def totals_influx_line_protocol
+      lines = []
+      tag_set = [
+        "profile=#{@options[:profile] || "?"}",
+        "state=#{volumes_attached_state}"
+      ]
+      metrics = calculate_totals
+      [
+        { field: "ssd_gb", key: :size_ssd, unit: "i" },
+        { field: "bulk_gb", key: :size_bulk, unit: "i" },
+        { field: "chf_per_day", key: :size, unit: "" }
+      ].each do |field|
+        lines << %(
+          cloudscaleVolumeCosts,#{tag_set.join(",")}
+          #{field[:field]}=#{metrics[field[:key]]}#{field[:unit]}
+        ).gsub(/\s+/, " ").strip
+      end
+      lines.join("\n")
+    end
+
+    def volumes_attached_state
+      case @options[:attached]
+      when true
+        "attached"
+      when false
+        "unattached"
+      else
+        "all"
+      end
+    end
+  end
+end

data/lib/cloudcost/commands/volume/volume_list.rb

@@ -5,8 +5,8 @@ require "terminal-table"
 module Cloudcost
   # volumeList represents a list of volumes and integrates several output methods
   class VolumeList
-
     include Cloudcost::CsvOutput
+    include Cloudcost::VolumeInfluxdbOutput
 
     def initialize(volumes, options = {})
       @volumes = volumes
@@ -14,9 +14,10 @@ module Cloudcost
     end
 
     def calculate_totals(volumes = @volumes)
-      total = { size: 0, cost: 0.0 }
+      total = { size: 0, size_ssd: 0, size_bulk: 0, cost: 0.0 }
       volumes.each do |volume|
         total[:size] += volume.size_gb
+        total["size_#{volume.type}".to_sym] += volume.size_gb if %w[ssd bulk].include? volume.type
         total[:cost] += volume.costs_per_day
       end
       total
@@ -25,8 +26,16 @@ module Cloudcost
     def totals(volumes = @volumes)
       total = calculate_totals(volumes)
       total_row = @options[:summary] ? %w[Total] : ["Total", "", "", "", ""]
+      if @options[:summary]
+        total_row.concat [
+          total[:size_ssd],
+          total[:size_bulk],
+          total[:size]
+        ]
+      else
+        total_row.concat [total[:size]]
+      end
       total_row.concat [
-        total[:size],
         format("%.2f", total[:cost].round(2)),
         format("%.2f", (total[:cost] * 30).round(2))
       ]
@@ -34,13 +43,11 @@ module Cloudcost
 
     def headings
       headings = if @options[:summary]
-                   [""]
-                 elsif @options[:group_by]
-                   %w[Group Volumes]
+                   ["", "SSD [GB]", "Bulk [GB]", "Total [GB]"]
                  else
-                   %w[Name UUID Type Servers Tags]
+                   ["Name", "UUID", "Type", "Servers", "Tags", "Size [GB]"]
                  end
-      headings.concat ["Size [GB]", "CHF/day", "CHF/30-days"]
+      headings.concat ["CHF/day", "CHF/30-days"]
     end
 
     def rows
@@ -74,6 +81,5 @@ module Cloudcost
       (first_number_row..table.columns.size).each { |column| table.align_column(column, :right) }
       table
     end
-
   end
 end

data/lib/cloudcost/commands/volume.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 
 require_relative "csv_output"
 require_relative "volume/volume"
-require_relative "volume/volume_list"
+require_relative "volume/volume_influxdb_output"
+require_relative "volume/volume_list"

data/lib/cloudcost/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudcost
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcost
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -110,6 +110,7 @@ files:
 - lib/cloudcost/commands/server/server_tabular_output.rb
 - lib/cloudcost/commands/volume.rb
 - lib/cloudcost/commands/volume/volume.rb
+- lib/cloudcost/commands/volume/volume_influxdb_output.rb
 - lib/cloudcost/commands/volume/volume_list.rb
 - lib/cloudcost/error.rb
 - lib/cloudcost/pricing.rb