diff --git a/orbit/changes/29720-link-text b/orbit/changes/29720-link-text new file mode 100644 index 0000000000..3510f6a5da --- /dev/null +++ b/orbit/changes/29720-link-text @@ -0,0 +1 @@ +* Revised "Migrate to Fleet" link anchor text. diff --git a/orbit/pkg/useraction/mdm_migration_darwin.go b/orbit/pkg/useraction/mdm_migration_darwin.go index c5b5565ed0..56ce02dae9 100644 --- a/orbit/pkg/useraction/mdm_migration_darwin.go +++ b/orbit/pkg/useraction/mdm_migration_darwin.go @@ -84,7 +84,7 @@ Select **Start** and Remote Management window will appear soon:` + var errorTemplate = template.Must(template.New("").Parse(` ### Something's gone wrong. -Please contact your IT admin [here]({{ .ContactURL }}). +Please [contact your IT admin]({{ .ContactURL }}). `)) var unenrollBody = "## Migrate to Fleet\nUnenrolling you from your old MDM. This could take 90 seconds...\n\n%s" diff --git a/server/service/osquery_utils/queries.go b/server/service/osquery_utils/queries.go index 653ed71f5c..4a01e9e0e0 100644 --- a/server/service/osquery_utils/queries.go +++ b/server/service/osquery_utils/queries.go @@ -6,7 +6,6 @@ import ( "encoding/base64" "encoding/hex" "fmt" - "github.com/fleetdm/fleet/v4/server/mdm" "net" "net/url" "regexp" @@ -15,6 +14,8 @@ import ( "strings" "time" + "github.com/fleetdm/fleet/v4/server/mdm" + "github.com/fleetdm/fleet/v4/server/config" "github.com/fleetdm/fleet/v4/server/contexts/ctxerr" "github.com/fleetdm/fleet/v4/server/contexts/logging" @@ -506,7 +507,7 @@ var extraDetailQueries = map[string]DetailQuery{ // the `mdm_bridge` table is used, the `mdmlocalmanagement.dll` // registers an MDM with ProviderID = `Local_Management` // - // Entries also need to be filtered by their enrollment status, described [here][1] + // Entries also need to be filtered by their [Intune enrollmentState][1] // // Member Value Description // unknown 0 Device enrollment state is unknown