smart_proxy_salt 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25650758e39a88cb8683f8ebe295d343c0752d0fff229fbe21f86ee585848c6
-  data.tar.gz: 9f26eb7258a77a426c1addf5e8ba949c432332f1b4b35897e193762cf1a60d3f
+  metadata.gz: 4ba18b31812c408bbbef40601e2f7279ee6f04d55a62b999b7b993f0158aede8
+  data.tar.gz: 82822b47407c7c5e66151627a7935d294566c6e5dc17c4bbf7c2674890653826
 SHA512:
-  metadata.gz: bd79c67ac4733c9b1f19a7e5f6a62a6019e39209d37abd21d7a67f48aea4e24da875bbdaecd3c8db574e566cb451038904fd9e21d045db61896df0a96ccab51e
-  data.tar.gz: 9c8640cc30f494fe2406b0a840643aacc2211c738fc25864c8c7e1024e4d2a6b6ad72e459eac947a2af9ac2b86ee14a87ba0cc84e27018742906d8a8ad50e18b
+  metadata.gz: d95ddd85199c088db57c6248d99d7a370e36c74191aeda0d74fd4f7fb7d573ee50a0b4a107092d2f8f6c3018c131e6127236cc5818f84c835eecabd0b21ef6bf
+  data.tar.gz: d9866d18feed738e03d0e47784ee75b41921b65bcbbd33e88aec5856cfd5160e4b0b5e5485d5c25c3a6c601d6c519bde984599b734f7f081b7adce9de53c3277

data/lib/smart_proxy_salt/version.rb

@@ -3,6 +3,6 @@
 module Proxy
   # Salt module
   module Salt
-    VERSION = '5.0.0'.freeze
+    VERSION = '5.0.1'.freeze
   end
 end

data/salt/report_upload/README.md

@@ -1,10 +1,10 @@
 # Foreman Salt Report Upload
 
 Currently, there are two possibilites to upload the salt report to Foreman:
-1. Use /usr/sbin/upload-salt-reports which is called by a cron job every 10 minutes by default
-2. Upload the report immediately by using a Salt Reactor.
+1. Upload the report immediately by using a Salt Reactor (recommended).
+2. Use /usr/sbin/upload-salt-reports manually (or set up a cronjob, see `/cron/smart_proxy_salt`).
 
-This README, handles the second option and how to configure it
+This README handles the first option and how to configure it
 
 ## Setup
 Add the content of 'master.snippet' to '/etc/salt/master' which configures a reactor. 

data/salt/report_upload/srv/salt/_runners/foreman_report_upload.py

@@ -4,13 +4,16 @@ Uploads reports from the Salt job cache to Foreman
 '''
 from __future__ import absolute_import, print_function, unicode_literals
 
+LAST_UPLOADED = '/etc/salt/last_uploaded'
 FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
+LOCK_FILE = '/var/lock/salt-report-upload.lock'
 
 try:
     from http.client import HTTPConnection, HTTPSConnection
 except ImportError:
     from httplib import HTTPSConnection, HTTPSConnection
 
+import io
 import ssl
 import json
 import yaml
@@ -24,12 +27,21 @@ import logging
 log = logging.getLogger(__name__)
 
 
+if sys.version_info.major == 3:
+    unicode = str
+
+
 def salt_config():
     with open(FOREMAN_CONFIG, 'r') as f:
         config = yaml.load(f.read())
     return config
 
 
+def write_last_uploaded(last_uploaded):
+    with io.open(LAST_UPLOADED, 'w+') as f:
+        f.write(unicode(last_uploaded))
+
+
 def upload(report):
     config = salt_config()
     headers = {'Accept': 'application/json',
@@ -55,6 +67,7 @@ def upload(report):
     response = connection.getresponse()
 
     if response.status == 200:
+        write_last_uploaded(report['job']['job_id'])
         info_msg = 'Success {0}: {1}'.format(report['job']['job_id'], response.read())
         log.info(info_msg)
     else:
@@ -81,7 +94,7 @@ def create_report(json_str):
                 return {'job':
                      {
                        'result': {
-                         msg['id']: entry['changes']['ret'],
+                         msg['id']: next(iter(entry['changes'].values())),
                        },
                        'function': 'state.highstate',
                        'job_id': msg['jid']
@@ -90,6 +103,18 @@ def create_report(json_str):
     raise Exception('No state.highstate found')
 
 
+def get_lock():
+    if os.path.isfile(LOCK_FILE):
+        raise Exception("Unable to obtain lock.")
+    else:
+        io.open(LOCK_FILE, 'w+').close()
+
+
+def release_lock():
+    if os.path.isfile(LOCK_FILE):
+        os.remove(LOCK_FILE)
+
+
 def now(highstate):
     '''
     Upload a highstate to Foreman
@@ -100,7 +125,10 @@ def now(highstate):
 
     try:
         report = create_report(base64.b64decode(highstate))
+        get_lock()
         upload(report)
     except Exception as exc:
         log.error('Exception encountered: %s', exc)
+    finally:
+        release_lock()
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -124,7 +124,6 @@ files:
 - bin/foreman-node
 - bin/salt_python_wrapper
 - bundler.d/salt.rb
-- cron/smart_proxy_salt
 - etc/foreman.conf.example
 - etc/foreman.yaml.example
 - lib/smart_proxy_salt.rb

data/cron/smart_proxy_salt

@@ -1,5 +0,0 @@
-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