manageiq-smartstate 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ded56aab7da85194a4cfb42fd399aeef40a462a
-  data.tar.gz: 327141ab0608d81e88f9466327ec06c886e017b2
+  metadata.gz: 3b2a69c35013227fbededdcfef2bed9796a0c53f
+  data.tar.gz: fe7ba8f2036accdce13806943d28111f242e2c7c
 SHA512:
-  metadata.gz: 80634305627950a300e82c2a6842004d56819b1cb768012c529a80eb27f11815ad2bd416c8d60a21073f10e287f0df3c71ce45314520d77274a14214e875848d
-  data.tar.gz: 711cd483bd832b40c95ae5e26e883a4dd366436096d2cf062c6d08a3c3ea1bd5d98849e824c2939f185df9609cfde5520b28940607c0ee586e25d2657dcb669c
+  metadata.gz: 16acbf991c60b44a496b5cb2c58dec958aeb58153d3b0c52d77f6bad3c2881e8406b15873a45653b24cbd38865ffa5dbfe983bd543a3f2526c9a72fb242f78e8
+  data.tar.gz: 32c7792c1a7d8cbe76ec19023d3be90760782de2e804aabe485c1fd5f8e6d21e8923d881316316b3485c7c843e6f04c083d5a10f779bb5001d814d3599b15e73

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.13".freeze
+    VERSION = "0.2.14".freeze
   end
 end

data/lib/metadata/linux/LinuxUtils.rb

@@ -117,7 +117,7 @@ module MiqLinux
     end
 
     def self.parse_systemctl_list(lines)
-      return [] if lines.nil? || lines.empty?
+      return [] if lines.blank?
 
       lines.each_line.map do |line|
         line = line.chomp
@@ -141,6 +141,27 @@ module MiqLinux
       end.compact
     end
 
+    def self.parse_docker_ps_list(lines)
+      return [] if lines.blank?
+
+      lines.each_line.map do |line|
+        line = line.chomp
+        parts = line.split(/^(\S+)\s/)
+
+        name, = parts[1]
+
+        {:name              => name,
+         :systemd_load      => 'container',
+         :systemd_active    => parts[2]&.strip&.start_with?('Up') ? 'active' : 'failed',
+         :systemd_sub       => parts[2]&.strip&.start_with?('Up') ? 'running' : 'failed',
+         :typename          => 'docker_container',
+         :description       => parts[1] + ' ' + parts[2].strip,
+         :enable_run_level  => nil,
+         :disable_run_level => nil,
+         :running           => parts[2]&.strip&.start_with?('Up')}
+      end.compact
+    end
+
     def self.collect_interface(interfaces, interface)
       mac_addr = interface[:mac_address]
       return if mac_addr.blank?
@@ -177,21 +198,79 @@ module MiqLinux
     end
 
     def self.parse_openstack_status(lines)
-      lines.to_s.split("\n").reject{|t| t.include? "="}.group_by{|t| t.gsub(/openstack\-([a-z]+).*/i, '\1')}.map do |title, services|
+      lines = lines.to_s.split("\n").reject { |t| t.include?("=") }.group_by { |t| t.gsub(/openstack\-([a-z]+).*/i, '\1') }
+      lines.map do |title, services|
+        services = services.map { |service_line| service_line.split(/[:\(\)]/).map(&:strip) } # split service line by :, ( and ) and strip white space from results
+
+        services = services.map do |service|
+          {
+            'name'    => service.first,
+            'active'  => service[1] == 'active',
+            'enabled' => service[2] !~ /disabled/
+          }
+        end
+
         {
           'name'     => title.capitalize,
-          'services' => services.map do |service_line|
-            # split service line by :, ( and ) and strip white space from results
-            service_line.split(/[:\(\)]/).map(&:strip)
-          end.map do |service|
-            {
-              'name'    => service.first,
-              'active'  => service[1] == 'active',
-              'enabled' => !(service[2] =~ /disabled/)
-            }
-          end
+          'services' => services
+        }
+      end
+    end
+
+    def self.parse_openstack_container_status(lines)
+      containers = lines.to_s.split("\n").group_by do |t|
+        if t.include?('_')
+          t.split("_")[0]
+        elsif t.start_with?('openstack')
+          t.split("-")[1]
+        elsif t.include?('-')
+          t.split("-")[0]
+        else
+          t.split(" ")[0]
+        end
+      end
+
+      containers.map do |title, services|
+        services = services.map { |service_line| service_line.split(/^(\S+)\s/) } # split service line by first space and strip white space from results
+
+        services = services.map do |service|
+          {
+            'name'    => service[1],
+            'active'  => service[2].strip.start_with?('Up'),
+            'enabled' => true
+          }
+        end
+
+        {
+          'name'     => title.capitalize,
+          'services' => services
         }
       end
     end
+
+    def self.merge_openstack_services(systemctl_services, containerized_services)
+      # Merge outputs 2 arrays with systemctl and containerized services, example:
+      # systemctl_services = [{"name"=>"Swift", "services"=> [{"name"=>"openstack-swift-proxy", "active"=>true, "enabled"=>true}]
+      # containerized_services = [{"name"=>"Swift", "services"=> [{"name"=>"swift_container_auditor", "active"=>true, "enabled"=>true}]
+      # result is [{"name"=>"Swift", "services"=> [{"name"=>"openstack-swift-proxy", "active"=>true, "enabled"=>true},
+      #                                            {"name"=>"swift_container_auditor", "active"=>true, "enabled"=>true}]
+
+      all_services = systemctl_services + containerized_services
+
+      service_names = all_services.map { |service| service['name'] }.uniq
+
+      service_names.each do |name|
+        merged_service = { "name" => name, "services" => [] }
+        common_services = all_services.select { |service| service['name'] == name }
+
+        common_services.each do |common_service|
+          merged_service["services"].concat(common_service["services"])
+          all_services.delete(common_service)
+        end
+        all_services << merged_service
+      end
+
+      all_services
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -584,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ManageIQ SmartState Analysis