manageiq-appliance_console 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03acccd11ea06ed06a200676e668a38951e56cdd2d65a2cfdfff7f7f8c54744b
-  data.tar.gz: 3da4c72c3a719f016fca4aced7062b9c1efd3d88a5662b2a1807f3670843f4ec
+  metadata.gz: 609d69718e3bdb080fb6d13495f193690fcbefd7b84ca025204727d43927d9f9
+  data.tar.gz: 5e97c6a1dd7729a4c7219085bc77577abd90988e4af37f9dc92ca63f9358ec65
 SHA512:
-  metadata.gz: faf9223abdcd01b9615d91cfe79f981adc492c208716e20dc6aea92f7a0bc6547468019502f62f8be8735f40bb2f35e2c4a3bca13061a2b5e403989daed15bf8
-  data.tar.gz: f2e1f78fd2d49a821d77560a197b2ae83d7c65504d64ca2b6fa137143afe856a27302332587dcbebd8e4a3e4714ab19624e95e4f2fffd3f0d48551ed6818e617
+  metadata.gz: 816864476123eaacd5b54c4ff02ed1365ac54cef5818193867aa42522966c29facc28e21bbd7e7cc9ecd8c33358715d626881e70abec830e64f12cd20d70fb1c
+  data.tar.gz: ff74aceb06533ec663a5d24213f33e572e4666d6a4ce9c8abf5450933d82997bb6f135d0413e6cea8527da1c7c647e99f44f71ac071ed9668144d6a2607fb1b0

data/bin/appliance_console

@@ -394,14 +394,6 @@ Static Network Configuration
         task_params = []
         uri = nil
 
