Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 00:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 106

Update Fleet host detail query so os_version for Ubuntu hosts reflects accurate patch number in point release (#6360)

Browse source
This commit is contained in:
gillespi314 2022-06-23 15:24:18 -05:00 committed by GitHub
parent 4f3170dca5
commit 15de4f3e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changes/issue-4816-ubuntu-patch-id Normal file
View file

@ -0,0 +1,2 @@
- Update Fleet host detail query so `os_version` for Ubuntu hosts reflects the accurate patch number in the
point release

13
server/service/osquery_utils/queries.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"net"
"os"
"regexp"
"strconv"
"strings"
"time"
@ -129,7 +130,17 @@ var hostDetailQueries = map[string]DetailQuery{
return nil
}
if rows[0]["major"] != "0" || rows[0]["minor"] != "0" || rows[0]["patch"] != "0" {
if strings.Contains(strings.ToLower(rows[0]["name"]), "ubuntu") {
// Ubuntu takes a different approach to updating patch IDs so we instead use
// the version string provided after removing the code name
regx := regexp.MustCompile(`\(.*\)`)
vers := regx.ReplaceAllString(rows[0]["version"], "")
host.OSVersion = fmt.Sprintf(
"%s %s",
rows[0]["name"],
strings.TrimSpace(vers),
)
} else if rows[0]["major"] != "0" || rows[0]["minor"] != "0" || rows[0]["patch"] != "0" {
host.OSVersion = fmt.Sprintf(
"%s %s.%s.%s",
rows[0]["name"],

21
server/service/osquery_utils/queries_test.go
View file

@ -371,6 +371,27 @@ func TestDetailQueriesOSVersion(t *testing.T) {
assert.NoError(t, ingest(context.Background(), log.NewNopLogger(), &host, rows))
assert.Equal(t, "Arch Linux 1.2.3", host.OSVersion)
// Simulate Ubuntu host with incorrect `patch`` number
require.NoError(t, json.Unmarshal([]byte(`
[{
"hostname": "kube2",
"arch": "x86_64",
"build": "",
"codename": "bionic",
"major": "18",
"minor": "4",
"name": "Ubuntu",
"patch": "0",
"platform": "ubuntu",
"platform_like": "debian",
"version": "18.04.5 LTS (Bionic Beaver)"
}]`),
&rows,
))
assert.NoError(t, ingest(context.Background(), log.NewNopLogger(), &host, rows))
assert.Equal(t, "Ubuntu 18.04.5 LTS", host.OSVersion)
}
func TestDirectIngestMDM(t *testing.T) {