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

Fixed query used when aggregating WinOS stats (#11840)

Browse source 
Aggregated stats on the dashboard page were showing the wrong WinOS version.
This commit is contained in:
Juan Fernandez 2023-05-24 22:11:43 -04:00 committed by GitHub
parent 3e3880b62d
commit 012a633866
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,8 +166,7 @@ var hostDetailQueries = map[string]DetailQuery{
Query: `
SELECT
os.name,
os.version as display_version
os.version
FROM
os_version os`,
Platforms: []string{"windows"},
@ -178,7 +177,7 @@ var hostDetailQueries = map[string]DetailQuery{
return nil
}
version := rows[0]["display_version"]
version := rows[0]["version"]
if version == "" {
level.Debug(logger).Log(
"msg", "unable to identify windows version",
@ -487,8 +486,7 @@ var extraDetailQueries = map[string]DetailQuery{
os.platform,
os.arch,
k.version as kernel_version,
os.codename as display_version
os.version
FROM
os_version os,
kernel_info k`,
@ -907,7 +905,7 @@ func directIngestOSWindows(ctx context.Context, logger log.Logger, host *fleet.H
Platform: rows[0]["platform"],
}
version := rows[0]["display_version"]
version := rows[0]["version"]
if version == "" {
level.Debug(logger).Log(
"msg", "unable to identify windows version",

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

@ -386,7 +386,7 @@ func TestDetailQueriesOSVersionWindows(t *testing.T) {
))
assert.NoError(t, ingest(context.Background(), log.NewNopLogger(), &host, rows))
assert.Equal(t, "Windows 11 Enterprise 21H2", host.OSVersion)
assert.Equal(t, "Windows 11 Enterprise 10.0.22000", host.OSVersion)
require.NoError(t, json.Unmarshal([]byte(`
[{
@ -408,7 +408,7 @@ func TestDetailQueriesOSVersionWindows(t *testing.T) {
))
assert.NoError(t, ingest(context.Background(), log.NewNopLogger(), &host, rows))
assert.Equal(t, "Windows 10 Enterprise LTSC ", host.OSVersion)
assert.Equal(t, "Windows 10 Enterprise LTSC 10.0.17763", host.OSVersion)
}
func TestDetailQueriesOSVersionChrome(t *testing.T) {
@ -547,7 +547,7 @@ func TestDirectIngestOSWindows(t *testing.T) {
KernelVersion: "10.0.22000.795",
},
data: []map[string]string{
{"name": "Microsoft Windows 11 Enterprise", "display_version": "21H2", "release_id": "", "arch": "64-bit", "kernel_version": "10.0.22000.795"},
{"name": "Microsoft Windows 11 Enterprise", "version": "21H2", "release_id": "", "arch": "64-bit", "kernel_version": "10.0.22000.795"},
},
},
}