Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Add hosts enrolled by operating system to anonymous usage stats (#6329)

Browse Source
This commit is contained in:
Martin Angers
2022-06-22 16:38:11 -04:00
committed by GitHub
parent 2948e112f6
commit 8f66a50f2b
11 changed files with 212 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/fleet/serve_test.go
+6 -1
View File
@@ -54,6 +54,11 @@ func TestMaybeSendStatistics(t *testing.T) {
SystemUsersEnabled: true,
HostsStatusWebHookEnabled: true,
NumWeeklyActiveUsers: 111,
HostsEnrolledByOperatingSystem: map[string][]fleet.HostsCountByOSVersion{
"linux": {
fleet.HostsCountByOSVersion{Version: "1.2.3", NumEnrolled: 22},
},
},
}, true, nil
}
recorded := false
@@ -65,7 +70,7 @@ func TestMaybeSendStatistics(t *testing.T) {
err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL, &fleet.LicenseInfo{Tier: "premium"})
require.NoError(t, err)
assert.True(t, recorded)
assert.Equal(t, `{"anonymousIdentifier":"ident","fleetVersion":"1.2.3","licenseTier":"premium","numHostsEnrolled":999,"numUsers":99,"numTeams":9,"numPolicies":0,"numLabels":3,"softwareInventoryEnabled":true,"vulnDetectionEnabled":true,"systemUsersEnabled":true,"hostsStatusWebHookEnabled":true,"numWeeklyActiveUsers":111}`, requestBody)
assert.Equal(t, `{"anonymousIdentifier":"ident","fleetVersion":"1.2.3","licenseTier":"premium","numHostsEnrolled":999,"numUsers":99,"numTeams":9,"numPolicies":0,"numLabels":3,"softwareInventoryEnabled":true,"vulnDetectionEnabled":true,"systemUsersEnabled":true,"hostsStatusWebHookEnabled":true,"numWeeklyActiveUsers":111,"hostsEnrolledByOperatingSystem":{"linux":[{"version":"1.2.3","numEnrolled":22}]}}`, requestBody)
}
func TestMaybeSendStatisticsSkipsSendingIfNotNeeded(t *testing.T) {