diff --git a/cmd/aggregate/main.go b/cmd/aggregate/main.go index 25e6ddd2..f9e0d857 100644 --- a/cmd/aggregate/main.go +++ b/cmd/aggregate/main.go @@ -203,7 +203,7 @@ func aggregateUserMovement(db *sql.DB) (int64, error) { var sumRows []sumRow for t := minTs; t.Before(time.Now().Truncate(24 * time.Hour)); t = t.AddDate(0, 0, 1) { var added, removed, bounced int - old := t.Before(time.Now().AddDate(0, 0, -14)) + old := t.Before(time.Now().AddDate(0, 0, -30)) for id, first := range firstSeen { last := lastSeen[id] if first.Equal(t) && last.Equal(t) && old { diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go index e2fb5c43..8537c420 100644 --- a/cmd/ursrv/main.go +++ b/cmd/ursrv/main.go @@ -212,7 +212,6 @@ func setupDB(db *sql.DB) error { var t string row := db.QueryRow(`SELECT 'UniqueIDIndex'::regclass`) if err := row.Scan(&t); err != nil { - log.Println(err) if _, err = db.Exec(`CREATE UNIQUE INDEX UniqueIDIndex ON Reports (Date, UniqueID)`); err != nil { return err } @@ -875,7 +874,7 @@ func (s *summary) MarshalJSON() ([]byte, error) { func getSummary(db *sql.DB) (summary, error) { s := newSummary() - rows, err := db.Query(`SELECT Day, Version, Count FROM VersionSummary WHERE Day > now() - '1 year'::INTERVAL;`) + rows, err := db.Query(`SELECT Day, Version, Count FROM VersionSummary WHERE Day > now() - '2 year'::INTERVAL;`) if err != nil { return summary{}, err } @@ -907,7 +906,7 @@ func getSummary(db *sql.DB) (summary, error) { } func getMovement(db *sql.DB) ([][]interface{}, error) { - rows, err := db.Query(`SELECT Day, Added, Removed, Bounced FROM UserMovement WHERE Day > now() - '1 year'::INTERVAL ORDER BY Day`) + rows, err := db.Query(`SELECT Day, Added, Removed, Bounced FROM UserMovement WHERE Day > now() - '2 year'::INTERVAL ORDER BY Day`) if err != nil { return nil, err } diff --git a/static/index.html b/static/index.html index f555ee8f..e7bbce7e 100644 --- a/static/index.html +++ b/static/index.html @@ -41,7 +41,6 @@ found in the LICENSE file. @@ -157,9 +121,6 @@ found in the LICENSE file. Reappearance of users cause the "left" data to shrink retroactively.

-
- -

Usage Metrics

This is the aggregated usage report data for the last 24 hours. Data based on {{.nodes}} devices that have reported in.