additional stats

cmd/fleet/serve_test.go

@@ -91,6 +91,12 @@ func TestMaybeSendStatistics(t *testing.T) {
 			LicenseTier:                          "premium",
 			NumHostsEnrolled:                     999,
 			NumUsers:                             99,
+			NumSoftwareVersions:                     100,
+			NumHostSoftwares:                     101,
+			NumSoftwareTitles:                    102,
+			NumHostSoftwareInstalledPaths:        103,
+			NumSoftwareCpes:                      104,
+			NumSoftwareCves:                      105,
 			NumTeams:                             9,
 			NumPolicies:                          0,
 			NumLabels:                            3,
@@ -128,7 +134,7 @@ func TestMaybeSendStatistics(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, recorded)
 	require.True(t, cleanedup)
-	assert.Equal(t, `{"anonymousIdentifier":"ident","fleetVersion":"1.2.3","licenseTier":"premium","organization":"Fleet","numHostsEnrolled":999,"numUsers":99,"numTeams":9,"numPolicies":0,"numLabels":3,"softwareInventoryEnabled":true,"vulnDetectionEnabled":true,"systemUsersEnabled":true,"hostsStatusWebHookEnabled":true,"mdmMacOsEnabled":false,"hostExpiryEnabled":false,"mdmWindowsEnabled":false,"liveQueryDisabled":false,"numWeeklyActiveUsers":111,"numWeeklyPolicyViolationDaysActual":0,"numWeeklyPolicyViolationDaysPossible":0,"hostsEnrolledByOperatingSystem":{"linux":[{"version":"1.2.3","numEnrolled":22}]},"hostsEnrolledByOrbitVersion":[],"hostsEnrolledByOsqueryVersion":[],"storedErrors":[],"numHostsNotResponding":0}`, requestBody)
+	assert.Equal(t, `{"anonymousIdentifier":"ident","fleetVersion":"1.2.3","licenseTier":"premium","organization":"Fleet","numHostsEnrolled":999,"numUsers":99,"NumSoftwareVersions":100,"numHostSoftwares":101,"numSoftwareTitles":102,"numHostSoftwareInstalledPaths":103,"numSoftwareCpes":104,"numSoftwareCves":105,"numTeams":9,"numPolicies":0,"numLabels":3,"softwareInventoryEnabled":true,"vulnDetectionEnabled":true,"systemUsersEnabled":true,"hostsStatusWebHookEnabled":true,"mdmMacOsEnabled":false,"hostExpiryEnabled":false,"mdmWindowsEnabled":false,"liveQueryDisabled":false,"numWeeklyActiveUsers":111,"numWeeklyPolicyViolationDaysActual":0,"numWeeklyPolicyViolationDaysPossible":0,"hostsEnrolledByOperatingSystem":{"linux":[{"version":"1.2.3","numEnrolled":22}]},"hostsEnrolledByOrbitVersion":[],"hostsEnrolledByOsqueryVersion":[],"storedErrors":[],"numHostsNotResponding":0}`, requestBody)
 }
 
 func TestMaybeSendStatisticsSkipsSendingIfNotNeeded(t *testing.T) {

server/datastore/mysql/statistics.go

@@ -32,6 +32,30 @@ func (ds *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Du
 		if err != nil {
 			return ctxerr.Wrap(ctx, err, "amount users")
 		}
+		amountSoftwares, err := amountSoftwaresDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount software")
+		}
+		amountHostSoftwares, err := amountHostSoftwaresDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount HostSoftwares")
+		}
+		amountSoftwareTitles, err := amountSoftwareTitlesDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount SoftwareTitles")
+		}
+		amountHostSoftwareInstalledPaths, err := amountHostSoftwareInstalledPathsDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount HostSoftwareInstalledPath")
+		}
+		amountSoftwareCpes, err := amountSoftwareCpesDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount SoftwareCpes")
+		}
+		amountSoftwareCves, err := amountSoftwareCvesDB(ctx, ds.writer(ctx))
+		if err != nil {
+			return ctxerr.Wrap(ctx, err, "amount SoftwareCves")
+		}
 		amountTeams, err := amountTeamsDB(ctx, ds.writer(ctx))
 		if err != nil {
 			return ctxerr.Wrap(ctx, err, "amount teams")
@@ -77,6 +101,12 @@ func (ds *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Du
 
 		stats.NumHostsEnrolled = amountEnrolledHosts
 		stats.NumUsers = amountUsers
+		stats.NumSoftwares = amountSoftwares
+		stats.NumHostSoftwares = amountHostSoftwares
+		stats.NumSoftwareTitles = amountSoftwareTitles
+		stats.NumHostSoftwareInstalledPaths = amountHostSoftwareInstalledPaths
+		stats.NumSoftwareCpes = amountSoftwareCpes
+		stats.NumSoftwareCves = amountSoftwareCves
 		stats.NumTeams = amountTeams
 		stats.NumPolicies = amountPolicies
 		stats.NumLabels = amountLabels

server/datastore/mysql/statistics_test.go

@@ -64,6 +64,12 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	assert.Equal(t, "Fleet", stats.Organization)
 	assert.Equal(t, 0, stats.NumHostsEnrolled)
 	assert.Equal(t, 0, stats.NumUsers)
+	assert.Equal(t, 0, stats.NumSoftwares)
+	assert.Equal(t, 0, stats.NumHostSoftwares)
+	assert.Equal(t, 0, stats.NumSoftwareTitles)
+	assert.Equal(t, 0, stats.NumHostSoftwareInstalledPaths)
+	assert.Equal(t, 0, stats.NumSoftwareCpes)
+	assert.Equal(t, 0, stats.NumSoftwareCves)
 	assert.Equal(t, 0, stats.NumTeams)
 	assert.Equal(t, 0, stats.NumPolicies)
 	assert.Equal(t, builtinLabels, stats.NumLabels)

server/datastore/mysql/users.go

@@ -285,6 +285,60 @@ func amountUsersDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
 	return amount, nil
 }
 
+func amountSoftwaresDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM software`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
+func amountHostSoftwaresDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM host_software`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
+func amountSoftwareTitlesDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM software_titles`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
+func amountHostSoftwareInstalledPathsDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM host_software_installed_paths`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
+func amountSoftwareCpesDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM software_cpe`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
+func amountSoftwareCvesDB(ctx context.Context, db sqlx.QueryerContext) (int, error) {
+	var amount int
+	err := sqlx.GetContext(ctx, db, &amount, `SELECT count(*) FROM software_cve`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
+
 func amountActiveUsersSinceDB(ctx context.Context, db sqlx.QueryerContext, since time.Time) (int, error) {
 	var amount int
 	err := sqlx.GetContext(ctx, db, &amount, `

server/fleet/statistics.go

@@ -6,24 +6,30 @@ import (
 )
 
 type StatisticsPayload struct {
-	AnonymousIdentifier       string `json:"anonymousIdentifier"`
-	FleetVersion              string `json:"fleetVersion"`
-	LicenseTier               string `json:"licenseTier"`
-	Organization              string `json:"organization"`
-	NumHostsEnrolled          int    `json:"numHostsEnrolled"`
-	NumUsers                  int    `json:"numUsers"`
-	NumTeams                  int    `json:"numTeams"`
-	NumPolicies               int    `json:"numPolicies"`
-	NumLabels                 int    `json:"numLabels"`
-	SoftwareInventoryEnabled  bool   `json:"softwareInventoryEnabled"`
-	VulnDetectionEnabled      bool   `json:"vulnDetectionEnabled"`
-	SystemUsersEnabled        bool   `json:"systemUsersEnabled"`
-	HostsStatusWebHookEnabled bool   `json:"hostsStatusWebHookEnabled"`
-	MDMMacOsEnabled           bool   `json:"mdmMacOsEnabled"`
-	HostExpiryEnabled         bool   `json:"hostExpiryEnabled"`
-	MDMWindowsEnabled         bool   `json:"mdmWindowsEnabled"`
-	LiveQueryDisabled         bool   `json:"liveQueryDisabled"`
-	NumWeeklyActiveUsers      int    `json:"numWeeklyActiveUsers"`
+	AnonymousIdentifier           string `json:"anonymousIdentifier"`
+	FleetVersion                  string `json:"fleetVersion"`
+	LicenseTier                   string `json:"licenseTier"`
+	Organization                  string `json:"organization"`
+	NumHostsEnrolled              int    `json:"numHostsEnrolled"`
+	NumUsers                      int    `json:"numUsers"`
+	NumSoftwares                  int    `json:"numSoftwares"`
+	NumHostSoftwares              int    `json:"numHostSoftwares"`
+	NumSoftwareTitles             int    `json:"numSoftwareTitles"`
+	NumHostSoftwareInstalledPaths int    `json:"numHostSoftwareInstalledPaths"`
+	NumSoftwareCpes               int    `json:"numSoftwareCpes"`
+	NumSoftwareCves               int    `json:"numSoftwareCves"`
+	NumTeams                      int    `json:"numTeams"`
+	NumPolicies                   int    `json:"numPolicies"`
+	NumLabels                     int    `json:"numLabels"`
+	SoftwareInventoryEnabled      bool   `json:"softwareInventoryEnabled"`
+	VulnDetectionEnabled          bool   `json:"vulnDetectionEnabled"`
+	SystemUsersEnabled            bool   `json:"systemUsersEnabled"`
+	HostsStatusWebHookEnabled     bool   `json:"hostsStatusWebHookEnabled"`
+	MDMMacOsEnabled               bool   `json:"mdmMacOsEnabled"`
+	HostExpiryEnabled             bool   `json:"hostExpiryEnabled"`
+	MDMWindowsEnabled             bool   `json:"mdmWindowsEnabled"`
+	LiveQueryDisabled             bool   `json:"liveQueryDisabled"`
+	NumWeeklyActiveUsers          int    `json:"numWeeklyActiveUsers"`
 	// NumWeeklyPolicyViolationDaysActual is an aggregate count of actual policy violation days. One
 	// policy violation day is added for each policy that a host is failing as of the time the count
 	// is incremented. The count increments once per 24-hour interval and resets each week.