oneacct-export 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524b14a0f4c51ba085b4f104054dcce81070c6f5
-  data.tar.gz: cd2c0e62fb62505fd47dd6eecfc2cae241421353
+  metadata.gz: 4f3c538f8440a61bb9d37b9e046b8c0d0350de5e
+  data.tar.gz: 6032e05b202d5fd0623911d4bd49389e4dc489e2
 SHA512:
-  metadata.gz: 1339fba2bb944512220a90c31ad71d132c11bd286b2252de0117e50d1989ecf0f669e37bc7f0f23a3a02be2e4bb5ac421e45fa2fcb5d06aef0058ebb77b8cc34
-  data.tar.gz: 51102cc765d368c534240c974493f0323edb44f3450e9c8063bcdd43bcea80ac9ea232583debd1a1f0213008d93dec01698dc88ba254f91883cabcf23a4ab7a6
+  metadata.gz: b451ef989eaadb314cf04d9e2ad49f984d12eb3c852b6981ff9561ba2fa367e98507b5a480f642dcb60b6d1551b48d47eadcda26305fe3ee8526a652974980f6
+  data.tar.gz: 158799a83a2114d5cfb27468119cbf73540d947ac715c3cd1b650507410f03a8631297e3496032eb600edc5126361475d34d8193d5386d707a3116c469d57eef

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 TODO: Write your name
+Copyright (c) 2014 CESNET
 
 MIT License
 

data/bin/oneacct-export

@@ -44,7 +44,7 @@ if options.groups_file
   if File.exist?(options.groups_file) && File.readable?(options.groups_file)
     file = File.open(options.groups_file, 'r')
     file.each_line do |line|
-      groups[groups.keys.first] << line
+      groups[groups.keys.first] << line.strip
     end
     file.close
   else

data/examples/etc/cron.d/oneacct-export

@@ -0,0 +1,11 @@
+# Cron job running by default every two hours, at 45 minutes +/- 3
+# minutes. The lock file can be enabled or disabled via:
+#
+#  service oneacct-export-cron start
+#  chkconfig oneacct-export-cron on
+#
+# Note that the lock file not existing is a success (and
+# over-all success is needed in order to prevent error
+# messages from cron).
+
+42 */2 * * *	apel	[ ! -f /var/lock/oneacct-export-cron ] || /usr/bin/oneacct-export-cron

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

@@ -0,0 +1,63 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          oneacct-export-cron
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Enable hourly run of oneacct-export
+# Description:       This shell script enables the automatic use of oneacct-export
+### END INIT INFO
+
+lockfile="/var/lock/oneacct-export-cron"
+retval=0
+name=`basename $0`
+
+start() {
+    touch $lockfile
+    echo "Enabling periodic $name"
+    retval=0
+}
+
+stop() {
+    rm -f $lockfile
+    echo "Disabling periodic $name"
+    retval=0
+}
+
+restart() {
+    stop
+    start
+}
+
+case "$1" in
+    start)
+    start
+    ;;
+    stop)
+    stop
+    ;;
+    restart|force-reload)
+    restart
+    ;;
+    reload)
+    ;;
+    condrestart)
+    [ -f "$lockfile" ] && restart
+    ;;
+    status)
+    if [ -f "$lockfile" ] ; then
+        echo "Periodic $name is enabled"
+        retval=0
+    else
+        echo "Periodic $name is disabled"
+        retval=3
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+    retval=1
+esac
+
+exit $retval

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

@@ -0,0 +1,124 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          oneacct-export-sidekiq
+# Required-Start:    $local_fs $remote_fs $network $syslog $named
+# Required-Stop:     $local_fs $remote_fs $network $syslog $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop oneacct-export sidekiq server
+# Description:       Start the sidekiq server required by oneacct-export.
+### END INIT INFO
+
+run_dir="/var/run/oneacct-export"
+log_dir="/var/log/oneacct-export"
+conf_dir="/etc/oneacct-export"
+
+omnibus_base_dir="/opt/oneacct-export"
+embedded_base_dir="$omnibus_base_dir/embedded"
+embedded_ruby_version=`$embedded_base_dir/bin/ruby -e "puts RUBY_VERSION.split('.').fill('0',2..2).join('.')"`
+embedded_oneacct_version=`$omnibus_base_dir/bin/oneacct-export --version`
+embedded_oneacct_dir="$embedded_base_dir/lib/ruby/gems/$embedded_ruby_version/gems/oneacct-export-$embedded_oneacct_version"
+
+user="apel"
+cmd="$omnibus_base_dir/bin/sidekiq -r $embedded_oneacct_dir/lib/one_worker.rb -C $conf_dir/sidekiq.yml"
+
+name=`basename $0`
+pid_file="$run_dir/sidekiq.init.pid"
+stdout_log="$log_dir/sidekiq.init.stdout.log"
+stderr_log="$log_dir/sidekiq.init.stderr.log"
+
+retval=0
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+start() {
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name ..."
+
+        cd "$run_dir"
+        sudo -u "$user" RAILS_ENV=production $cmd >> "$stdout_log" 2>> "$stderr_log" &
+
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start, see $stdout_log and $stderr_log"
+            retval=1
+        else
+            echo "Started"
+        fi
+    fi
+}
+
+stop() {
+    if is_running; then
+        echo "Stopping $name ..."
+
+        kill `get_pid`
+        for i in $(seq 1 15); do
+            if ! is_running; then
+                break
+            fi
+            echo -n "."
+            sleep 1
+        done
+
+        echo
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            retval=1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+        retval=1
+    fi
+}
+
+restart(){
+    stop
+
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        retval=1
+    else
+        start
+    fi
+}
+
+case "$1" in
+    start)
+    start
+    ;;
+    stop)
+    stop
+    ;;
+    restart)
+    restart
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        retval=3
+    fi
+    ;;
+    *)
+    echo "Usage: $name {start|stop|restart|status}"
+    retval=1
+    ;;
+esac
+
+exit $retval

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

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+##############################################################################
+# Copyright (c) 2014 CESNET
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##############################################################################
+
+conf_dir="/etc/oneacct-export"
+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 [ -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"
+fi
+
+export RAILS_ENV="production"
+$omnibus_base_dir/bin/oneacct-export $options

data/lib/oneacct_exporter/version.rb

@@ -1,3 +1,3 @@
 class OneacctExporter
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/oneacct_opts.rb

@@ -30,12 +30,14 @@ class OneacctOpts
       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,
               'Retrieves only records of virtual machines which '\
               "don't belong to the specified groups") do |groups|
+        groups = [] unless groups
         options.exclude_groups = groups
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,6 +154,10 @@ files:
 - bin/oneacct-export
 - config/conf.yml
 - config/sidekiq.yml
+- examples/etc/cron.d/oneacct-export
+- examples/etc/init.d/oneacct-export-cron
+- examples/etc/init.d/oneacct-export-sidekiq
+- examples/usr/bin/oneacct-export-cron
 - lib/errors.rb
 - lib/errors/authentication_error.rb
 - lib/errors/resource_not_found_error.rb