Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Scripts: update host timeout error message (#13626)

Browse source 
- Update copy for erorr message we display when we haven't heard back
from the host in over 1 minute.
This commit is contained in:
Noah Talerman 2023-08-31 18:01:14 -04:00 committed by GitHub
parent a02b8b140d
commit b7868831c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/fleet/hosts.go
View file

@ -1137,9 +1137,9 @@ func (hsr HostScriptResult) AuthzType() string {
func (hsr HostScriptResult) UserMessage(hostTimeout bool) string {
switch {
case hostTimeout:
return "Fleet hasn't heard from the host in over 1 minute because it went offline. Run the script again when the host comes back online."
return "Fleet hasn't heard from the host in over 1 minute. Fleet doesn't know if the script ran because the host went offline."
case !hostTimeout && time.Since(hsr.CreatedAt) > time.Minute:
return "Fleet hasn't heard from the host in over 1 minute because it went offline. Run the script again when the host comes back online."
return "Fleet hasn't heard from the host in over 1 minute. Fleet doesn't know if the script ran because the host went offline."
case hsr.ExitCode.Int64 == -1:
return "Timeout. Fleet stopped the script after 30 seconds to protect host performance."
case hsr.ExitCode.Int64 == -2:

2
server/service/integration_enterprise_test.go
View file

@ -3762,7 +3762,7 @@ func (s *integrationEnterpriseTestSuite) TestRunHostScript() {
require.Equal(t, host.ID, runSyncResp.HostID)
require.NotEmpty(t, runSyncResp.ExecutionID)
require.True(t, runSyncResp.HostTimeout)
require.Contains(t, runSyncResp.Message, "Fleet hasn't heard from the host in over 1 minute because it went offline.")
require.Contains(t, runSyncResp.Message, "Fleet hasn't heard from the host in over 1 minute. Fleet doesn't know if the script ran because the host went offline.")
s.DoJSON("POST", "/api/fleet/orbit/scripts/result",
json.RawMessage(fmt.Sprintf(`{"orbit_node_key": %q, "execution_id": %q, "exit_code": 0, "output": "ok"}`, *host.OrbitNodeKey, runSyncResp.ExecutionID)),