-        connections = ManageIQ::ApplianceConsole::Utilities.db_connections - 1
-        if connections > 0
-          say("\nDatabase restore failed")
-          say("\nThere #{connections > 1 ? "are #{connections} connections" : "is 1 connection"} preventing a database restore")
-          press_any_key
-          raise MiqSignalError
-        end
-
         # TODO: merge into 1 prompt
         case ask_with_menu("Restore Database File", RESTORE_OPTIONS, RESTORE_LOCAL, nil)
         when RESTORE_LOCAL
@@ -443,6 +435,8 @@ Static Network Configuration
           if rake_success && delete_agreed
             say("\nRemoving the database restore file #{DB_RESTORE_FILE}...")
             File.delete(DB_RESTORE_FILE)
+          elsif !rake_success
+            say("\nDatabase restore failed. Check the logs for more information")
           end
         end
         press_any_key
@@ -575,18 +569,6 @@ Static Network Configuration
         say("Failover Monitor Service configured successfully")
         press_any_key
 
-      when I18n.t("advanced_settings.db_maintenance")
-        say("#{selection}\n\n")
-        db_maintenance = ManageIQ::ApplianceConsole::DatabaseMaintenance.new
-        if db_maintenance.ask_questions && db_maintenance.activate
-          say("Database maintenance configuration updated")
-          press_any_key
-        else
-          say("Database maintenance configuration unchanged")
-          press_any_key
-          raise MiqSignalError
-        end
-
       when I18n.t("advanced_settings.log_config")
         say("#{selection}\n\n")
         log_config = ManageIQ::ApplianceConsole::LogfileConfiguration.new

data/lib/manageiq-appliance_console.rb

@@ -30,9 +30,6 @@ require 'manageiq/appliance_console/certificate'
 require 'manageiq/appliance_console/certificate_authority'
 require 'manageiq/appliance_console/cli'
 require 'manageiq/appliance_console/database_configuration'
-require 'manageiq/appliance_console/database_maintenance'
-require 'manageiq/appliance_console/database_maintenance_hourly'
-require 'manageiq/appliance_console/database_maintenance_periodic'
 require 'manageiq/appliance_console/database_replication'
 require 'manageiq/appliance_console/database_replication_primary'
 require 'manageiq/appliance_console/database_replication_standby'

data/lib/manageiq/appliance_console/cli.rb

@@ -79,10 +79,6 @@ module ApplianceConsole
       options[:server]
     end
 
-    def db_hourly_maintenance?
-      options[:db_hourly_maintenance]
-    end
-
     def set_replication?
       options[:cluster_node_number] && options[:password] && replication_params?
     end
@@ -121,7 +117,6 @@ module ApplianceConsole
         opt :username, "Database Username",  :type => :string,  :short => 'U', :default => "root"
         opt :password, "Database Password",  :type => :string,  :short => "p"
         opt :dbname,   "Database Name",      :type => :string,  :short => "d", :default => "vmdb_production"
-        opt :db_hourly_maintenance, "Configure database hourly maintenance", :type => :bool, :short => :none
         opt :standalone, "Run this server as a standalone database server", :type => :bool, :short => 'S'
         opt :key,      "Create encryption key",  :type => :boolean, :short => "k"
         opt :fetch_key, "SSH host with encryption key", :type => :string, :short => "K"
@@ -163,8 +158,7 @@ module ApplianceConsole
     def run
       Trollop.educate unless set_host? || key? || database? || tmp_disk? || log_disk? ||
                              uninstall_ipa? || install_ipa? || certs? || extauth_opts? ||
-                             time_zone? || date_time? || set_server_state? ||
-                             db_hourly_maintenance? || set_replication?
+                             time_zone? || date_time? || set_server_state? || set_replication?
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
         system_hosts.hostname = options[:host]
@@ -177,7 +171,6 @@ module ApplianceConsole
       set_replication if set_replication?
       set_time_zone if time_zone?
       set_date_time if date_time?
-      config_db_hourly_maintenance if db_hourly_maintenance?
       config_tmp_disk if tmp_disk?
       config_log_disk if log_disk?
       uninstall_ipa if uninstall_ipa?
@@ -415,12 +408,6 @@ module ApplianceConsole
       end
     end
 
-    def config_db_hourly_maintenance
-      hourly = ManageIQ::ApplianceConsole::DatabaseMaintenanceHourly.new
-      hourly.requested_activate = true
-      hourly.activate
-    end
-
     def self.parse(args)
       new.parse(args).run
     end

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '1.2.4'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/locales/appliance/en.yml

@@ -28,7 +28,6 @@ en:
     dbrestore: Restore Database From Backup
     db_config: Configure Database
     db_replication: Configure Database Replication
-    db_maintenance: Configure Database Maintenance
     log_config: Logfile Configuration
     failover_monitor: Configure Application Database Failover Monitor
     httpdauth: Configure External Authentication (httpd)

data/locales/container/en.yml

@@ -20,7 +20,6 @@ en:
     dbrestore: Restore Database From Backup
     db_config: Configure Database
     db_replication: Configure Database Replication
-    db_maintenance: Configure Database Maintenance
     failover_monitor: Configure Application Database Failover Monitor
     evmstop: Stop EVM Server Processes
     key_gen: Generate Custom Encryption Key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -247,9 +247,6 @@ files:
 - lib/manageiq/appliance_console/certificate_authority.rb
 - lib/manageiq/appliance_console/cli.rb
 - lib/manageiq/appliance_console/database_configuration.rb
-- lib/manageiq/appliance_console/database_maintenance.rb
-- lib/manageiq/appliance_console/database_maintenance_hourly.rb
-- lib/manageiq/appliance_console/database_maintenance_periodic.rb
 - lib/manageiq/appliance_console/database_replication.rb
 - lib/manageiq/appliance_console/database_replication_primary.rb
 - lib/manageiq/appliance_console/database_replication_standby.rb
@@ -296,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console

data/lib/manageiq/appliance_console/database_maintenance.rb

@@ -1,35 +0,0 @@
-require 'fileutils'
-
-module ManageIQ
-module ApplianceConsole
-  class DatabaseMaintenance
-    include ManageIQ::ApplianceConsole::Logging
-
-    attr_accessor :hourly, :executed_hourly_action, :requested_hourly_action
-    attr_accessor :periodic, :executed_periodic_action, :requested_periodic_action
-
-    def initialize
-      self.hourly   = ManageIQ::ApplianceConsole::DatabaseMaintenanceHourly.new
-      self.periodic = ManageIQ::ApplianceConsole::DatabaseMaintenancePeriodic.new
-      self.requested_hourly_action = false
-      self.requested_periodic_action = false
-      self.executed_hourly_action = false
-      self.executed_periodic_action = false
-    end
-
-    def ask_questions
-      clear_screen
-      self.requested_hourly_action = hourly.confirm
-      self.requested_periodic_action = periodic.confirm
-      requested_hourly_action || requested_periodic_action
-    end
-
-    def activate
-      say("Configuring Database Maintenance...")
-      self.executed_hourly_action = hourly.activate
-      self.executed_periodic_action = periodic.activate
-      executed_hourly_action || executed_periodic_action
-    end
-  end # class DatabaseMaintenance
-end # module ApplianceConsole
-end

data/lib/manageiq/appliance_console/database_maintenance_hourly.rb

@@ -1,58 +0,0 @@
-require 'fileutils'
-
-module ManageIQ
-module ApplianceConsole
-  class DatabaseMaintenanceHourly
-    include ManageIQ::ApplianceConsole::Logging
-
-    HOURLY_CRON = "/etc/cron.hourly/miq-pg-maintenance-hourly.cron".freeze
-
-    attr_accessor :already_configured, :requested_deactivate, :requested_activate
-
-    def initialize
-      self.already_configured = File.exist?(HOURLY_CRON)
-      self.requested_deactivate = false
-      self.requested_activate = false
-    end
-
-    def activate
-      return deactivate if requested_deactivate
-      return configure if requested_activate
-      false
-    end
-
-    def confirm
-      if already_configured
-        self.requested_deactivate = agree("Hourly Database Maintenance is already configured, Un-Configure (Y/N):")
-      else
-        self.requested_activate = agree("Configure Hourly Database Maintenance? (Y/N): ")
-      end
-    end
-
-    private
-
-    def configure
-      say("Configuring Hourly Database Maintenance...")
-      write_hourly_cron
-      FileUtils.chmod(0755, HOURLY_CRON)
-      true
-    end
-
-    def deactivate
-      say("Un-Configuring Hourly Database Maintenance...")
-      FileUtils.rm_f(HOURLY_CRON)
-      true
-    end
-
-    def write_hourly_cron
-      File.open(HOURLY_CRON, "w") do |f|
-        f.write("#!/bin/sh\n")
-        f.write("/usr/bin/hourly_reindex_metrics_tables\n")
-        f.write("/usr/bin/hourly_reindex_miq_queue_table\n")
-        f.write("/usr/bin/hourly_reindex_miq_workers_table\n")
-        f.write("exit 0\n")
-      end
-    end
-  end # class DatabaseMaintenanceHourly
-end # module ApplianceConsole
-end

data/lib/manageiq/appliance_console/database_maintenance_periodic.rb

@@ -1,84 +0,0 @@
-module ManageIQ
-module ApplianceConsole
-  class DatabaseMaintenancePeriodic
-    include ManageIQ::ApplianceConsole::Logging
-
-    RUN_AS           = 'root'.freeze
-    PERIODIC_CMD     = '/usr/bin/periodic_vacuum_full_tables'.freeze
-    CRONTAB_FILE     = '/etc/crontab'.freeze
-    SCHEDULE_PROMPT  = 'frequency periodic database maintenance should run (hourly daily weekly monthly)'.freeze
-    HOUR_PROMPT      = 'hour number (0..23)'.freeze
-    WEEK_DAY_PROMPT  = 'week day number (0..6, where Sunday is 0)'.freeze
-    MONTH_DAY_PROMPT = 'month day number (1..31)'.freeze
-
-    attr_accessor :crontab_schedule_expression, :already_configured, :requested_deactivate, :requested_activate
-
-    def initialize
-      self.crontab_schedule_expression = nil
-      self.already_configured = File.readlines(CRONTAB_FILE).detect { |line| line =~ /#{PERIODIC_CMD}/ }.present?
-      self.requested_deactivate = false
-      self.requested_activate = false
-    end
-
-    def activate
-      return deactivate if requested_deactivate
-      return configure if requested_activate
-      false
-    end
-
-    def confirm
-      if already_configured
-        self.requested_deactivate = agree("Periodic Database Maintenance is already configured, Un-Configure (Y/N):")
-      else
-        self.requested_activate = agree("Configure Periodic Database Maintenance? (Y/N): ")
-        ask_for_schedule if requested_activate
-      end
-    end
-
-    private
-
-    def ask_for_schedule
-      self.crontab_schedule_expression =
-        case ask_for_schedule_frequency(SCHEDULE_PROMPT, 'monthly')
-        when 'hourly'
-          generate_hourly_crontab_expression
-        when 'daily'
-          generate_daily_crontab_expression
-        when 'weekly'
-          generate_weekly_crontab_expression
-        when 'monthly'
-          generate_monthly_crontab_expression
-        end
-    end
-
-    def configure
-      File.open(CRONTAB_FILE, "a") do |f|
-        f.write("#{crontab_schedule_expression} #{RUN_AS} #{PERIODIC_CMD}\n")
-      end
-      true
-    end
-
-    def deactivate
-      keep_content = File.readlines(CRONTAB_FILE).reject { |line| line =~ /#{PERIODIC_CMD}/ }
-      File.open(CRONTAB_FILE, "w") { |f| keep_content.each { |line| f.puts line } }
-      true
-    end
-
-    def generate_hourly_crontab_expression
-      "0 * * * *"
-    end
-
-    def generate_daily_crontab_expression
-      "0 #{ask_for_hour_number(HOUR_PROMPT)} * * *"
-    end
-
-    def generate_weekly_crontab_expression
-      "0 #{ask_for_hour_number(HOUR_PROMPT)} * * #{ask_for_week_day_number(WEEK_DAY_PROMPT)}"
-    end
-
-    def generate_monthly_crontab_expression
-      "0 #{ask_for_hour_number(HOUR_PROMPT)} #{ask_for_month_day_number(MONTH_DAY_PROMPT)} * *"
-    end
-  end # class DatabaseMaintenancePeriodic
-end # module ApplianceConsole
-end