miq_utilities 0.3.1.5 → 0.3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 891921da800a611804b128d19ca20382c5b04da02d7e1ce38dfbb3dfd5961158
-  data.tar.gz: 4944860e6abc05f02c8fa850f9a7adf456053000ea3c721d16ec8251e2bda497
+  metadata.gz: 8f953689ae2fb50e9b12c089e6919119e97370b1f7e8bf30839f7ad9b216519e
+  data.tar.gz: b8d8c992cb9ceeff359addfd4810352bd8f97c2c7364657eb86f4fae2128064f
 SHA512:
-  metadata.gz: 76e6765db3de056e42bd1fad4c82c9bde538ceea3666d44d618128cd91289e778c036d314ca90da7bcbef4dd186ef28df75a442887269205df0eb324109b0a12
-  data.tar.gz: 74f4290d01b99261eff4537abfbf533ec3456cb848a191fb65aafc4ad0542fb86e69105cac84d6f578e333d6a55432f3b5daae06bd9b722d3fa2bbc63facb6a6
+  metadata.gz: fec9183bd980ae3367af5b4a14a5cc39d8cf4da52a21db4ab49567c7390cd3fd80a49641da9bcb59fd7b1c3e30b25dd2b3bb1d476f861295d059375f19cace86
+  data.tar.gz: c266cc61749dcf1726288af1754d4a3a7f0d685ed56d84e8f0adec397bb89f509b486203a65d472795e66529bc1b62aea36b2aed2bffde88fc64f26e2abc53f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    miq_utilities (0.3.1.4)
+    miq_utilities (0.3.1.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/miq_utilities/notification.rb

@@ -18,30 +18,34 @@ require 'slack-notifier'
 class NotificationClass
   def notify(event_level:, event_message:, email_to: nil, email_from: nil, signature: nil, webhookurl: nil, subjecttype: nil)
     @logger = LoggingClass.new(self.class.to_s)
+    request_or_vm = $evm.root.attributes['miq_request_id'] || $evm.root.attributes['vm']
+    user = $evm.root['user'].attributes['name']
+    userid = $evm.root['user'].attributes['userid']
+    message = "Request ID/VM Name:<#{request_or_vm}>\n User:<#{user}> ID:<#{userid}>\n" + event_message
     signature ||= 'ManageIQ'
     case event_level.upcase
     when 'WARN', 'WARNING'
       subject = 'ManageIQ Warning'
-      send_slack_message(message: event_message, webhookurl: webhookurl)
+      send_slack_message(message: message, webhookurl: webhookurl)
       if $evm.nil?
         @logger.log(level: 'warn', message: 'The $evm object is null. Unable to send email notification.')
       else
-        send_email(message: event_message, subject: subject, from_email: email_from, signature: signature, to_email: email_to)
+        send_email(message: message, subject: subject, from_email: email_from, signature: signature, to_email: email_to)
       end
     when 'ERR', 'ERROR'
       subject = 'ManageIQ Error'
-      send_slack_message(message: event_message, webhookurl: webhookurl)
+      send_slack_message(message: message, webhookurl: webhookurl)
       if $evm.nil?
         @logger.log(level: 'warn', message: 'The $evm object is null. Unable to send email or on-screen notifications.')
       else
-        on_screen_message(level: event_level, message: event_message, type: subjecttype)
-        send_email(message: event_message, subject: subject, from_email: email_from, signature: signature, to_email: email_to)
+        on_screen_message(level: event_level, message: message, type: subjecttype)
+        send_email(message: message, subject: subject, from_email: email_from, signature: signature, to_email: email_to)
       end
     when 'NOTE'
       if $evm.nil?
         @logger.log(level: 'warn', message: 'The $evm object is null. Unable to on-screen notification.')
       else
-        on_screen_message(level: event_level, message: event_message, type: subjecttype)
+        on_screen_message(level: event_level, message: message, type: subjecttype)
       end
     end
   rescue => err

data/lib/miq_utilities/sql.rb

@@ -46,6 +46,7 @@ class SqlClass
     if @client.nil?
       @logger.log(level: 'warn', message: 'SQL Server Connection Not Established! Query hasn\'t been run!')
     else
+      @logger.log(level: 'info', message: "Executing Sql Query: #{sql}")
       @client.execute(sql)
     end
   end

data/lib/miq_utilities/ssh.rb

@@ -15,8 +15,8 @@ require_relative 'logging.rb'
 class SshClass
   def ssh_run(ipaddr, script, linux_user = nil, linux_password = nil)
     @logger = LoggingClass.new("#{self.class}:(#{__method__})")
-    linux_password ||= $evm.object.decrypt('linux_password').to_s
     linux_user ||= 'root'
+    linux_password ||= $evm.object.decrypt('linux_password').to_s
     begin
       Net::SSH.start(ipaddr, linux_user, password: linux_password, paranoid: Net::SSH::Verifiers::Null.new) do |ssh|
         command = script

data/lib/miq_utilities/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiqUtilities
-  VERSION = '0.3.1.5'
+  VERSION = '0.3.1.6'
 end

data/lib/miq_utilities/winrm.rb

@@ -14,8 +14,8 @@ require 'logging.rb'
 class WinrmClass
   def winrm_run(ps_script, host, user = nil , password = nil)
     @logger = LoggingClass.new('WinRM')
-    user ||= 'root'
-    password ||= $evm.object.decrypt('linux_password').to_s
+    user ||= 'administrator'
+    password ||= $evm.object.decrypt('win_password').to_s
     value = ''
     ps1 = <<~PS_SCRIPT
       #{ps_script}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miq_utilities
 version: !ruby/object:Gem::Version
-  version: 0.3.1.5
+  version: 0.3.1.6
 platform: ruby
 authors:
 - Aaron McCatty