Upload automate models dialogs during log collection #17445

jrafanie · 2018-05-18T21:00:54Z

https://bugzilla.redhat.com/show_bug.cgi?id=1535179

Depends on prior PRs:

Current/historical log collection refactoring (MERGED)
LogFile#name/destination_file_name consolidation (MERGED)
Setting for disabling this feature (include_automate_models_and_dialogs) (MERGED)

Settings.log.collection.include_automate_models_and_dialogs if enabled, we'll include the automate dialogs and models with log collection.

If done on a Zone, the automate models and dialogs will be uploaded by one of the active appliances and will be named based on the appliance that uploaded it.

[root@localhost vmdb]# ls -l /home/test/ftp/files/default_1/EVM_1/
total 6740
-rw-r--r--. 1 test test 3911379 May 18 16:56 Archive_region_0_default_1_EVM_1_20171114_132136_20180516_195707.zip
-rw-r--r--. 1 test test  889927 May 18 16:56 Archive_region_0_default_1_EVM_1_20180516_195713_20180517_032559.zip
-rw-r--r--. 1 test test  284611 May 18 16:56 Archive_region_0_default_1_EVM_1_20180517_032602_20180518_134950.zip
-rw-r--r--. 1 test test 1297150 May 18 16:56 Current_region_0_default_1_EVM_1_20180518_152247_20180518_165608.zip
-rw-r--r--. 1 test test    2719 May 18 16:56 Dialogs_region_0_default_1_EVM_1.zip
-rw-r--r--. 1 test test  506811 May 18 16:56 Models_region_0_default_1_EVM_1.zip

jrafanie · 2018-05-18T21:01:04Z

cc @ZitaNemeckova

miq-bot · 2018-05-21T17:12:25Z

This pull request is not mergeable. Please rebase and repush.

jrafanie · 2018-05-21T17:32:58Z

Ok, this is ready for review after rebase. Note, the first commit is the 🍖 of the PR. The last 2 commits are just moving code around.

jrafanie · 2018-05-22T12:45:45Z

Hold off on merging this as of yet. We are trying to be understand where the decision about "collect the automate domain/dialogs belongs"... in the depot itself (new column?), as an option of each attempt to collect logs, or a general settings key.

jrafanie · 2018-05-24T14:57:48Z

spec/models/log_file_spec.rb

            message.args.first[:only_current] = false
            expect_any_instance_of(MiqServer).to receive(:post_historical_logs).once
            expect_any_instance_of(MiqServer).to receive(:post_current_logs).once
+            expect_any_instance_of(MiqServer).to receive(:post_automate_dialogs).once
+            expect_any_instance_of(MiqServer).to receive(:post_automate_models).once


I will rid this file of expect_any_instance_of after this PR is merged. It hurts me deeply to use this thing. 😭

jrafanie · 2018-05-24T14:59:26Z

@ZitaNemeckova @bdunne @carbonin please review

carbonin

Generally looks good; just a few nits.

carbonin · 2018-05-24T15:15:34Z

app/models/miq_server/log_management.rb

+      false
+    when nil
+      Settings.log.collection.include_automate_models_and_dialogs
+    end


return value unless value.nil? Settings.log.collection.include_automate_models_and_dialogs

?

haha, I was debating using that guard clause because it wasn't really a guard clause. I'm indifferent to which way.

flog goes from 6.5 to 5.1 so I'm good with changing it.

carbonin · 2018-05-24T15:18:04Z

app/models/miq_server/log_management.rb

    end
    msg = "#{log_type} log files from #{who_am_i} are posted"
    _log.info("#{log_prefix} #{msg}")
    task.update_status("Active", "Ok", msg)
  end

+  def post_automate_models(taskid, log_depot)
+    domain_zip = Rails.root.join("log", "domain.zip")


Could we put this in Rails.root.join("tmp") or are you worried about size?

Yeah, I was worried about the size of the file.

https://bugzilla.redhat.com/show_bug.cgi?id=1535179

These tests are different in that they test the specific refactorings around task/logfile creation/update.

miq-bot · 2018-05-24T18:41:42Z

Some comments on commits jrafanie/manageiq@6fbad9f~...5dab507

spec/models/log_file_spec.rb

⚠️ - 105 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.
⚠️ - 106 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.
⚠️ - 113 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.
⚠️ - 114 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.
⚠️ - 122 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.
⚠️ - 123 - Detected expect_any_instance_of. This RSpec method is highly discouraged, please only use when absolutely necessary.

miq-bot · 2018-05-24T18:42:30Z

Checked commits jrafanie/manageiq@6fbad9f~...5dab507 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
5 files checked, 1 offense detected

app/models/miq_server/log_management.rb

❗ - Line 194, Col 10 - Style/SafeNavigation - Use safe navigation (&.) instead of checking if an object exists before calling the method.

carbonin

Looks good to me. @bdunne anything to add?

jrafanie · 2018-05-25T21:07:36Z

Also, mentioned in the BZ but you can disable this feature like this:

To disable this feature

You can do it in the advanced settings of each server by changing the value from true to false in log/collection/include_automate_models_and_dialogs OR by script:

bin/rails c
irb(main):001:0> MiqServer.my_server.id
=> 4253000000000001

vmdb
./tools/configure_server_settings.rb -s 4253000000000001 -p log/collection/include_automate_models_and_dialogs -v false -t boolean -f --dry-run

Confirm the changes look ok:

