Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions internal/app/command/choices_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ func TestApplicationNameChoices(t *testing.T) {
}
response = `{"data":{"team":{"applications":{"nodes":[{"name":"orders","teamEnvironment":{"environment":{"name":"prod"}}},{"name":"orders","teamEnvironment":{"environment":{"name":"dev"}}}]}}}}`
case "GetApplicationStatus":
if action != "status" || v.Name != "orders" || string(v.Env) != `["dev"]` {
if action != "status" || v.Name != "orders" || string(v.Env) != `"dev"` {
t.Errorf("incorrect status target: %+v", v)
}
response = `{"data":{"team":{"applications":{"nodes":[{"name":"orders","teamEnvironment":{"environment":{"name":"dev"}},"instanceGroups":[]}]}}}}`
response = `{"data":{"team":{"environment":{"application":{"name":"orders","issues":{"nodes":[{"__typename":"ApplicationRolloutStuckIssue","severity":"WARNING","reason":"INSTANCE_CREATION_FAILED","message":"Quota prevented instance creation."}]},"resources":{"scaling":{"status":{"state":"DISABLED","message":"Scaled to zero.","currentInstances":0,"desiredInstances":0}}},"instanceGroups":[]}}}}}`
case "RestartApp":
if action != "restart" || v.Application != "orders" || string(v.Env) != `"dev"` {
t.Errorf("incorrect restart target: %+v", v)
Expand Down Expand Up @@ -348,6 +348,9 @@ func TestApplicationNameChoices(t *testing.T) {
if !strings.Contains(output.String(), "orders") || !strings.Contains(output.String(), "dev") {
t.Errorf("incorrect command output: %q", output.String())
}
if action == "status" && (!strings.Contains(output.String(), "Quota prevented instance creation.") || !strings.Contains(output.String(), "Disabled (0 current, 0 desired)")) {
t.Errorf("status omitted rollout or scaling without groups: %q", output.String())
}
}
var wantOperations []string
if !tt.omitTeam && !tt.afterValue {
Expand Down
3 changes: 2 additions & 1 deletion internal/app/command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ func App(parentFlags *flags.GlobalFlags) *naistrix.Command {
Name: "app",
Aliases: []string{"apps", "application", "applications"},
Title: "Interact with applications.",
Description: "Commands for managing and inspecting your team's applications, including listing, viewing activity and issues, restarting, and tailing logs.",
Description: "Commands for managing and inspecting your team's applications, including listing, viewing status, issues, and events, restarting, and tailing logs.",
ValidateFlagsFunc: validation.RequireTeamFlag(flags),
StickyFlags: flags,
SubCommands: []*naistrix.Command{
list(flags),
activity(flags),
appEvents(flags),
issues(flags),
restart(flags),
del(flags),
Expand Down
39 changes: 39 additions & 0 deletions internal/app/command/events.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package command

import (
"context"

"github.com/nais/cli/internal/app/command/flag"
"github.com/nais/cli/internal/workload"
events "github.com/nais/cli/internal/workload/command"
"github.com/nais/naistrix"
)

func appEvents(parentFlags *flag.App) *naistrix.Command {
flags := &flag.Events{App: parentFlags, Limit: events.DefaultEventLimit}
return &naistrix.Command{
Name: "events",
Title: "Show recent events for an application.",
Description: "Shows workload warnings, restarts, and successful rescaling, newest first. Events are retained for 30 days. Use app issues for active issues or app activity for the audit log.",
Args: []naistrix.Argument{
{Name: "name", Prompt: "Name of the application", ChoicesFunc: appNameChoices(parentFlags)},
},
Flags: flags,
RunFunc: func(ctx context.Context, args *naistrix.Arguments, out *naistrix.OutputWriter) error {
query, err := events.ParseEventQuery(flags.Limit, flags.From, flags.To, flags.After)
if err != nil {
return err
}
name := args.Get("name")
environment, err := resolveAppEnvironment(ctx, flags.Team, name, string(flags.Environment))
if err != nil {
return err
}
page, err := workload.GetEvents(ctx, workload.ApplicationEvents, flags.Team, environment, name, query)
if err != nil {
return err
}
return events.RenderEvents(out, page, query.Limit, flags.Output == "json")
},
}
}
10 changes: 10 additions & 0 deletions internal/app/command/flag/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
activityutil "github.com/nais/cli/internal/activity"
"github.com/nais/cli/internal/app"
"github.com/nais/cli/internal/flags"
issueflag "github.com/nais/cli/internal/issues/command/flag"
"github.com/nais/cli/internal/labels"
"github.com/nais/cli/internal/naisapi/gql"
"github.com/nais/cli/internal/validation"
Expand Down Expand Up @@ -64,6 +65,7 @@ type Delete struct {

type Issues struct {
*App
IssueType issueflag.IssueType `name:"issuetype" usage:"Filter issues by issue type"`
}
type List struct {
*App
Expand All @@ -72,6 +74,14 @@ type List struct {

func (*List) LabelFacetResource() string { return "applications" }

type Events struct {
*App
Limit int `name:"limit" short:"l" usage:"Maximum events per page (1–100)."`
From string `name:"from" usage:"Include events at or after this RFC3339 timestamp."`
To string `name:"to" usage:"Include events before this RFC3339 timestamp. Defaults to now."`
After string `name:"after" usage:"Continue after a cursor from the previous page. Reuse its --from and --to bounds."`
}

type Activity struct {
*App
Limit int `name:"limit" short:"l" usage:"Maximum number of activity entries to fetch."`
Expand Down
12 changes: 11 additions & 1 deletion internal/app/command/issues.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (

"github.com/nais/cli/internal/app"
"github.com/nais/cli/internal/app/command/flag"
issueutil "github.com/nais/cli/internal/issues"
"github.com/nais/cli/internal/naisapi/gql"
"github.com/nais/naistrix"
"github.com/nais/naistrix/output"
)
Expand All @@ -23,7 +25,15 @@ func issues(parentFlags *flag.App) *naistrix.Command {
},
Flags: flags,
RunFunc: func(ctx context.Context, args *naistrix.Arguments, out *naistrix.OutputWriter) error {
ret, err := app.GetApplicationIssues(ctx, flags.Team, args.Get("name"), string(flags.Environment))
issueType, err := issueutil.ParseIssueType(flags.IssueType)
if err != nil {
return err
}
var filter *gql.ResourceIssueFilter
if issueType != nil {
filter = &gql.ResourceIssueFilter{IssueType: issueType}
}
ret, err := app.GetApplicationIssues(ctx, flags.Team, args.Get("name"), string(flags.Environment), filter)
if err != nil {
return err
}
Expand Down
91 changes: 66 additions & 25 deletions internal/app/command/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/nais/cli/internal/app"
"github.com/nais/cli/internal/app/command/flag"
"github.com/nais/cli/internal/naisapi/gql"
"github.com/nais/naistrix"
"github.com/nais/naistrix/output"
)
Expand All @@ -19,7 +20,7 @@ func status(parentFlags *flag.App) *naistrix.Command {
return &naistrix.Command{
Name: "status",
Title: "Show instance status for an application.",
Description: "Shows instance groups and their instances with current status, image, and restart counts. During rolling updates, both current and incoming groups are shown.",
Description: "Shows readiness, instance groups, stuck rollout warnings, and observed automatic scaling for an application.",
Args: []naistrix.Argument{
{Name: "name", Prompt: "Name of the application to show instance status for", ChoicesFunc: appNameChoices(parentFlags)},
},
Expand Down Expand Up @@ -47,53 +48,76 @@ func status(parentFlags *flag.App) *naistrix.Command {
}

func renderStatus(out *naistrix.OutputWriter, status *app.InstanceGroupStatus) error {
header := fmt.Sprintf("%s (%s)", status.Application, status.Environment)
out.Println(header)
if rollout := status.Rollout; rollout != nil {
switch rollout.Reason {
case gql.ApplicationRolloutStuckReasonInstanceCreationFailed:
out.Warnf("Rollout stuck — instance creation failed: %s\n", rollout.Message)
out.Println(" Check nais app events for details.")
case gql.ApplicationRolloutStuckReasonTimedOut:
out.Warnf("Rollout stuck — timed out: %s\n", rollout.Message)
if len(status.Groups) > 1 {
out.Println(" Check the newest instance group below.")
}
default:
out.Warnf("Rollout stuck: %s\n", rollout.Message)
}
}
if scaling := status.Scaling; scaling != nil {
out.Printf("Automatic scaling: %s (%d current, %d desired)\n", scalingLabel(scaling.State), scaling.CurrentInstances, scaling.DesiredInstances)
if scaling.Message != "" {
out.Printf(" %s\n", scaling.Message)
}
}
if len(status.Groups) == 0 {
out.Printf("No running instances found for %s in %s.\n", status.Application, status.Environment)
out.Println("No instance groups observed.")
return nil
}

multipleGroups := len(status.Groups) > 1

for i, group := range status.Groups {
if i > 0 {
out.Println("")
}

header := fmt.Sprintf("%s (%s)", status.Application, status.Environment)
out.Println("")
if multipleGroups {
label := "Incoming"
if group.Current {
label = "Current"
label := "Earlier"
if i == 0 {
label = "Newest"
}
header = fmt.Sprintf("%s — %s (%d/%d ready)", header, label, group.ReadyInstances, group.DesiredInstances)
out.Printf("%s group %s (%d/%d ready)\n", label, group.Name, group.ReadyInstances, group.DesiredInstances)
} else {
out.Printf(" Instances: %d/%d ready\n", group.ReadyInstances, group.DesiredInstances)
}
out.Println(header)
out.Printf(" Image: %s\n", group.Image)

if !multipleGroups {
out.Printf(" Instances: %d/%d ready\n", group.ReadyInstances, group.DesiredInstances)
}
out.Println("")

type entry struct {
Name string `json:"name"`
Status app.InstanceState `json:"status"`
Restarts int `json:"restarts"`
Created app.LastUpdated `json:"created"`
Name string `json:"name"`
Status string `json:"status"`
Restarts int `json:"restarts"`
Created app.LastUpdated `json:"created"`
}

entries := make([]entry, 0, len(group.Instances))
var failingMessages []string
var details []string

for _, inst := range group.Instances {
label := inst.State.String()
if inst.State == app.InstanceState(gql.ApplicationInstanceStateRunning) && !inst.Ready {
label = "Running, not ready"
}
entries = append(entries, entry{
Name: inst.Name,
Status: inst.State,
Status: label,
Restarts: inst.Restarts,
Created: inst.Created,
})
if inst.State == "FAILING" && inst.Message != "" {
failingMessages = append(failingMessages, fmt.Sprintf(" %s: %s", inst.Name, inst.Message))
if !inst.Ready && inst.Message != "" {
details = append(details, fmt.Sprintf(" %s: %s", inst.Name, inst.Message))
}
if inst.LastExit != nil && (inst.Restarts > 0 || !inst.Ready) {
details = append(details, fmt.Sprintf(" %s last exit: %s", inst.Name, inst.LastExit))
}
}

Expand All @@ -103,10 +127,27 @@ func renderStatus(out *naistrix.OutputWriter, status *app.InstanceGroupStatus) e
}
}

if len(failingMessages) > 0 {
if len(details) > 0 {
out.Println("")
out.Println(strings.Join(failingMessages, "\n"))
out.Println(strings.Join(details, "\n"))
}
}
return nil
}

func scalingLabel(state gql.ApplicationScalingState) string {
switch state {
case gql.ApplicationScalingStateActive:
return "Active"
case gql.ApplicationScalingStateLimitedByMaximum:
return "Limited by configured maximum"
case gql.ApplicationScalingStateMetricsUnavailable:
return "Metrics unavailable"
case gql.ApplicationScalingStateUnableToScale:
return "Unable to scale"
case gql.ApplicationScalingStateDisabled:
return "Disabled"
default:
return string(state)
}
}
43 changes: 22 additions & 21 deletions internal/app/issues.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,33 @@ func (s Severity) String() string {
return formatting.ColoredSeverityString(string(s), gql.Severity(s))
}

func GetApplicationIssues(ctx context.Context, slug, name string, environment string) ([]ApplicationIssue, error) {
func GetApplicationIssues(ctx context.Context, slug, name string, environment string, filter *gql.ResourceIssueFilter) ([]ApplicationIssue, error) {
_ = `# @genqlient
query GetApplicationIssues($slug: Slug!, $name: String!, $env: [String!]) {
team(slug: $slug) {
applications(filter: { name: $name, environments: $env }) {
nodes {
teamEnvironment{
environment {
name
}
}
issues(first: 500) {
nodes {
severity
message
}
}
}
}
}
query GetApplicationIssues($slug: Slug!, $name: String!, $env: [String!], $filter: ResourceIssueFilter) {
team(slug: $slug) {
applications(filter: { name: $name, environments: $env }) {
nodes {
name
teamEnvironment { environment { name } }
issues(first: 500, filter: $filter) {
nodes { severity message }
}
}
}
}
}
`
`

client, err := naisapi.GraphqlClient(ctx)
if err != nil {
return nil, err
}

resp, err := gql.GetApplicationIssues(ctx, client, slug, name, []string{environment})
var environments []string
if environment != "" {
environments = []string{environment}
}
resp, err := gql.GetApplicationIssues(ctx, client, slug, name, environments, filter)
if err != nil {
return nil, err
}
Expand All @@ -57,6 +55,9 @@ func GetApplicationIssues(ctx context.Context, slug, name string, environment st
}
ret := make([]ApplicationIssue, 0)
for _, app := range resp.Team.Applications.Nodes {
if app.Name != name {
continue
}
for _, issue := range app.Issues.Nodes {
ret = append(ret, ApplicationIssue{
Severity: Severity(issue.GetSeverity()),
Expand Down
Loading
Loading