oneacct-export 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a9aff4b9c721de7af9275953ae9b5954c38cca
-  data.tar.gz: 071f245ec9f4475a9c8d1be9ba4c3dad15787b86
+  metadata.gz: 20c8592380b1a81b852587aa9eb4a9c11d598c11
+  data.tar.gz: 4bc47dffdaf71c19a772ab48ebfa68a007dc48ee
 SHA512:
-  metadata.gz: f2b407955c1258694a8c3dec4b8dc544869aa8fde701ce893c95de5f6df76b25fa0d55debb9313958d6d757ef47e66756a55bed5cdd7a5cf0aedaa1284e465b7
-  data.tar.gz: 80e68e3c321cfec4288709a639a28c22b1b60f939e919a716872f4b869142f255fd8fff7160596e9c771fd0340419fc05df57c118fd533fcf66f045174dbb89f
+  metadata.gz: 47e53b053ddb384a3ae52e28c4a75e29a17b79e5a3e5c48830e0e894961af1767492cb0aae5598ec9da1f03f80cd4b816fc22ab8e0aff5f7d9cc15b6632bf4fc
+  data.tar.gz: 65685875ef2b0d41cbaaa0eb89d2309701a93eabef7d1a3beb6bf56fcda15c958e9eac1547c19b3dbbd5907b95af8dae51a306ac5b826e0c613c71a664d02ef1

data/examples/etc/init.d/oneacct-export-sidekiq

@@ -30,6 +30,16 @@ stderr_log="$log_dir/sidekiq.init.stderr.log"
 
 retval=0
 
+if [ "x$SSL_CERT_DIR" = "x" ]; then
+    SSL_CERT_DIR="/etc/grid-security/certificates"
+fi
+
+if [ "x$DEBUG" = "x1" ]; then
+    ONEACCT_EXPORT_LOG_LEVEL="DEBUG"
+else
+    ONEACCT_EXPORT_LOG_LEVEL="ERROR"
+fi
+
 get_pid() {
     cat "$pid_file"
 }
@@ -45,7 +55,7 @@ start() {
         echo "Starting $name ..."
 
         cd "$run_dir"
-        sudo -u "$user" RAILS_ENV=production $cmd >> "$stdout_log" 2>> "$stderr_log" &
+        sudo -u "$user" RAILS_ENV=production SSL_CERT_DIR=$SSL_CERT_DIR ONEACCT_EXPORT_LOG_LEVEL=$ONEACCT_EXPORT_LOG_LEVEL $cmd >> "$stdout_log" 2>> "$stderr_log" &
 
         echo $! > "$pid_file"
         if ! is_running; then

data/examples/usr/bin/oneacct-export-cron

@@ -31,15 +31,42 @@ omnibus_base_dir="/opt/oneacct-export"
 week_start_epoch=$((`date +%s`-604800))
 week_start_date=`date -d @$week_start_epoch +%F`
 
-options="--records-from $week_start_date --blocking --timeout 2700"
+if [ "x$1" = "x--all" ] || [ "x$1" = "x-all" ]; then
+    # export all available accounting records
+    options="--blocking --timeout 3600"
+else
+    # export only records from the last 7 days
+    options="--records-from $week_start_date --blocking --timeout 1800"
+fi
 
 if [ -f "$conf_dir/compat.one" ]; then
     options="$options --compatibility-mode"
 fi
 
-if [ -f "$conf_dir/groups.allow" ]; then
-    options="$options --include-groups --group-file $conf_dir/groups.allow"
+if [ -f "$conf_dir/groups.include" ]; then
+    groups_include="YES"
+    options="$options --include-groups --group-file $conf_dir/groups.include"
+fi
+
+if [ -f "$conf_dir/groups.exclude" ]; then
+    if [ "x$groups_include" = "xYES" ]; then
+        echo "'groups.include' and 'groups.exclude' cannot be combined. Pick only one!"
+        exit 1
+    fi
+
+    options="$options --exclude-groups --group-file $conf_dir/groups.exclude"
+fi
+
+if [ "x$DEBUG" = "x1" ]; then
+    export ONEACCT_EXPORT_LOG_LEVEL="DEBUG"
+    echo "$omnibus_base_dir/bin/oneacct-export $options"
+    echo "(see log files in /var/log/oneacct-export for details)"
 fi
 
 export RAILS_ENV="production"
+
+if [ "x$SSL_CERT_DIR" = "x" ]; then
+    export SSL_CERT_DIR="/etc/grid-security/certificates"
+fi
+
 $omnibus_base_dir/bin/oneacct-export $options

data/lib/one_worker.rb

@@ -135,7 +135,8 @@ class OneWorker
     data['memory'] = parse(vm['TEMPLATE/MEMORY'], NUMBER, '0')
 
     data['image_name'] = parse(image_map[vm['TEMPLATE/DISK[1]/IMAGE_ID']], STRING, nil)
-    data['image_name'] = parse(mixin(vm), STRING) unless data['image_name']
+    data['image_name'] = parse(mixin(vm), STRING, nil) unless data['image_name']
+    data['image_name'] = parse(vm['TEMPLATE/DISK[1]/IMAGE_ID'], STRING) unless data['image_name']
 
     data
   end

data/lib/oneacct_exporter/log.rb

@@ -6,7 +6,7 @@ class OneacctExporter
       if ENV['ONEACCT_EXPORT_LOG_LEVEL'] && Logger::Severity.const_defined?(ENV['ONEACCT_EXPORT_LOG_LEVEL'])
         logger.level = Logger::Severity.const_get ENV['ONEACCT_EXPORT_LOG_LEVEL']
       else
-        logger.level = Logger::INFO
+        logger.level = Logger::ERROR
       end
 
       logger

data/lib/oneacct_exporter/version.rb

@@ -1,3 +1,3 @@
 class OneacctExporter
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/oneacct_opts.rb

@@ -27,14 +27,14 @@ class OneacctOpts
         options.records_to = time
       end
 
-      opts.on('--include-groups GROUP1[,GROUP2,...]', Array,
+      opts.on('--include-groups [GROUP1,GROUP2,...]', Array,
               'Retrieves only records of virtual machines which '\
               'belong to the specified groups') do |groups|
         groups = [] unless groups
         options.include_groups = groups
       end
 
-      opts.on('--exclude-groups GROUP1[,GROUP2,...]', Array,
+      opts.on('--exclude-groups [GROUP1,GROUP2,...]', Array,
               'Retrieves only records of virtual machines which '\
               "don't belong to the specified groups") do |groups|
         groups = [] unless groups

data/spec/one_worker_spec.rb

@@ -536,6 +536,19 @@ describe OneWorker do
       end
     end
 
+    context 'vm without IMAGE_ID mapping' do
+      before :example do
+        data['image_name'] = '31'
+      end
+
+      let(:image_map) { { 'non_existing_id' => 'name' } }
+      let(:filename) { 'one_worker_valid_machine.xml' }
+
+      it 'replaces image name with IMAGE_ID' do
+        expect(subject.process_vm(vm, user_map, image_map)).to eq(data)
+      end
+    end
+
     context 'vm with USER_TEMPLATE/OCCI_COMPUTE_MIXINS' do
       let(:filename) { 'one_worker_vm4.xml' }
       let(:image_name) { 'http://occi.localhost/occi/infrastructure/os_tpl#uuid_monitoring_20' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler