From 6ee6dba4a496dbba9f915f1ede85b717e0edf563 Mon Sep 17 00:00:00 2001
From: gillespi314 <73313222+gillespi314@users.noreply.github.com>
Date: Mon, 6 Dec 2021 14:39:00 -0600
Subject: [PATCH] Update anonymous usage statistics to record Fleet feature
 adoption (#3056)

* Collect additional anonymous usage statistics

* Update fleetdm.com and docs for usage stats

* Fix lint-go errors

* Fix failing test

* update webhook inputs

* Update receive-usage-analytics.js

* fix failing test

* Update statistics_test.go

Co-authored-by: eashaw <eashaw@sailsjs.com>
---
 cmd/fleet/serve.go                            | 14 ++---
 cmd/fleet/serve_test.go                       | 26 +++++---
 docs/01-Using-Fleet/11-Usage-statistics.md    | 15 ++++-
 .../admin/AppConfigForm/AppConfigForm.jsx     | 19 ++++--
 server/datastore/mysql/policies.go            |  9 +++
 server/datastore/mysql/statistics.go          | 46 +++++++++++---
 server/datastore/mysql/statistics_test.go     | 62 ++++++++++++++++++-
 server/datastore/mysql/teams.go               |  9 +++
 server/datastore/mysql/users.go               | 10 ++-
 server/fleet/datastore.go                     |  2 +-
 server/fleet/statistics.go                    | 14 ++++-
 server/mock/datastore_mock.go                 |  6 +-
 .../webhooks/receive-usage-analytics.js       | 19 +++---
 website/api/models/HistoricalUsageSnapshot.js | 11 +++-
 14 files changed, 212 insertions(+), 50 deletions(-)

diff --git a/cmd/fleet/serve.go b/cmd/fleet/serve.go
index 6c1f313f50..d416170cc5 100644
--- a/cmd/fleet/serve.go
+++ b/cmd/fleet/serve.go
@@ -292,7 +292,7 @@ the way that the Fleet server works.
 				}
 			}
 
-			cancelBackground := runCrons(ds, task, kitlog.With(logger, "component", "crons"), config)
+			cancelBackground := runCrons(ds, task, kitlog.With(logger, "component", "crons"), config, license)
 
 			// Flush seen hosts every second
 			go func() {
@@ -501,7 +501,7 @@ const (
 	lockKeyWebhooks        = "webhooks"
 )
 
-func trySendStatistics(ctx context.Context, ds fleet.Datastore, frequency time.Duration, url string) error {
+func trySendStatistics(ctx context.Context, ds fleet.Datastore, frequency time.Duration, url string, license *fleet.LicenseInfo) error {
 	ac, err := ds.AppConfig(ctx)
 	if err != nil {
 		return err
@@ -510,7 +510,7 @@ func trySendStatistics(ctx context.Context, ds fleet.Datastore, frequency time.D
 		return nil
 	}
 
-	stats, shouldSend, err := ds.ShouldSendStatistics(ctx, frequency)
+	stats, shouldSend, err := ds.ShouldSendStatistics(ctx, frequency, license)
 	if err != nil {
 		return err
 	}
@@ -525,7 +525,7 @@ func trySendStatistics(ctx context.Context, ds fleet.Datastore, frequency time.D
 	return ds.RecordStatisticsSent(ctx)
 }
 
-func runCrons(ds fleet.Datastore, task *async.Task, logger kitlog.Logger, config config.FleetConfig) context.CancelFunc {
+func runCrons(ds fleet.Datastore, task *async.Task, logger kitlog.Logger, config config.FleetConfig, license *fleet.LicenseInfo) context.CancelFunc {
 	ctx, cancelBackground := context.WithCancel(context.Background())
 
 	ourIdentifier, err := server.GenerateRandomText(64)
@@ -537,7 +537,7 @@ func runCrons(ds fleet.Datastore, task *async.Task, logger kitlog.Logger, config
 	task.StartCollectors(ctx, config.Osquery.AsyncHostCollectInterval,
 		config.Osquery.AsyncHostCollectMaxJitterPercent, kitlog.With(logger, "cron", "async_task"))
 
-	go cronCleanups(ctx, ds, kitlog.With(logger, "cron", "cleanups"), ourIdentifier)
+	go cronCleanups(ctx, ds, kitlog.With(logger, "cron", "cleanups"), ourIdentifier, license)
 	go cronVulnerabilities(
 		ctx, ds, kitlog.With(logger, "cron", "vulnerabilities"), ourIdentifier, config)
 	go cronWebhooks(ctx, ds, kitlog.With(logger, "cron", "webhooks"), ourIdentifier)
@@ -545,7 +545,7 @@ func runCrons(ds fleet.Datastore, task *async.Task, logger kitlog.Logger, config
 	return cancelBackground
 }
 
-func cronCleanups(ctx context.Context, ds fleet.Datastore, logger kitlog.Logger, identifier string) {
+func cronCleanups(ctx context.Context, ds fleet.Datastore, logger kitlog.Logger, identifier string, license *fleet.LicenseInfo) {
 	ticker := time.NewTicker(10 * time.Second)
 	for {
 		level.Debug(logger).Log("waiting", "on ticker")
@@ -594,7 +594,7 @@ func cronCleanups(ctx context.Context, ds fleet.Datastore, logger kitlog.Logger,
 			level.Error(logger).Log("err", "cleaning expired hosts", "details", err)
 		}
 
-		err = trySendStatistics(ctx, ds, fleet.StatisticsFrequency, "https://fleetdm.com/api/v1/webhooks/receive-usage-analytics")
+		err = trySendStatistics(ctx, ds, fleet.StatisticsFrequency, "https://fleetdm.com/api/v1/webhooks/receive-usage-analytics", license)
 		if err != nil {
 			level.Error(logger).Log("err", "sending statistics", "details", err)
 		}
diff --git a/cmd/fleet/serve_test.go b/cmd/fleet/serve_test.go
index 705a1756af..4391590e0d 100644
--- a/cmd/fleet/serve_test.go
+++ b/cmd/fleet/serve_test.go
@@ -37,11 +37,19 @@ func TestMaybeSendStatistics(t *testing.T) {
 		return &fleet.AppConfig{ServerSettings: fleet.ServerSettings{EnableAnalytics: true}}, nil
 	}
 
-	ds.ShouldSendStatisticsFunc = func(ctx context.Context, frequency time.Duration) (fleet.StatisticsPayload, bool, error) {
+	ds.ShouldSendStatisticsFunc = func(ctx context.Context, frequency time.Duration, license *fleet.LicenseInfo) (fleet.StatisticsPayload, bool, error) {
 		return fleet.StatisticsPayload{
-			AnonymousIdentifier: "ident",
-			FleetVersion:        "1.2.3",
-			NumHostsEnrolled:    999,
+			AnonymousIdentifier:       "ident",
+			FleetVersion:              "1.2.3",
+			LicenseTier:               "premium",
+			NumHostsEnrolled:          999,
+			NumUsers:                  99,
+			NumTeams:                  9,
+			NumPolicies:               0,
+			SoftwareInventoryEnabled:  true,
+			VulnDetectionEnabled:      true,
+			SystemUsersEnabled:        true,
+			HostsStatusWebHookEnabled: true,
 		}, true, nil
 	}
 	recorded := false
@@ -50,10 +58,10 @@ func TestMaybeSendStatistics(t *testing.T) {
 		return nil
 	}
 
-	err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL)
+	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","numHostsEnrolled":999}`, requestBody)
+	assert.Equal(t, `{"anonymousIdentifier":"ident","fleetVersion":"1.2.3","licenseTier":"premium","numHostsEnrolled":999,"numUsers":99,"numTeams":9,"numPolicies":0,"softwareInventoryEnabled":true,"vulnDetectionEnabled":true,"systemUsersEnabled":true,"hostsStatusWebHookEnabled":true}`, requestBody)
 }
 
 func TestMaybeSendStatisticsSkipsSendingIfNotNeeded(t *testing.T) {
@@ -70,7 +78,7 @@ func TestMaybeSendStatisticsSkipsSendingIfNotNeeded(t *testing.T) {
 		return &fleet.AppConfig{ServerSettings: fleet.ServerSettings{EnableAnalytics: true}}, nil
 	}
 
-	ds.ShouldSendStatisticsFunc = func(ctx context.Context, frequency time.Duration) (fleet.StatisticsPayload, bool, error) {
+	ds.ShouldSendStatisticsFunc = func(ctx context.Context, frequency time.Duration, license *fleet.LicenseInfo) (fleet.StatisticsPayload, bool, error) {
 		return fleet.StatisticsPayload{}, false, nil
 	}
 	recorded := false
@@ -79,7 +87,7 @@ func TestMaybeSendStatisticsSkipsSendingIfNotNeeded(t *testing.T) {
 		return nil
 	}
 
-	err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL)
+	err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL, &fleet.LicenseInfo{Tier: "premium"})
 	require.NoError(t, err)
 	assert.False(t, recorded)
 	assert.False(t, called)
@@ -99,7 +107,7 @@ func TestMaybeSendStatisticsSkipsIfNotConfigured(t *testing.T) {
 		return &fleet.AppConfig{}, nil
 	}
 
-	err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL)
+	err := trySendStatistics(context.Background(), ds, fleet.StatisticsFrequency, ts.URL, &fleet.LicenseInfo{Tier: "premium"})
 	require.NoError(t, err)
 	assert.False(t, called)
 }
diff --git a/docs/01-Using-Fleet/11-Usage-statistics.md b/docs/01-Using-Fleet/11-Usage-statistics.md
index 816ea33775..0b528610f1 100644
--- a/docs/01-Using-Fleet/11-Usage-statistics.md
+++ b/docs/01-Using-Fleet/11-Usage-statistics.md
@@ -12,9 +12,18 @@ Fleet Device Management Inc. periodically collects anonymous information about y
 
 ```json
 {
-  "anonymous_identifier": 1,
-  "fleet_version": "x.x.x",
-  "hosts_enrolled_count": 12345
+  "anonymousIdentifier": "9pnzNmrES3mQG66UQtd29cYTiX2+fZ4CYxDvh495720=",
+  "fleetVersion": "x.x.x",
+  "licenseTier": "free",
+  "numHostsEnrolled": 12345,
+  "numUsers": 12,
+  "numTeams": 3,
+  "numPolicies": 5,
+  "numLabels": 20,
+  "softwareInventoryEnabled": true,
+  "vulnDetectionEnabled": true,
+  "systemUsersEnabled": true,
+  "hostStatusWebhookEnabled": true,
 }
 ```
 
diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
index e018082f1e..d36f8a899b 100644
--- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
+++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
@@ -288,10 +288,19 @@ class AppConfigForm extends Component {
       return null;
     }
 
-    const json = {
-      anonymous_identifier: "wmTH972f06USpahr41LHpgLKAhgZL",
-      fleet_version: "x.x.x",
-      hosts_enrolled_count: 12345,
+    const stats = {
+      anonymousIdentifier: "9pnzNmrES3mQG66UQtd29cYTiX2+fZ4CYxDvh495720=",
+      fleetVersion: "x.x.x",
+      licenseTier: "free",
+      numHostsEnrolled: 12345,
+      numUsers: 12,
+      numTeams: 3,
+      numPolicies: 5,
+      numLabels: 20,
+      softwareInventoryEnabled: true,
+      vulnDetectionEnabled: true,
+      systemUsersEnabled: true,
+      hostStatusWebhookEnabled: true,
     };
 
     return (
@@ -301,7 +310,7 @@ class AppConfigForm extends Component {
         className={`${baseClass}__usage-stats-preview-modal`}
       >
         <p>An example JSON payload sent to Fleet Device Management Inc.</p>
-        <pre dangerouslySetInnerHTML={{ __html: syntaxHighlight(json) }} />
+        <pre dangerouslySetInnerHTML={{ __html: syntaxHighlight(stats) }} />
         <div className="flex-end">
           <Button type="button" onClick={toggleUsageStatsPreviewModal}>
             Done
diff --git a/server/datastore/mysql/policies.go b/server/datastore/mysql/policies.go
index 61144f1494..e207b94991 100644
--- a/server/datastore/mysql/policies.go
+++ b/server/datastore/mysql/policies.go
@@ -333,3 +333,12 @@ func (ds *Datastore) ApplyPolicySpecs(ctx context.Context, authorID uint, specs
 		return nil
 	})
 }
+
+func amountPoliciesDB(db sqlx.Queryer) (int, error) {
+	var amount int
+	err := sqlx.Get(db, &amount, `SELECT count(*) FROM policies`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
diff --git a/server/datastore/mysql/statistics.go b/server/datastore/mysql/statistics.go
index 9caa9bf635..0fa0ba088c 100644
--- a/server/datastore/mysql/statistics.go
+++ b/server/datastore/mysql/statistics.go
@@ -17,11 +17,27 @@ type statistics struct {
 	Identifier string `db:"anonymous_identifier"`
 }
 
-func (d *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Duration) (fleet.StatisticsPayload, bool, error) {
+func (d *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Duration, license *fleet.LicenseInfo) (fleet.StatisticsPayload, bool, error) {
 	amountEnrolledHosts, err := amountEnrolledHostsDB(d.writer)
 	if err != nil {
 		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "amount enrolled hosts")
 	}
+	amountUsers, err := amountUsersDB(d.writer)
+	if err != nil {
+		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "amount users")
+	}
+	amountTeams, err := amountTeamsDB(d.writer)
+	if err != nil {
+		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "amount teams")
+	}
+	amountPolicies, err := amountPoliciesDB(d.writer)
+	if err != nil {
+		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "amount teams")
+	}
+	appConfig, err := d.AppConfig(ctx)
+	if err != nil {
+		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "statistics app config")
+	}
 
 	dest := statistics{}
 	err = sqlx.GetContext(ctx, d.writer, &dest, `SELECT created_at, updated_at, anonymous_identifier FROM statistics LIMIT 1`)
@@ -36,9 +52,17 @@ func (d *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Dur
 				return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "insert statistics")
 			}
 			return fleet.StatisticsPayload{
-				AnonymousIdentifier: anonIdentifier,
-				FleetVersion:        version.Version().Version,
-				NumHostsEnrolled:    amountEnrolledHosts,
+				AnonymousIdentifier:       anonIdentifier,
+				FleetVersion:              version.Version().Version,
+				LicenseTier:               license.Tier,
+				NumHostsEnrolled:          amountEnrolledHosts,
+				NumUsers:                  amountUsers,
+				NumTeams:                  amountTeams,
+				NumPolicies:               amountPolicies,
+				SoftwareInventoryEnabled:  appConfig.HostSettings.EnableSoftwareInventory,
+				VulnDetectionEnabled:      appConfig.VulnerabilitySettings.DatabasesPath != "",
+				SystemUsersEnabled:        appConfig.HostSettings.EnableHostUsers,
+				HostsStatusWebHookEnabled: appConfig.WebhookSettings.HostStatusWebhook.Enable,
 			}, true, nil
 		}
 		return fleet.StatisticsPayload{}, false, ctxerr.Wrap(ctx, err, "get statistics")
@@ -51,9 +75,17 @@ func (d *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Dur
 		return fleet.StatisticsPayload{}, false, nil
 	}
 	return fleet.StatisticsPayload{
-		AnonymousIdentifier: dest.Identifier,
-		FleetVersion:        version.Version().Version,
-		NumHostsEnrolled:    amountEnrolledHosts,
+		AnonymousIdentifier:       dest.Identifier,
+		FleetVersion:              version.Version().Version,
+		LicenseTier:               license.Tier,
+		NumHostsEnrolled:          amountEnrolledHosts,
+		NumUsers:                  amountUsers,
+		NumTeams:                  amountTeams,
+		NumPolicies:               amountPolicies,
+		SoftwareInventoryEnabled:  appConfig.HostSettings.EnableSoftwareInventory,
+		VulnDetectionEnabled:      &appConfig.VulnerabilitySettings.DatabasesPath != nil,
+		SystemUsersEnabled:        appConfig.HostSettings.EnableHostUsers,
+		HostsStatusWebHookEnabled: appConfig.WebhookSettings.HostStatusWebhook.Enable,
 	}, true, nil
 }
 
diff --git a/server/datastore/mysql/statistics_test.go b/server/datastore/mysql/statistics_test.go
index 34583b0ab7..7622289271 100644
--- a/server/datastore/mysql/statistics_test.go
+++ b/server/datastore/mysql/statistics_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/fleetdm/fleet/v4/server/fleet"
+	"github.com/fleetdm/fleet/v4/server/ptr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -28,6 +29,7 @@ func TestStatistics(t *testing.T) {
 }
 
 func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
+	// Create new host for test
 	_, err := ds.NewHost(context.Background(), &fleet.Host{
 		DetailUpdatedAt: time.Now(),
 		LabelUpdatedAt:  time.Now(),
@@ -42,19 +44,73 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	})
 	require.NoError(t, err)
 
+	// Create new user for test
+	_, err = ds.NewUser(context.Background(), &fleet.User{
+		Password:                 []byte("foobar"),
+		AdminForcedPasswordReset: false,
+		Email:                    "baz@example.com",
+		SSOEnabled:               false,
+		GlobalRole:               ptr.String(fleet.RoleObserver),
+	})
+	require.NoError(t, err)
+
+	// Create new team for test
+	_, err = ds.NewTeam(context.Background(), &fleet.Team{
+		Name:        "footeam",
+		Description: "team of foo",
+	})
+	require.NoError(t, err)
+
+	// Create new global policy for test
+	_, err = ds.NewGlobalPolicy(context.Background(), ptr.Uint(1), fleet.PolicyPayload{
+		Name:        "testpolicy",
+		Query:       "select 1;",
+		Description: "test policy desc",
+		Resolution:  "test policy resolution",
+	})
+	require.NoError(t, err)
+
+	// Create new app config for test
+	config, err := ds.NewAppConfig(context.Background(), &fleet.AppConfig{
+		OrgInfo: fleet.OrgInfo{
+			OrgName:    "Test",
+			OrgLogoURL: "localhost:8080/logo.png",
+		},
+	})
+	require.NoError(t, err)
+	config.HostSettings.EnableSoftwareInventory = false
+	config.HostSettings.EnableHostUsers = false
+	config.VulnerabilitySettings.DatabasesPath = "foo/bar"
+	config.WebhookSettings.HostStatusWebhook.Enable = true
+
+	err = ds.SaveAppConfig(context.Background(), config)
+	require.NoError(t, err)
+
+	license := &fleet.LicenseInfo{Tier: "premium"}
+
 	// First time running, we send statistics
-	stats, shouldSend, err := ds.ShouldSendStatistics(context.Background(), fleet.StatisticsFrequency)
+	stats, shouldSend, err := ds.ShouldSendStatistics(context.Background(), fleet.StatisticsFrequency, license)
 	require.NoError(t, err)
 	assert.True(t, shouldSend)
 	assert.NotEmpty(t, stats.AnonymousIdentifier)
+	assert.NotEmpty(t, stats.FleetVersion)
+	assert.Equal(t, stats.LicenseTier, "premium")
 	assert.Equal(t, stats.NumHostsEnrolled, 1)
+	assert.Equal(t, stats.NumUsers, 1)
+	assert.Equal(t, stats.NumTeams, 1)
+	assert.Equal(t, stats.NumPolicies, 1)
+	assert.Equal(t, stats.SoftwareInventoryEnabled, false)
+	assert.Equal(t, stats.SystemUsersEnabled, false)
+	assert.Equal(t, stats.VulnDetectionEnabled, true)
+	assert.Equal(t, stats.HostsStatusWebHookEnabled, true)
+
 	firstIdentifier := stats.AnonymousIdentifier
 
 	err = ds.RecordStatisticsSent(context.Background())
 	require.NoError(t, err)
 
 	// If we try right away, it shouldn't ask to send
-	stats, shouldSend, err = ds.ShouldSendStatistics(context.Background(), fleet.StatisticsFrequency)
+	stats, shouldSend, err = ds.ShouldSendStatistics(context.Background(), fleet.StatisticsFrequency, license)
 	require.NoError(t, err)
 	assert.False(t, shouldSend)
 
@@ -75,7 +131,7 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	require.NoError(t, err)
 
 	// Lower the frequency to trigger an "outdated" sent
-	stats, shouldSend, err = ds.ShouldSendStatistics(context.Background(), time.Millisecond)
+	stats, shouldSend, err = ds.ShouldSendStatistics(context.Background(), time.Millisecond, license)
 	require.NoError(t, err)
 	assert.True(t, shouldSend)
 	assert.Equal(t, firstIdentifier, stats.AnonymousIdentifier)
diff --git a/server/datastore/mysql/teams.go b/server/datastore/mysql/teams.go
index add05bae05..f7997654f3 100644
--- a/server/datastore/mysql/teams.go
+++ b/server/datastore/mysql/teams.go
@@ -252,3 +252,12 @@ func (d *Datastore) TeamEnrollSecrets(ctx context.Context, teamID uint) ([]*flee
 	}
 	return secrets, nil
 }
+
+func amountTeamsDB(db sqlx.Queryer) (int, error) {
+	var amount int
+	err := sqlx.Get(db, &amount, `SELECT count(*) FROM teams`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
diff --git a/server/datastore/mysql/users.go b/server/datastore/mysql/users.go
index 58ed7fb2de..8cfbd53bd1 100644
--- a/server/datastore/mysql/users.go
+++ b/server/datastore/mysql/users.go
@@ -120,7 +120,6 @@ func (d *Datastore) ListUsers(ctx context.Context, opt fleet.UserListOptions) ([
 	}
 
 	return users, nil
-
 }
 
 func (d *Datastore) UserByEmail(ctx context.Context, email string) (*fleet.User, error) {
@@ -275,3 +274,12 @@ func saveTeamsForUserDB(ctx context.Context, tx sqlx.ExtContext, user *fleet.Use
 func (d *Datastore) DeleteUser(ctx context.Context, id uint) error {
 	return d.deleteEntity(ctx, usersTable, id)
 }
+
+func amountUsersDB(db sqlx.Queryer) (int, error) {
+	var amount int
+	err := sqlx.Get(db, &amount, `SELECT count(*) FROM users`)
+	if err != nil {
+		return 0, err
+	}
+	return amount, nil
+}
diff --git a/server/fleet/datastore.go b/server/fleet/datastore.go
index 6ab15dbf10..07aa522adf 100644
--- a/server/fleet/datastore.go
+++ b/server/fleet/datastore.go
@@ -347,7 +347,7 @@ type Datastore interface {
 	///////////////////////////////////////////////////////////////////////////////
 	// StatisticsStore
 
-	ShouldSendStatistics(ctx context.Context, frequency time.Duration) (StatisticsPayload, bool, error)
+	ShouldSendStatistics(ctx context.Context, frequency time.Duration, license *LicenseInfo) (StatisticsPayload, bool, error)
 	RecordStatisticsSent(ctx context.Context) error
 
 	///////////////////////////////////////////////////////////////////////////////
diff --git a/server/fleet/statistics.go b/server/fleet/statistics.go
index 308015cb19..d8ff4d2713 100644
--- a/server/fleet/statistics.go
+++ b/server/fleet/statistics.go
@@ -3,9 +3,17 @@ package fleet
 import "time"
 
 type StatisticsPayload struct {
-	AnonymousIdentifier string `json:"anonymousIdentifier"`
-	FleetVersion        string `json:"fleetVersion"`
-	NumHostsEnrolled    int    `json:"numHostsEnrolled"`
+	AnonymousIdentifier       string `json:"anonymousIdentifier"`
+	FleetVersion              string `json:"fleetVersion"`
+	LicenseTier               string `json:"licenseTier"`
+	NumHostsEnrolled          int    `json:"numHostsEnrolled"`
+	NumUsers                  int    `json:"numUsers"`
+	NumTeams                  int    `json:"numTeams"`
+	NumPolicies               int    `json:"numPolicies"`
+	SoftwareInventoryEnabled  bool   `json:"softwareInventoryEnabled"`
+	VulnDetectionEnabled      bool   `json:"vulnDetectionEnabled"`
+	SystemUsersEnabled        bool   `json:"systemUsersEnabled"`
+	HostsStatusWebHookEnabled bool   `json:"hostsStatusWebHookEnabled"`
 }
 
 const (
diff --git a/server/mock/datastore_mock.go b/server/mock/datastore_mock.go
index 54977e5d4e..2afb69725a 100644
--- a/server/mock/datastore_mock.go
+++ b/server/mock/datastore_mock.go
@@ -277,7 +277,7 @@ type NewActivityFunc func(ctx context.Context, user *fleet.User, activityType st
 
 type ListActivitiesFunc func(ctx context.Context, opt fleet.ListOptions) ([]*fleet.Activity, error)
 
-type ShouldSendStatisticsFunc func(ctx context.Context, frequency time.Duration) (fleet.StatisticsPayload, bool, error)
+type ShouldSendStatisticsFunc func(ctx context.Context, frequency time.Duration, license *fleet.LicenseInfo) (fleet.StatisticsPayload, bool, error)
 
 type RecordStatisticsSentFunc func(ctx context.Context) error
 
@@ -1463,9 +1463,9 @@ func (s *DataStore) ListActivities(ctx context.Context, opt fleet.ListOptions) (
 	return s.ListActivitiesFunc(ctx, opt)
 }
 
-func (s *DataStore) ShouldSendStatistics(ctx context.Context, frequency time.Duration) (fleet.StatisticsPayload, bool, error) {
+func (s *DataStore) ShouldSendStatistics(ctx context.Context, frequency time.Duration, license *fleet.LicenseInfo) (fleet.StatisticsPayload, bool, error) {
 	s.ShouldSendStatisticsFuncInvoked = true
-	return s.ShouldSendStatisticsFunc(ctx, frequency)
+	return s.ShouldSendStatisticsFunc(ctx, frequency, license)
 }
 
 func (s *DataStore) RecordStatisticsSent(ctx context.Context) error {
diff --git a/website/api/controllers/webhooks/receive-usage-analytics.js b/website/api/controllers/webhooks/receive-usage-analytics.js
index 7895e1ca3e..92d7a47870 100644
--- a/website/api/controllers/webhooks/receive-usage-analytics.js
+++ b/website/api/controllers/webhooks/receive-usage-analytics.js
@@ -8,9 +8,18 @@ module.exports = {
 
 
   inputs: {
-    anonymousIdentifier: { required: true, type: 'string', example: '1', description: 'An anonymous identifier telling us which Fleet deployment this is.', },
+    anonymousIdentifier: { required: true, type: 'string', example: '9pnzNmrES3mQG66UQtd29cYTiX2+fZ4CYxDvh495720=', description: 'An anonymous identifier telling us which Fleet deployment this is.', },
     fleetVersion: { required: true, type: 'string', example: 'x.x.x' },
+    licenseTier: { type: 'string', isIn: ['free', 'premium', 'unknown'], defaultsTo: 'unknown' },
     numHostsEnrolled: { required: true, type: 'number', min: 0, custom: (num) => Math.floor(num) === num },
+    numUsers: { type: 'number', defaultsTo: 0 },
+    numTeams: { type: 'number', defaultsTo: 0 },
+    numPolicies: { type: 'number', defaultsTo: 0 },
+    numLabels: { type: 'number', defaultsTo: 0 },
+    softwareInventoryEnabled: { type: 'boolean', defaultsTo: false },
+    vulnDetectionEnabled: { type: 'boolean', defaultsTo: false },
+    systemUsersEnabled: { type: 'boolean', defaultsTo: false },
+    hostStatusWebhookEnabled: { type: 'boolean', defaultsTo: false },
   },
 
 
@@ -19,13 +28,9 @@ module.exports = {
   },
 
 
-  fn: async function ({anonymousIdentifier, fleetVersion, numHostsEnrolled}) {
+  fn: async function (inputs) {
 
-    await HistoricalUsageSnapshot.create({
-      anonymousIdentifier,
-      fleetVersion,
-      numHostsEnrolled
-    });
+    await HistoricalUsageSnapshot.create(inputs);
 
   }
 
diff --git a/website/api/models/HistoricalUsageSnapshot.js b/website/api/models/HistoricalUsageSnapshot.js
index 04defe0292..aac2a7aaad 100644
--- a/website/api/models/HistoricalUsageSnapshot.js
+++ b/website/api/models/HistoricalUsageSnapshot.js
@@ -12,9 +12,18 @@ module.exports = {
     //  ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦  ╦╔═╗╔═╗
     //  ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
     //  ╩  ╩╚═╩╩ ╩╩ ╩ ╩ ╚╝ ╚═╝╚═╝
-    anonymousIdentifier: { required: true, type: 'string', example: '1', description: 'An anonymous identifier telling us which Fleet deployment this is.', },
+    anonymousIdentifier: { required: true, type: 'string', example: '9pnzNmrES3mQG66UQtd29cYTiX2+fZ4CYxDvh495720=', description: 'An anonymous identifier telling us which Fleet deployment this is.', },
     fleetVersion: { required: true, type: 'string', example: 'x.x.x' },
+    licenseTier: { required: true, type: 'string', example: 'free' },
     numHostsEnrolled: { required: true, type: 'number', min: 0, custom: (num) => Math.floor(num) === num },
+    numUsers: { required: true, type: 'number' },
+    numTeams: { required: true, type: 'number' },
+    numPolicies: { required: true, type: 'number' },
+    numLabels: { required: true, type: 'number' },
+    softwareInventoryEnabled: { required: true, type: 'boolean' },
+    vulnDetectionEnabled: { required: true, type: 'boolean' },
+    systemUsersEnabled: { required: true, type: 'boolean' },
+    hostStatusWebhookEnabled: { required: true, type: 'boolean' },
 
     //  ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
     //  ║╣ ║║║╠╩╗║╣  ║║╚═╗