log preflight events (#37)

brandonfriess-stripe · web-flow · commit 0c69c5233bb4 · 2024-02-01T10:02:01.000-06:00
diff --git a/moroz/svc_preflight.go b/moroz/svc_preflight.go
@@ -66,6 +66,7 @@ func (mw logmw) Preflight(ctx context.Context, machineID string, p santa.Preflig
 		_ = mw.logger.Log(
 			"method", "Preflight",
 			"machine_id", machineID,
+			"preflight_payload", p,
 			"err", err,
 			"took", time.Since(begin),
 		)
diff --git a/santa/santa.go b/santa/santa.go
@@ -37,15 +37,20 @@ type Preflight struct {
 
 // A PreflightPayload represents the request sent by a santa client to the sync server.
 type PreflightPayload struct {
-	OSBuild              string     `json:"os_build"`
-	SantaVersion         string     `json:"santa_version"`
+	SerialNumber         string     `json:"serial_num"`
 	Hostname             string     `json:"hostname"`
 	OSVersion            string     `json:"os_version"`
-	CertificateRuleCount int        `json:"certificate_rule_count"`
+	OSBuild              string     `json:"os_build"`
+	ModelIdentifier      string     `json:"model_identifier"`
+	SantaVersion         string     `json:"santa_version"`
+	PrimaryUser          string     `json:"primary_user"`
 	BinaryRuleCount      int        `json:"binary_rule_count"`
+	CertificateRuleCount int        `json:"certificate_rule_count"`
+	CompilerRuleCount    int        `json:"compiler_rule_count"`
+	TransitiveRuleCount  int        `json:"transitive_rule_count"`
+	TeamIDRuleCount      int        `json:"teamid_rule_count"`
 	ClientMode           ClientMode `json:"client_mode"`
-	SerialNumber         string     `json:"serial_num"`
-	PrimaryUser          string     `json:"primary_user"`
+	RequestCleanSync     bool       `json:"request_clean_sync"`
 }
 
 // EventPayload represents derived metadata for events uploaded with the UploadEvent endpoint.

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func (mw logmw) Preflight(ctx context.Context, machineID string, p santa.Preflig`
`66`	`66`	`_ = mw.logger.Log(`
`67`	`67`	`"method", "Preflight",`
`68`	`68`	`"machine_id", machineID,`
	`69`	`+ "preflight_payload", p,`
`69`	`70`	`"err", err,`
`70`	`71`	`"took", time.Since(begin),`
`71`	`72`	`)`