Commit2f32b11

gcp-cherry-pick-bot[bot]

and

matifali

authored

fix(site): fix agent and web terminal troubleshooting links (cherry-pick#16353) (#16405)

Co-authored-by: M Atif Ali <atif@coder.com>

1 parenta9775fa commit2f32b11Copy full SHA for 2f32b11

File tree

2 files changed

-5

lines changed

cli/cliui
- agent.go
site/src/pages/TerminalPage
- TerminalAlerts.tsx

2 files changed

-5

lines changed

`‎cli/cliui/agent.go`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`120`	`120`	`ifagent.Status==codersdk.WorkspaceAgentTimeout {`
`121`	`121`	`now:=time.Now()`
`122`	`122`	`sw.Log(now,codersdk.LogLevelInfo,"The workspace agent is having trouble connecting, wait for it to connect or restart your workspace.")`
`123`		`-sw.Log(now,codersdk.LogLevelInfo,troubleshootingMessage(agent,fmt.Sprintf("%s/templates#agent-connection-issues",opts.DocsURL)))`
	`123`	`+sw.Log(now,codersdk.LogLevelInfo,troubleshootingMessage(agent,fmt.Sprintf("%s/admin/templates/troubleshooting#agent-connection-issues",opts.DocsURL)))`
`124`	`124`	`foragent.Status==codersdk.WorkspaceAgentTimeout {`
`125`	`125`	`ifagent,err=fetch();err!=nil {`
`126`	`126`	`returnxerrors.Errorf("fetch: %w",err)`
`@@ -225,13 +225,13 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`225`	`225`	`sw.Fail(stage,safeDuration(sw,agent.ReadyAt,agent.StartedAt))`
`226`	`226`	`// Use zero time (omitted) to separate these from the startup logs.`
`227`	`227`	`sw.Log(time.Time{},codersdk.LogLevelWarn,"Warning: A startup script exited with an error and your workspace may be incomplete.")`
`228`		`-sw.Log(time.Time{},codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/templates#startup-script-exited-with-an-error",opts.DocsURL)))`
	`228`	`+sw.Log(time.Time{},codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/admin/templates/troubleshooting#startup-script-exited-with-an-error",opts.DocsURL)))`
`229`	`229`	`default:`
`230`	`230`	`switch {`
`231`	`231`	`caseagent.LifecycleState.Starting():`
`232`	`232`	`// Use zero time (omitted) to separate these from the startup logs.`
`233`	`233`	`sw.Log(time.Time{},codersdk.LogLevelWarn,"Notice: The startup scripts are still running and your workspace may be incomplete.")`
`234`		`-sw.Log(time.Time{},codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/templates#your-workspace-may-be-incomplete",opts.DocsURL)))`
	`234`	`+sw.Log(time.Time{},codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/admin/templates/troubleshooting#your-workspace-may-be-incomplete",opts.DocsURL)))`
`235`	`235`	`// Note: We don't complete or fail the stage here, it's`
`236`	`236`	`// intentionally left open to indicate this stage didn't`
`237`	`237`	`// complete.`
`@@ -253,7 +253,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`253`	`253`	`stage:="The workspace agent lost connection"`
`254`	`254`	`sw.Start(stage)`
`255`	`255`	`sw.Log(time.Now(),codersdk.LogLevelWarn,"Wait for it to reconnect or restart your workspace.")`
`256`		`-sw.Log(time.Now(),codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/templates#agent-connection-issues",opts.DocsURL)))`
	`256`	`+sw.Log(time.Now(),codersdk.LogLevelWarn,troubleshootingMessage(agent,fmt.Sprintf("%s/admin/templates/troubleshooting#agent-connection-issues",opts.DocsURL)))`
`257`	`257`
`258`	`258`	`disconnectedAt:=agent.DisconnectedAt`
`259`	`259`	`foragent.Status==codersdk.WorkspaceAgentDisconnected {`

`‎site/src/pages/TerminalPage/TerminalAlerts.tsx`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,9 @@ export const ErrorScriptAlert: FC = () => {`
`72`	`72`	`The workspace{" "}`
`73`	`73`	`<Link`
`74`	`74`	`title="startup script has exited with an error"`
`75`		`-href={docs("/templates#startup-script-exited-with-an-error")}`
	`75`	`+href={docs(`
	`76`	`+"/admin/templates/troubleshooting#startup-script-exited-with-an-error",`
	`77`	`+)}`
`76`	`78`	`target="_blank"`
`77`	`79`	`rel="noreferrer"`
`78`	`80`	`>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2f32b11

File tree

2 files changed

2 files changed

`‎cli/cliui/agent.go`

`‎site/src/pages/TerminalPage/TerminalAlerts.tsx`

0 commit comments