smart_proxy_salt 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acacbc60a4623c98351222437e7dc95180ffe154
-  data.tar.gz: 1eadaeb629d7defaeb6112606bfdd25566f47866
+  metadata.gz: 716d33f19133ef06e16cf558c8a43f44d3bbd4db
+  data.tar.gz: 27104bd5181a5dd086c0ac5f76932e5a6ca59a99
 SHA512:
-  metadata.gz: fb6e7a820f206431e75d88010840e8d6f9a2ff4068680bcab3dd9ec148931f8b355da8fc66f0f55e5e8996bf20f80e55763890343fc2126c191160f4b253773f
-  data.tar.gz: 6dd63d90454b6becf490e615ca7dcd9bd58fc30a430af9651d9f02569e8103f43242f6636521fef4a61ca8f55faababeb80d03747398444c39099ed712baeffb
+  metadata.gz: 4137417072ef95e3cf394ab307c04c221e02a973b169ceeecdcaeef8980a3e610bf19825b361275ad8426023554333cc05075da5de91df36782f0a9e5c4e6d39
+  data.tar.gz: 47a173fe70cb02e92a169a1b3fe7cff2160a3987586db6d9e4fe9a5a8fc20d525733de325a7f29aa9fba7d95b1308315ba0cf388b6a1769cb9192108da18dfe7

data/cron/smart_proxy_salt

@@ -0,0 +1,5 @@
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+# Check every 10 minutes for new Salt reports to upload to Foreman
+*/10 * * * * root /usr/sbin/upload-salt-reports >>/var/log/foreman-proxy/salt-cron.log 2>&1

data/lib/smart_proxy_salt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Salt
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/sbin/upload-salt-reports

@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+# Uploads reports from the Salt job cache to Foreman
+
+LAST_UPLOADED = '/etc/salt/last_uploaded'
+FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
+LOCK_FILE = '/var/lock/salt-report-upload.lock'
+
+import urllib
+import httplib
+import json
+import yaml
+import os
+import sys
+
+import salt.config
+import salt.runner
+
+
+def salt_config():
+    with open(FOREMAN_CONFIG, 'r') as f:
+        config = yaml.load(f.read())
+    return config
+
+
+def get_job(job_id):
+    return {'job':
+             {
+               'result': run('jobs.lookup_jid', argument=[job_id]),
+               'function': 'state.highstate',
+               'job_id': job_id
+             }
+           }
+
+
+def read_last_uploaded():
+    if not os.path.isfile(LAST_UPLOADED):
+        return 0
+    else:
+        with open(LAST_UPLOADED, 'r') as f:
+            result = f.read().strip()
+        if len(result) == 20:
+            try:
+                return int(result)
+            except ValueError:
+                return 0
+        else:
+            return 0
+
+
+def write_last_uploaded(last_uploaded):
+    with open(LAST_UPLOADED, 'w+') as f:
+        f.write(last_uploaded)
+
+
+def run(function, argument={}):
+    __opts__ = salt.config.master_config(
+            os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
+
+    runner = salt.runner.Runner(__opts__)
+    stdout_bak = sys.stdout
+    with open(os.devnull, 'wb') as f:
+        sys.stdout = f
+        ret = runner.cmd(function, argument)
+    sys.stdout = stdout_bak
+    return ret
+
+
+def jobs_to_upload():
+    jobs = run('jobs.list_jobs')
+    last_uploaded = read_last_uploaded()
+
+    job_ids = [id for (id, value) in jobs.iteritems()
+            if value['Function'] == 'state.highstate' and
+            int(id) > last_uploaded]
+
+    jobs = dict([(job, get_job(job)) for job in job_ids])
+    ids = sorted(jobs.keys())
+
+    return (ids, jobs)
+
+
+def upload(jobs):
+    config = salt_config()
+    headers = {'Accept': 'application/json',
+               'Content-Type': 'application/json'}
+
+    if config[':proto'] == 'https':
+        connection = httplib.HTTPSConnection(config[':host'],
+                port=config[':port'], key_file=config[':ssl_key'],
+                cert_file=config[':ssl_cert'])
+    else:
+        connection = httplib.HTTPConnection(config[':host'],
+                port=config[':port'])
+
+    for id in jobs[0]:
+        job = jobs[1][id]
+
+        if job['job']['result'] == {}:
+            continue
+
+        connection.request('POST', '/salt/api/v2/jobs/upload',
+                json.dumps(job), headers)
+        response = connection.getresponse()
+
+        if response.status == 200:
+            write_last_uploaded(id)
+            print "Success %s: %s" % (id, response.read())
+        else:
+            print "Unable to upload job - aborting report upload"
+            print response.read()
+
+
+def get_lock():
+    if os.path.isfile(LOCK_FILE):
+        raise Exception("Unable to obtain lock.")
+    else:
+        open(LOCK_FILE, 'w+').close()
+
+
+def release_lock():
+    if os.path.isfile(LOCK_FILE):
+        os.remove(LOCK_FILE)
+
+if __name__ == '__main__':
+    try:
+        get_lock()
+        upload(jobs_to_upload())
+        release_lock()
+    except:
+        release_lock()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies: []
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
@@ -20,18 +20,20 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- LICENSE
-- README.md
 - bin/foreman-node
-- bundler.d/salt.rb
+- cron/smart_proxy_salt
 - etc/foreman.yaml.example
-- lib/smart_proxy_salt.rb
+- lib/smart_proxy_salt/salt_main.rb
+- lib/smart_proxy_salt/salt_http_config.ru
 - lib/smart_proxy_salt/salt.rb
 - lib/smart_proxy_salt/salt_api.rb
-- lib/smart_proxy_salt/salt_http_config.ru
-- lib/smart_proxy_salt/salt_main.rb
 - lib/smart_proxy_salt/version.rb
+- lib/smart_proxy_salt.rb
+- sbin/upload-salt-reports
 - settings.d/salt.yml.example
+- bundler.d/salt.rb
+- README.md
+- LICENSE
 homepage: https://github.com/theforeman/smart_proxy_salt
 licenses:
 - GPLv3
@@ -42,17 +44,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy