cloudstack_stats 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79b0167d9ff79e2411a694d656ccd81de2a37477
-  data.tar.gz: ea10cbbd9fa853cf09cb1e71aa536033b6a38ba0
+  metadata.gz: 7380aa220221f5e9a48daf2cea757561481f372c
+  data.tar.gz: 67786231341e6bff18d840abe738f664f8c132de
 SHA512:
-  metadata.gz: d349cff75e1884868ef1774109086639434744927fa40421f4ac3ff7c8e54f9b79ffea51d364aac13ef11efee3e42b9c19ad4039a7da38143043fc4e9a7a9fcb
-  data.tar.gz: d8211dc532a5adaa6fe1a9e9666c07b589fefbf7ac9326b6e522e5049aa0dd3f81104a9834e0d165f2d96d18763844208a30db6bfdff4b095583e6ee3f402762
+  metadata.gz: b4afdda6535f18a6ca74ddc0dd3360ca21bba27a7337f009db019fef8f459cebb44bcd2a54216c43e6474fd8e974b3c9a550cfbb0a64fef3595593aff7ae0bc4
+  data.tar.gz: 50211c52ca720920542433c8922f6309b44c2002dbda3b98fa99c8e790ed1c733cb3ddf134aea688d6726f5b98bfb743a744d4122802d7a4e6ac3082199b53ae

data/lib/cloudstack_stats/cli.rb

@@ -9,7 +9,20 @@ module CloudstackStats
 
     package_name "cloudstack_stats"
 
-    class_option :config_file,
+    class_option :cloudstack_url,
+      default: "http://localhost:8080/client",
+      aliases: '-A',
+      desc: 'CloudStack API URL'
+
+    class_option :cloudstack_api_key,
+      aliases: '-k',
+      desc: 'CloudStack API Key'
+
+    class_option :cloudstack_api_secret,
+      aliases: '-s',
+      desc: 'CloudStack API Secret'
+
+    class_option :cloudstack_config,
       default: File.join(Dir.home, '.cloudstack-cli.yml'),
       aliases: '-C',
       desc: 'Location of your cloudstack-cli configuration file'
@@ -84,9 +97,9 @@ module CloudstackStats
       stats = Collect.new(options).account_stats
       say "Write stats to influxdb...", :yellow
       Feed.new(options).write(stats) {|stat, res| print_status(stat, res)}
-    rescue => e
-      say "ERROR: ", :red
-      puts e.message
+    # rescue => e
+    #   say "ERROR: ", :red
+    #   puts e.message
     end
 
     no_commands do

data/lib/cloudstack_stats/collect.rb

@@ -7,7 +7,18 @@ module CloudstackStats
 
     def initialize(settings)
       @settings = settings.dup
-      @config ||= CloudstackClient::Configuration.load(@settings)
+      @config = if @settings[:cloudstack_url] &&
+        @settings[:cloudstack_api_key] &&
+        @settings[:cloudstack_secret_key]
+        {
+          url: @settings[:cloudstack_url],
+          api_key: @settings[:cloudstack_api_key],
+          secret_key: @settings[:cloudstack_secret_key]
+        }
+      else
+        @settings[:config_file] = @settings[:cloudstack_config]
+        CloudstackClient::Configuration.load(@settings)
+      end
       @cs ||= CloudstackClient::Client.new(
         @config[:url],
         @config[:api_key],

data/lib/cloudstack_stats/version.rb

@@ -1,3 +1,3 @@
 module CloudstackStats
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_stats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler