foreman_salt 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3958e07e3ba51a52ed71666da0a710088a5f33f6
-  data.tar.gz: df6214da1df13e4ec5eea3026c5237528d88deea
+  metadata.gz: 763554c758fd70adb3a4feef13ceb720c6711caa
+  data.tar.gz: 0b86628a2277d95a26cc75bf6ef45070361c35d0
 SHA512:
-  metadata.gz: 7d6dc7e5d6b97d0fc09ebc34df7d6172ceab5e052d779ec907fca754fd6edea1ce82df6e5c56a135dc7db91147b4953aa643b4afec3ab05dd4b1dd59b29c04d0
-  data.tar.gz: b30c5d22dfd590fc398f26893ba1910452e9fc21b0fceca6974217c24fc58cb57142c0b586fd832ceedaeec9115f9553a5c4c88a8203662d2b8a9e39d6eb8250
+  metadata.gz: 8d874dcf278f82b3b5bce1da5373bc37ccd758a5ee3ab9cccca65bc7cd8e0518a74a4cb9580d47e9d3187b4b2191e9b5d4b69b102cb420b4815719344eae35de
+  data.tar.gz: 5fd385f82b6dd1a8f9fef3d8061e221e127123176afeda78ea07b1075092b62ac7cab162d8b143a60f4bb6f88c991657fcf3c5511602977b825fa1aa9127d37e

data/app/controllers/foreman_salt/api/v2/jobs_controller.rb

@@ -0,0 +1,65 @@
+require 'uri'
+
+module ForemanSalt
+  module Api
+    module V2
+      class JobsController < ::Api::V2::BaseController
+        include ::Api::Version2
+        include ::Foreman::Controller::SmartProxyAuth
+        include ForemanSalt::Concerns::SmartProxyAuthExtensions
+
+        add_puppetmaster_filters :upload
+
+        resource_description do
+          api_base_url "/salt/api"
+        end
+
+        def_param_group :job do
+          param :job, Hash, :required => true, :action_aware => true do
+            param :job_id, Integer, :required => true, :desc => N_("JID")
+            param :function, String, :required => true, :desc => N_("Function")
+            param :result, Hash, :required => true, :desc => N_("Result")
+          end
+        end
+
+        api :POST, '/upload/', N_('Upload a Job')
+        param_group :job, :as => :upload
+
+        def upload
+          Rails.logger.info("Processing job #{params[:job][:job_id]} from Salt.")
+          case params[:job][:function]
+          when 'state.highstate'
+            # Dynflowize the action if we can, otherwise we'll do it live
+            if defined? ForemanTasks
+              task = ForemanTasks.async_task(::Actions::ForemanSalt::ReportImport, params[:job], detected_proxy.try(:id))
+              render :json => {:task_id => task.id}
+            else
+              reports = ForemanSalt::ReportImporter.import(params[:job][:result], detected_proxy.try(:id))
+              render :json => {:message => "Imported #{reports.count} new reports."}
+            end
+          else
+            render :json => {:message => 'Unsupported function'}, :status => :unprocessable_entity
+          end
+        rescue ::Foreman::Exception => e
+          render :json => {:message => e.to_s}, :status => :unprocessable_entity
+        end
+
+        def resource_class
+          ::Report
+        end
+
+        private
+
+        def action_permission
+          case params[:action]
+            when 'upload'
+              :create
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
+

data/app/lib/actions/foreman_salt/report_import.rb

@@ -0,0 +1,29 @@
+module Actions
+  module ForemanSalt
+    if defined? ForemanTasks
+      class ReportImport < Actions::EntryAction
+
+        def resource_locks
+          :report_import
+        end
+
+        def plan(job, proxy_id)
+          plan_self(:job_id => job[:job_id], :report => job[:result], :proxy_id => proxy_id)
+        end
+
+        def run
+          ::User.as_anonymous_admin do
+            reports = ::ForemanSalt::ReportImporter.import(input[:report], input[:proxy_id])
+
+            output[:state] = {:message => "Imported #{reports.count} new reports"}
+            output[:hosts] = reports.map { |report| report.host.name }
+          end
+        end
+
+        def humanized_name
+          _("Process Highstate Report: #{input[:job_id]}")
+        end
+      end
+    end
+  end
+end

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -51,7 +51,7 @@ module ForemanSalt
 
       def set_hostgroup_defaults_with_salt_proxy
          return unless hostgroup
-         assign_hostgroup_attributes(%w{salt_proxy_id})
+         assign_hostgroup_attributes(%w{salt_proxy_id salt_environment_id})
          set_hostgroup_defaults_without_salt_proxy
       end
 

data/app/services/foreman_salt/report_importer.rb

@@ -0,0 +1,152 @@
+module ForemanSalt
+  class ReportImporter
+    delegate :logger, :to => :Rails
+    attr_reader :report
+
+    def self.import(raw, proxy_id = nil)
+      raise ::Foreman::Exception.new(_('Invalid report')) unless raw.is_a?(Hash)
+      raw.map do |host, report|
+        importer = ForemanSalt::ReportImporter.new(host, report, proxy_id)
+        importer.import
+        importer.report
+      end
+    end
+
+    def initialize(host, raw, proxy_id = nil)
+      @host = find_or_create_host(host)
+      @raw = raw
+      @proxy_id = proxy_id
+    end
+
+    def import
+      logger.info "processing report for #{@host}"
+      logger.debug { "Report: #{@raw.inspect}" }
+
+      if @host.new_record? && !Setting[:create_new_host_when_report_is_uploaded]
+        logger.info("skipping report for #{@host} as its an unknown host and create_new_host_when_report_is_uploaded setting is disabled")
+        return Report.new
+      end
+
+      @host.salt_proxy_id ||= @proxy_id
+      @host.last_report = start_time
+
+      if @raw.is_a? Array
+        process_failures # If Salt sends us only an array, it's a list of fatal failures
+      else
+        process_normal
+      end
+
+      @host.save(:validate => false)
+      logger.info("Imported report for #{@host} in #{(Time.now - start_time).round(2)} seconds")
+    end
+
+    private
+
+    def find_or_create_host(host)
+      @host ||= Host::Base.find_by_name(host)
+
+      unless @host
+        new = Host::Managed.new(:name => host)
+        new.save(:validate => false)
+        @host = new
+      end
+
+      @host
+    end
+
+    def import_log_messages
+      @raw.each do |resource, result|
+        level = if result['changes'].blank? && result['result']
+          :info
+        elsif result['result'] == false
+          :err
+        else
+          :notice
+        end
+
+        source = Source.find_or_create(resource)
+
+        message = if result['changes']['diff']
+          result['changes']['diff']
+        elsif !result['comment'].blank?
+          result['comment']
+        else
+          'No message available'
+        end
+
+        message = Message.find_or_create(message)
+        Log.create(:message_id => message.id, :source_id => source.id, :report => @report, :level => level)
+      end
+    end
+
+    def calculate_metrics
+      success = 0
+      failed = 0
+      changed = 0
+      restarted = 0
+      restarted_failed = 0
+
+      time = {}
+
+      @raw.each do |resource, result|
+        next unless result.is_a? Hash
+
+        if result['result'] == true
+          success += 1
+          if resource.match(/^service_/) && result['comment'].include?('restarted')
+            restarted += 1
+          elsif !result['changes'].blank?
+            changed += 1
+          end
+        elsif result['result'] == false
+          if resource.match(/^service_/) && result['comment'].include?('restarted')
+            restarted_failed += 1
+          else
+            failed += 1
+          end
+        end
+
+        time[resource] = result['duration'] if result['duration']
+      end
+
+      time[:total] = time.values.inject(&:+)
+      events = {:total => changed + failed + restarted + restarted_failed, :success => success + restarted, :failure => failed + restarted_failed}
+
+      changes = {:total => changed + restarted}
+
+      resources = {'total' => @raw.size, 'applied' => changed, 'restarted' => restarted, 'failed' => failed,
+        'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0}
+
+      {:events => events, :resources => resources, :changes => changes, :time => time}
+    end
+
+    def process_normal
+        metrics = calculate_metrics
+        status = ReportStatusCalculator.new(:counters => metrics[:resources].slice(*::Report::METRIC)).calculate
+
+        @host.puppet_status = status
+
+        @report = Report.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
+        return @report unless @report.save
+        import_log_messages
+    end
+
+
+    def process_failures
+      status = ReportStatusCalculator.new({:counters => {'failed' => @raw.size}}).calculate
+      @report = Report.create(:host => @host, :reported_at => Time.now, :status => status, :metrics => {})
+
+      @host.puppet_status = status
+
+      source = Source.find_or_create('Salt')
+      @raw.each do |failure|
+        message = Message.find_or_create(failure)
+        Log.create(:message_id => message.id, :source_id => source.id, :report => @report, :level => :err)
+      end
+    end
+
+    def start_time
+      @start_time ||= Time.now
+    end
+  end
+end

data/config/routes.rb

@@ -14,6 +14,10 @@ Rails.application.routes.draw do
         get 'auto_complete_search'
       end
     end
+
+    scope :api, :defaults => {:format => 'json'}, :constraints => ApiConstraints.new(:version => 2) do
+      match 'api/v2/jobs/upload' => 'foreman_salt/api/v2/jobs#upload', :via => :post
+    end
   end
 
   constraints(:smart_proxy_id => /[^\/]+/) do

data/lib/foreman_salt.rb

@@ -1,4 +1,10 @@
-require "foreman_salt/engine"
+require 'foreman_salt/engine'
+
+begin
+  require 'foreman-tasks'
+rescue LoadError
+  # Foreman Tasks isn't available
+end
 
 module ForemanSalt
 end

data/lib/foreman_salt/engine.rb

@@ -10,6 +10,12 @@ module ForemanSalt
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
+    if defined? ForemanTasks
+      initializer "foreman_salt.require_dynflow", :before => "foreman_tasks.initialize_dynflow" do |app|
+        ForemanTasks.dynflow.require!
+      end
+    end
+
     # Add any db migrations
     initializer "foreman_salt.load_app_instance_data" do |app|
       app.config.paths['db/migrate'] += ForemanSalt::Engine.paths['db/migrate'].existent
@@ -66,6 +72,10 @@ module ForemanSalt
           permission :view_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:index]}, :resource_type => "SmartProxy"
         end
 
+        security_block :api do |map|
+          permission :create_reports, {:'foreman_salt/api/v2/jobs' => [:upload]}, :resource_type => "Report"
+        end
+
         role "Salt admin", [:saltrun_hosts, :create_salt_modules, :view_salt_modules, :edit_salt_modules, :destroy_salt_modules,
                             :view_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys, :edit_smart_proxies_salt_keys,
                             :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign, :destroy_smart_proxies_salt_autosign,

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/unit/highstate.json

@@ -0,0 +1,196 @@
+{
+  "saltclient713.example.com": {
+    "pkg_|-postfix_|-postfix_|-installed": {
+      "comment": "Package postfix is already installed.",
+      "name": "postfix",
+      "start_time": "00:18:06.518702",
+      "result": true,
+      "duration": 1.575,
+      "__run_num__": 13,
+      "changes": {
+      },
+      "retcode": 2
+    },
+    "file_|-mysql_config_|-/etc/my.cnf_|-managed": {
+      "comment": "File /etc/my.cnf updated",
+      "name": "/etc/my.cnf",
+      "start_time": "00:18:00.901791",
+      "result": true,
+      "duration": 978.938,
+      "__run_num__": 6,
+      "changes": {
+        "diff": "---  \n+++  \n@@ -1,10 +1,39 @@\n-[mysqld]\n-datadir=/var/lib/mysql\n-socket=/var/lib/mysql/mysql.sock\n-user=mysql\n-# Disabling symbolic-links is recommended to prevent assorted security risks\n-symbolic-links=0\n+# DO NOT CHANGE THIS FILE!\n+# This config is generated by SALTSTACK\n+# and all change will be overrided on next salt call\n+\n+\n+[myisampack]\n+\n+[mysqlimport]\n+\n+[mysqlcheck]\n \n [mysqld_safe]\n-log-error=/var/log/mysqld.log\n-pid-file=/var/run/mysqld/mysqld.pid\n+log-error                               = /var/log/mysqld.log\n+pid-file                                = /var/run/mysqld/mysqld.pid\n+\n+[mysqladmin]\n+\n+[mysqlshow]\n+\n+[myisamchk]\n+\n+[client]\n+\n+[mysqlhotcopy]\n+\n+[mysqldump]\n+\n+[mysql]\n+\n+[mysqld]\n+bind-address                            = 127.0.0.1\n+datadir                                 = /var/lib/mysql\n+port                                    = 3306\n+socket                                  = /var/lib/mysql/mysql.sock\n+symbolic-links                          = 0\n+user                                    = mysql\n+\n+[isamchk]\n+\n"
+      },
+      "retcode": 2
+    },
+    "mysql_database_|-mysql remove test database_|-test_|-absent": {
+      "comment": "Database test has been removed",
+      "name": "test",
+      "start_time": "00:18:06.511324",
+      "result": true,
+      "duration": 7.266,
+      "__run_num__": 12,
+      "changes": {
+        "test": "Absent"
+      },
+      "retcode": 2
+    },
+    "service_|-postfix_|-postfix_|-running": {
+      "comment": "Service postfix is already enabled, and is in the desired state",
+      "name": "postfix",
+      "start_time": "00:18:06.520605",
+      "result": true,
+      "duration": 53.025,
+      "__run_num__": 14,
+      "changes": {
+      }
+    },
+    "mysql_user_|-mysql_delete_anonymous_user_saltclient713.example.com_|-_|-absent": {
+      "comment": "An exception occurred in this state: Traceback (most recent call last):\n  File \"/usr/lib/python2.6/site-packages/salt/state.py\", line 1533, in call\n    **cdata['kwargs'])\n  File \"/usr/lib/python2.6/site-packages/salt/states/mysql_user.py\", line 239, in absent\n    if __salt__['mysql.user_exists'](name, host, **connection_args):\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 1023, in user_exists\n    dbc = _connect(**connection_args)\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 287, in _connect\n    dbc = MySQLdb.connect(**connargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/__init__.py\", line 81, in Connect\n    return Connection(*args, **kwargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/connections.py\", line 187, in __init__\n    super(Connection, self).__init__(*args, **kwargs2)\nTypeError: connect() argument 3 must be string, not int\n",
+      "name": "",
+      "start_time": "00:18:06.510447",
+      "result": false,
+      "duration": 0.752,
+      "__run_num__": 11,
+      "changes": {
+      }
+    },
+    "mysql_user_|-mysql_delete_anonymous_user_localhost_|-_|-absent": {
+      "comment": "An exception occurred in this state: Traceback (most recent call last):\n  File \"/usr/lib/python2.6/site-packages/salt/state.py\", line 1533, in call\n    **cdata['kwargs'])\n  File \"/usr/lib/python2.6/site-packages/salt/states/mysql_user.py\", line 239, in absent\n    if __salt__['mysql.user_exists'](name, host, **connection_args):\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 1023, in user_exists\n    dbc = _connect(**connection_args)\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 287, in _connect\n    dbc = MySQLdb.connect(**connargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/__init__.py\", line 81, in Connect\n    return Connection(*args, **kwargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/connections.py\", line 187, in __init__\n    super(Connection, self).__init__(*args, **kwargs2)\nTypeError: connect() argument 3 must be string, not int\n",
+      "_stamp": "2014-11-16T01:18:06.783560",
+      "return": "Error: mysql_user.absent",
+      "name": "",
+      "success": false,
+      "start_time": "00:18:06.488962",
+      "jid": "20141116011706024672",
+      "duration": 19.798,
+      "result": false,
+      "fun": "state.highstate",
+      "__run_num__": 9,
+      "changes": {
+      },
+      "id": "saltclient713.example.com",
+      "retcode": 2
+    },
+    "service_|-mysqld_|-mysqld_|-running": {
+      "comment": "Service mysqld has been enabled, and is running",
+      "name": "mysqld",
+      "start_time": "00:18:01.881541",
+      "result": true,
+      "duration": 4566.262,
+      "__run_num__": 7,
+      "changes": {
+        "mysqld": true
+      }
+    },
+    "mysql_user_|-mysql_delete_anonymous_user_localhost.localdomain_|-_|-absent": {
+      "comment": "An exception occurred in this state: Traceback (most recent call last):\n  File \"/usr/lib/python2.6/site-packages/salt/state.py\", line 1533, in call\n    **cdata['kwargs'])\n  File \"/usr/lib/python2.6/site-packages/salt/states/mysql_user.py\", line 239, in absent\n    if __salt__['mysql.user_exists'](name, host, **connection_args):\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 1023, in user_exists\n    dbc = _connect(**connection_args)\n  File \"/usr/lib/python2.6/site-packages/salt/modules/mysql.py\", line 287, in _connect\n    dbc = MySQLdb.connect(**connargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/__init__.py\", line 81, in Connect\n    return Connection(*args, **kwargs)\n  File \"/usr/lib64/python2.6/site-packages/MySQLdb/connections.py\", line 187, in __init__\n    super(Connection, self).__init__(*args, **kwargs2)\nTypeError: connect() argument 3 must be string, not int\n",
+      "name": "",
+      "start_time": "00:18:06.509230",
+      "result": false,
+      "duration": 0.8,
+      "__run_num__": 10,
+      "changes": {
+      }
+    },
+    "pkg_|-mysqld_|-mysql-server_|-installed": {
+      "comment": "The following packages were installed/updated: mysql-server.",
+      "name": "mysql-server",
+      "start_time": "00:17:41.058929",
+      "result": true,
+      "duration": 19842.654,
+      "__run_num__": 5,
+      "changes": {
+        "perl-DBI": {
+          "new": "1.609-4.el6",
+          "old": ""
+        },
+        "perl-DBD-MySQL": {
+          "new": "4.013-3.el6",
+          "old": ""
+        },
+        "mysql-server": {
+          "new": "5.1.73-3.el6_5",
+          "old": ""
+        },
+        "mysql": {
+          "new": "5.1.73-3.el6_5",
+          "old": ""
+        }
+      }
+    },
+    "cmd_|-mysql_root_password_|-mysqladmin --user root password '434510094'_|-run": {
+      "comment": "Command \"mysqladmin --user root password '434510094'\" run",
+      "name": "mysqladmin --user root password '434510094'",
+      "start_time": "00:18:06.448367",
+      "result": true,
+      "duration": 39.196,
+      "__run_num__": 8,
+      "changes": {
+        "pid": 2709,
+        "retcode": 0,
+        "stderr": "",
+        "stdout": ""
+      }
+    },
+    "pkg_|-mysql_python_|-MySQL-python_|-installed": {
+      "comment": "The following packages were installed/updated: MySQL-python.",
+      "name": "MySQL-python",
+      "start_time": "00:17:14.059753",
+      "result": true,
+      "duration": 26997.765,
+      "__run_num__": 4,
+      "changes": {
+        "MySQL-python": {
+          "new": "1.2.3-0.3.c1.1.el6",
+          "old": ""
+        }
+      },
+      "retcode": 2
+    },
+    "file_|-enable_epel_|-/etc/yum.repos.d/epel.repo_|-sed": {
+      "comment": "sed ran without error",
+      "name": "/etc/yum.repos.d/epel.repo",
+      "start_time": "00:17:14.024416",
+      "result": true,
+      "duration": 35.098,
+      "__run_num__": 3,
+      "changes": {
+        "diff": "---  \n+++  \n@@ -12,7 +12,7 @@\n #baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug\n mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch\n failovermethod=priority\n-enabled=0\n+enabled=1\n gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6\n gpgcheck=1\n \n@@ -21,6 +21,6 @@\n #baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS\n mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch\n failovermethod=priority\n-enabled=0\n+enabled=1\n gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6\n gpgcheck=1\n"
+      }
+    },
+    "pkg_|-epel_release_|-epel_release_|-installed": {
+      "comment": "All specified packages are already installed.",
+      "name": "epel_release",
+      "start_time": "00:17:13.178528",
+      "result": true,
+      "duration": 845.684,
+      "__run_num__": 2,
+      "changes": {
+      }
+    },
+    "file_|-/etc/motd_|-/etc/motd_|-managed": {
+      "comment": "File /etc/motd updated",
+      "name": "/etc/motd",
+      "start_time": "00:17:11.971247",
+      "result": true,
+      "duration": 163.144,
+      "__run_num__": 0,
+      "changes": {
+        "diff": "---  \n+++  \n@@ -1,0 +1,7 @@\n+_|        _|    _|      _|        _|\n+_|_|_|        _|_|_|_|  _|_|_|        _|_|_|\n+_|    _|  _|    _|      _|    _|  _|  _|    _|\n+_|    _|  _|    _|      _|    _|  _|  _|    _|\n+_|_|_|    _|      _|_|  _|_|_|    _|  _|    _|\n+\n+saltclient713.example.com\n"
+      }
+    },
+    "file_|-install_pubkey_|-/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL_|-managed": {
+      "comment": "File /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL updated",
+      "name": "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL",
+      "start_time": "00:17:12.134782",
+      "result": true,
+      "duration": 1042.983,
+      "__run_num__": 1,
+      "changes": {
+        "diff": "New file",
+        "mode": "0644"
+      }
+    }
+  }
+}

data/test/unit/report_importer_test.rb

@@ -0,0 +1,32 @@
+require 'test_plugin_helper'
+
+module ForemanSalt
+  class ReportImporterTest < ActiveSupport::TestCase
+    setup do
+      User.current = User.find_by_login 'admin'
+      Setting[:create_new_host_when_facts_are_uploaded] = true
+
+      @report = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'highstate.json')))
+
+      @host = 'saltclient713.example.com'
+    end
+
+    test 'importing report creates a host' do
+      refute Host.find_by_name(@host)
+      ForemanSalt::ReportImporter.import(@report)
+      assert Host.find_by_name(@host)
+    end
+
+    test "importing report updates host status" do
+      ForemanSalt::ReportImporter.import(@report)
+      assert_equal Host.find_by_name(@host).host_status, 'Error'
+    end
+
+    test 'importing report has correct status' do
+      ForemanSalt::ReportImporter.import(@report)
+      status = Host.find_by_name(@host).reports.last.status
+      assert_equal status['applied'], 9
+      assert_equal status['failed'], 3
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -52,6 +52,7 @@ files:
 - app/views/foreman_salt/salt_autosign/new.html.erb
 - app/views/foreman_salt/salt_autosign/_form.html.erb
 - app/services/foreman_salt/smart_proxies/salt_keys.rb
