-
Notifications
You must be signed in to change notification settings - Fork 48
Embed ServicePulse (on top of auth) #5260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: genxp-3600-add-authentication
Are you sure you want to change the base?
Changes from all commits
7a4b272
5d4fefb
befc3c6
4fd0c68
25761f2
13b6001
f9ab202
16f9feb
06bf8cd
e756a28
476f375
2d37aad
2709ff3
3ded845
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -119,6 +119,24 @@ public override async Task ExecuteAsync(InstanceDetailsViewModel model) | |||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| if (!instance.AppConfig.AppSettingExists(ServiceControlSettings.EnableEmbeddedServicePulse.Name)) | ||||||||||
| { | ||||||||||
| var result = await windowManager.ShowYesNoCancelDialog("INPUT REQUIRED - EMBEDDED SERVICEPULSE", | ||||||||||
| "ServiceControl can host an embedded version of ServicePulse which allows you to monitor your ServiceControl instance without needing to install ServicePulse separately.", | ||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
| "Would you like to enable the embedded ServicePulse for this instance?", | ||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nitpicking, but the question doesn't match the answers.
Suggested change
|
||||||||||
| "Enable Embedded ServicePulse", | ||||||||||
| "Do NOT enable Embedded ServicePulse"); | ||||||||||
|
Comment on lines
+127
to
+128
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
|
|
||||||||||
| if (!result.HasValue) | ||||||||||
| { | ||||||||||
| //Dialog was cancelled | ||||||||||
| await eventAggregator.PublishOnUIThreadAsync(new RefreshInstances()); | ||||||||||
| return; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| upgradeOptions.EnableEmbeddedServicePulse = result.Value; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| if (await commandChecks.StopBecauseInstanceIsRunning(instance)) | ||||||||||
| { | ||||||||||
| return; | ||||||||||
|
|
||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| namespace ServiceControl.Config.UI.InstanceAdd | ||
| { | ||
| public class EnableEmbeddedServicePulseOption | ||
| { | ||
| public string Name { get; set; } | ||
| public bool Value { get; set; } | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if using the word "embedded" means much to other people. Remember this may not be installed by a developer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe use "included" or "shipped together"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikeminutillo @PhilBastian here are a few suggestions for you consideration