feat(newrelic): Display deploy information from multiple apps #472
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package newrelic | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/wtfutil/wtf/wtf" | ||
| nr "github.com/yfronto/newrelic" | ||
| ) | ||
|
|
||
| func (widget *Widget) display() { | ||
| client := widget.currentData() | ||
| if client == nil { | ||
| widget.Redraw(widget.CommonSettings.Title, " NewRelic data unavailable ", false) | ||
| return | ||
| } | ||
| app, appErr := client.Application() | ||
| deploys, depErr := client.Deployments() | ||
|
|
||
| appName := "error" | ||
| if appErr == nil { | ||
| appName = app.Name | ||
| } | ||
|
|
||
| var content string | ||
| title := fmt.Sprintf("%s - [green]%s[white]", widget.CommonSettings.Title, appName) | ||
| wrap := false | ||
| if depErr != nil { | ||
| wrap = true | ||
| content = depErr.Error() | ||
| } else { | ||
| content = widget.contentFrom(deploys) | ||
| } | ||
|
|
||
| widget.Redraw(title, content, wrap) | ||
| } | ||
|
|
||
| func (widget *Widget) contentFrom(deploys []nr.ApplicationDeployment) string { | ||
| str := fmt.Sprintf( | ||
| " %s\n", | ||
| "[red]Latest Deploys[white]", | ||
| ) | ||
|
|
||
| revisions := []string{} | ||
|
|
||
| for _, deploy := range deploys { | ||
| if (deploy.Revision != "") && wtf.Exclude(revisions, deploy.Revision) { | ||
| lineColor := "white" | ||
| if wtf.IsToday(deploy.Timestamp) { | ||
| lineColor = "lightblue" | ||
| } | ||
|
|
||
| revLen := 8 | ||
| if revLen > len(deploy.Revision) { | ||
| revLen = len(deploy.Revision) | ||
| } | ||
|
|
||
| str += fmt.Sprintf( | ||
| " [green]%s[%s] %s %-.16s[white]\n", | ||
| deploy.Revision[0:revLen], | ||
| lineColor, | ||
| deploy.Timestamp.Format("Jan 02 15:04 MST"), | ||
| wtf.NameFromEmail(deploy.User), | ||
| ) | ||
|
|
||
| revisions = append(revisions, deploy.Revision) | ||
|
|
||
| if len(revisions) == widget.settings.deployCount { | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return str | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package newrelic | ||
|
|
||
| import "github.com/gdamore/tcell" | ||
|
|
||
| func (widget *Widget) initializeKeyboardControls() { | ||
| widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help window") | ||
| widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous application") | ||
| widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next application") | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,69 @@ | ||
| package newrelic | ||
|
|
||
| import ( | ||
| "sort" | ||
|
|
||
| "github.com/rivo/tview" | ||
| "github.com/wtfutil/wtf/wtf" | ||
| ) | ||
|
|
||
| type Widget struct { | ||
| wtf.KeyboardWidget | ||
| wtf.MultiSourceWidget | ||
| wtf.TextWidget | ||
|
|
||
| Clients []*Client | ||
|
|
||
| settings *Settings | ||
| } | ||
|
|
||
| func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget { | ||
| widget := Widget{ | ||
| KeyboardWidget: wtf.NewKeyboardWidget(app, pages, settings.common), | ||
| MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "applicationID", "applicationIDs"), | ||
| TextWidget: wtf.NewTextWidget(app, settings.common, true), | ||
|
|
||
| settings: settings, | ||
| } | ||
|
|
||
| widget.initializeKeyboardControls() | ||
| widget.View.SetInputCapture(widget.InputCapture) | ||
|
|
||
| widget.SetDisplayFunction(widget.display) | ||
|
|
||
| widget.KeyboardWidget.SetView(widget.View) | ||
|
|
||
| return &widget | ||
| } | ||
|
|
||
| /* -------------------- Exported Functions -------------------- */ | ||
|
|
||
| func (widget *Widget) Refresh() { | ||
| for _, id := range wtf.ToInts(widget.settings.applicationIDs) { | ||
| widget.Clients = append(widget.Clients, NewClient(widget.settings.apiKey, id)) | ||
|
There was a problem hiding this comment. This will create a new client that is calling the service each time, and this is probably not quite what you want. Say you had 3 applications, on the first refresh there would be 3, second would be 6, third would be 9..... eventually this will eat up a lot of resources. |
||
| } | ||
|
|
||
| sort.Slice(widget.Clients, func(i, j int) bool { | ||
| return widget.Clients[i].applicationId < widget.Clients[j].applicationId | ||
| }) | ||
|
|
||
| widget.display() | ||
| } | ||
|
|
||
| func (widget *Widget) HelpText() string { | ||
| return widget.KeyboardWidget.HelpText() | ||
| } | ||
|
|
||
| /* -------------------- Unexported Functions -------------------- */ | ||
|
|
||
| func (widget *Widget) currentData() *Client { | ||
| if len(widget.Clients) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| if widget.Idx < 0 || widget.Idx >= len(widget.Clients) { | ||
| return nil | ||
| } | ||
|
|
||
| return widget.Clients[widget.Idx] | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Can you take a look at the JIRA module and add appropriate keyboard commands?
r/j/kwould be appreciated for consistency.