+- app/services/foreman_salt/report_importer.rb
 - app/services/foreman_salt/fact_importer.rb
 - app/models/foreman_salt/salt_module.rb
 - app/models/foreman_salt/concerns/hostgroup_extensions.rb
@@ -67,8 +68,10 @@ files:
 - app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
+- app/controllers/foreman_salt/api/v2/jobs_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
 - app/lib/proxy_api/salt.rb
+- app/lib/actions/foreman_salt/report_import.rb
 - config/routes.rb
 - db/seeds.d/75-salt-seeds.rb
 - db/migrate/20140920232200_create_salt_environments.rb
@@ -90,8 +93,10 @@ files:
 - test/unit/grains_centos.json
 - test/unit/host_extensions_test.rb
 - test/unit/salt_modules_test.rb
+- test/unit/highstate.json
 - test/unit/grains_importer_test.rb
 - test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
 - test/test_plugin_helper.rb
 - test/factories/foreman_salt_factories.rb
 - test/functional/hosts_controller_test.rb
@@ -128,8 +133,10 @@ test_files:
 - test/unit/grains_centos.json
 - test/unit/host_extensions_test.rb
 - test/unit/salt_modules_test.rb
+- test/unit/highstate.json
 - test/unit/grains_importer_test.rb
 - test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
 - test/test_plugin_helper.rb
 - test/factories/foreman_salt_factories.rb
 - test/functional/hosts_controller_test.rb