Change [log/collection/include_automate_models_and_dialogs], old class: [TrueClass], new class: [FalseClass]
Setting [log/collection/include_automate_models_and_dialogs], old value: [true], new value: [false]

Then run it without the dry run option to set it:

./tools/configure_server_settings.rb -s 4253000000000001 -p log/collection/include_automate_models_and_dialogs -v false -t boolean -f

This can be scripted for all servers by doing something like this:

bin/rails c

> MiqServer.all.each {|s| `#{Rails.root.join("tools", "configure_server_settings.rb")} -s #{s.id} -p log/collection/include_automate_models_and_dialogs -v false -t boolean -f` }

jrafanie added enhancement wip core labels May 18, 2018

jrafanie requested a review from bdunne May 18, 2018 21:01

jrafanie force-pushed the upload_automate_models_dialogs_during_log_collection branch 3 times, most recently from cec90ae to 3749923 Compare May 21, 2018 16:10

jrafanie mentioned this pull request May 21, 2018

Consolidate logfile naming and destination filename #17438

Merged

1 task

miq-bot added the unmergeable label May 21, 2018

jrafanie removed the wip label May 21, 2018

jrafanie changed the title ~~[WIP] Upload automate models dialogs during log collection~~ Upload automate models dialogs during log collection May 21, 2018

jrafanie force-pushed the upload_automate_models_dialogs_during_log_collection branch 3 times, most recently from d9a3423 to 689e1a0 Compare May 21, 2018 17:31

miq-bot removed the unmergeable label May 21, 2018

ZitaNemeckova mentioned this pull request May 22, 2018

[WIP] Add option to collect automate model and service dialog ManageIQ/manageiq-ui-classic#3969

Closed

jrafanie changed the title ~~Upload automate models dialogs during log collection~~ [WIP] Upload automate models dialogs during log collection May 22, 2018

jrafanie added the wip label May 22, 2018

jrafanie mentioned this pull request May 23, 2018

Add include_automate_models_and_dialogs to ::Settings #17467

Merged

jrafanie force-pushed the upload_automate_models_dialogs_during_log_collection branch 2 times, most recently from f2a0acf to 69dad37 Compare May 23, 2018 17:32

jrafanie changed the title ~~[WIP] Upload automate models dialogs during log collection~~ Upload automate models dialogs during log collection May 23, 2018

jrafanie removed the wip label May 23, 2018

jrafanie force-pushed the upload_automate_models_dialogs_during_log_collection branch 2 times, most recently from 6ce9c49 to f693308 Compare May 23, 2018 19:08

jrafanie commented May 24, 2018

View reviewed changes

carbonin reviewed May 24, 2018

View reviewed changes

jrafanie added 3 commits May 24, 2018 14:35

Export via export_automate_models_and_dialogs flag

6fbad9f

https://bugzilla.redhat.com/show_bug.cgi?id=1535179

Move post_historical_logs near the related methods.

588decf

Move dialogs/models/current/historical tests

5dab507

These tests are different in that they test the specific refactorings around task/logfile creation/update.

jrafanie force-pushed the upload_automate_models_dialogs_during_log_collection branch from f693308 to 5dab507 Compare May 24, 2018 18:35

carbonin approved these changes May 24, 2018

View reviewed changes

bdunne approved these changes May 25, 2018

View reviewed changes

bdunne merged commit d868f6f into ManageIQ:master May 25, 2018

bdunne added this to the Sprint 87 Ending Jun 4, 2018 milestone May 25, 2018

bdunne self-assigned this May 25, 2018

bdunne added the gaprindashvili/no label May 25, 2018

jrafanie deleted the upload_automate_models_dialogs_during_log_collection branch May 25, 2018 21:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upload automate models dialogs during log collection #17445

Upload automate models dialogs during log collection #17445

jrafanie commented May 18, 2018 •

edited

Loading

jrafanie commented May 18, 2018

miq-bot commented May 21, 2018

jrafanie commented May 21, 2018

jrafanie commented May 22, 2018

jrafanie May 24, 2018

jrafanie commented May 24, 2018

carbonin left a comment

carbonin May 24, 2018

jrafanie May 24, 2018

carbonin May 24, 2018

jrafanie May 24, 2018

miq-bot commented May 24, 2018 •

edited by jrafanie

Loading

miq-bot commented May 24, 2018 •

edited by jrafanie

Loading

carbonin left a comment

jrafanie commented May 25, 2018

Upload automate models dialogs during log collection #17445

Upload automate models dialogs during log collection #17445

Conversation

jrafanie commented May 18, 2018 • edited Loading

jrafanie commented May 18, 2018

miq-bot commented May 21, 2018

jrafanie commented May 21, 2018

jrafanie commented May 22, 2018

jrafanie May 24, 2018

Choose a reason for hiding this comment

jrafanie commented May 24, 2018

carbonin left a comment

Choose a reason for hiding this comment

carbonin May 24, 2018

Choose a reason for hiding this comment

jrafanie May 24, 2018

Choose a reason for hiding this comment

carbonin May 24, 2018

Choose a reason for hiding this comment

jrafanie May 24, 2018

Choose a reason for hiding this comment

miq-bot commented May 24, 2018 • edited by jrafanie Loading

miq-bot commented May 24, 2018 • edited by jrafanie Loading

carbonin left a comment

Choose a reason for hiding this comment

jrafanie commented May 25, 2018

jrafanie commented May 18, 2018 •

edited

Loading

miq-bot commented May 24, 2018 •

edited by jrafanie

Loading

miq-bot commented May 24, 2018 •

edited by jrafanie

Loading