Skip to content

Add R30v2 metric to Panopticon. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reivilibre merged 4 commits into from
Aug 6, 2021
Merged

Add R30v2 metric to Panopticon. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e257d1c
Run go fmt
reivilibre Jul 7, 2021
dfe1114
Add R30v2
reivilibre Jul 7, 2021
573791f
Add r30v2 to database
reivilibre Jul 7, 2021
6c65adf
Add test for R30v2
reivilibre Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,35 @@ var (
type StatsReport struct {
Homeserver string
LocalTimestamp int64 // Seconds since epoch, UTC
RemoteTimestamp *int64 `json:"timestamp"` // Seconds since epoch, UTC
UptimeSeconds *int64 `json:"uptime_seconds"` // Seconds since last restart
TotalUsers *int64 `json:"total_users"` // Total users in users table
TotalNonBridgedUsers *int64 `json:"total_nonbridged_users"` // Total native and guest users in users table
TotalRoomCount *int64 `json:"total_room_count"` // Total number of rooms on the server
DailyActiveUsers *int64 `json:"daily_active_users"` // Total number of users in the users ips table seen in the last 24 hours
DailyMessages *int64 `json:"daily_messages"` // Total number of m.room.message in events table in the past 24 hours
DailySentMessages *int64 `json:"daily_sent_messages"` // Total number of m.room.message in events table in the past 24 hours sent from host server
DailyActiveRooms *int64 `json:"daily_active_rooms"` // Total number of rooms with a m.room.message in the event table in the past 24 hours
DailyE2eeMessages *int64 `json:"daily_e2ee_messages"` // Total number of m.room.encrypted in events table in the past 24 hours
RemoteTimestamp *int64 `json:"timestamp"` // Seconds since epoch, UTC
UptimeSeconds *int64 `json:"uptime_seconds"` // Seconds since last restart
TotalUsers *int64 `json:"total_users"` // Total users in users table
TotalNonBridgedUsers *int64 `json:"total_nonbridged_users"` // Total native and guest users in users table
TotalRoomCount *int64 `json:"total_room_count"` // Total number of rooms on the server
DailyActiveUsers *int64 `json:"daily_active_users"` // Total number of users in the users ips table seen in the last 24 hours
DailyMessages *int64 `json:"daily_messages"` // Total number of m.room.message in events table in the past 24 hours
DailySentMessages *int64 `json:"daily_sent_messages"` // Total number of m.room.message in events table in the past 24 hours sent from host server
DailyActiveRooms *int64 `json:"daily_active_rooms"` // Total number of rooms with a m.room.message in the event table in the past 24 hours
DailyE2eeMessages *int64 `json:"daily_e2ee_messages"` // Total number of m.room.encrypted in events table in the past 24 hours
DailySentE2eeMessages *int64 `json:"daily_sent_e2ee_messages"` // Total number of m.room.encrypted in events table in the past 24 hours sent from host server
DailyActiveE2eeRooms *int64 `json:"daily_active_e2ee_rooms"` // Total number of rooms with a m.room.encrypted in the event table in the past 24 hours
MonthlyActiveUsers *int64 `json:"monthly_active_users"` // Total number of users in the users ips table seen in the last 30 days
R30UsersAll *int64 `json:"r30_users_all"` // r30 stat for all users regardless of client
R30UsersAndroid *int64 `json:"r30_users_android"` // r30 stat considering only Riot Android
R30UsersIOS *int64 `json:"r30_users_ios"` // r30 stat considering only Riot iOS
R30UsersElectron *int64 `json:"r30_users_electron"` // r30 stat considering only Riot Electron
R30UsersWeb *int64 `json:"r30_users_web"` // r30 stat considering only web clients (must assume they are Riot)
DailyActiveE2eeRooms *int64 `json:"daily_active_e2ee_rooms"` // Total number of rooms with a m.room.encrypted in the event table in the past 24 hours
MonthlyActiveUsers *int64 `json:"monthly_active_users"` // Total number of users in the users ips table seen in the last 30 days
R30UsersAll *int64 `json:"r30_users_all"` // r30 stat for all users regardless of client
R30UsersAndroid *int64 `json:"r30_users_android"` // r30 stat considering only Riot Android
R30UsersIOS *int64 `json:"r30_users_ios"` // r30 stat considering only Riot iOS
R30UsersElectron *int64 `json:"r30_users_electron"` // r30 stat considering only Riot Electron
R30UsersWeb *int64 `json:"r30_users_web"` // r30 stat considering only web clients (must assume they are Riot)
R30V2UsersAll *int64 `json:"r30v2_users_all"` // r30v2 stat for all users regardless of client
R30V2UsersAndroid *int64 `json:"r30v2_users_android"` // r30v2 stat considering only Riot Android
R30V2UsersIOS *int64 `json:"r30v2_users_ios"` // r30v2 stat considering only Riot iOS
R30V2UsersElectron *int64 `json:"r30v2_users_electron"` // r30v2 stat considering only Riot Electron
R30V2UsersWeb *int64 `json:"r30v2_users_web"` // r30v2 stat considering only web clients (must assume they are Riot)
MemoryRSS *int64 `json:"memory_rss"`
CPUAverage *int64 `json:"cpu_average"`
CacheFactor *float64 `json:"cache_factor"`
EventCacheSize *int64 `json:"event_cache_size"`
DailyUserTypeNative *int64 `json:"daily_user_type_native"` // New native users in users table in last 24 hours
DailyUserTypeGuest *int64 `json:"daily_user_type_guest"` // New guest users in users table in the last 24 hours
DailyUserTypeNative *int64 `json:"daily_user_type_native"` // New native users in users table in last 24 hours
DailyUserTypeGuest *int64 `json:"daily_user_type_guest"` // New guest users in users table in the last 24 hours
DailyUserTypeBridged *int64 `json:"daily_user_type_bridged"` // New bridged users in the users table in the last 24 hours
PythonVersion string `json:"python_version"`
DatabaseEngine string `json:"database_engine"`
Expand Down Expand Up @@ -145,6 +150,12 @@ func (r *Recorder) Save(sr StatsReport) error {
cols, vals = appendIfNonNil(cols, vals, "r30_users_electron", sr.R30UsersElectron)
cols, vals = appendIfNonNil(cols, vals, "r30_users_web", sr.R30UsersWeb)

cols, vals = appendIfNonNil(cols, vals, "r30v2_users_all", sr.R30V2UsersAll)
cols, vals = appendIfNonNil(cols, vals, "r30v2_users_android", sr.R30V2UsersAndroid)
cols, vals = appendIfNonNil(cols, vals, "r30v2_users_ios", sr.R30V2UsersIOS)
cols, vals = appendIfNonNil(cols, vals, "r30v2_users_electron", sr.R30V2UsersElectron)
cols, vals = appendIfNonNil(cols, vals, "r30v2_users_web", sr.R30V2UsersWeb)

cols, vals = appendIfNonEmpty(cols, vals, "forwarded_for", sr.XForwardedFor)
cols, vals = appendIfNonEmpty(cols, vals, "user_agent", sr.UserAgent)

Expand Down Expand Up @@ -244,6 +255,11 @@ func createTable(db *sql.DB) error {
r30_users_ios BIGINT,
r30_users_electron BIGINT,
r30_users_web BIGINT,
r30v2_users_all BIGINT,
r30v2_users_android BIGINT,
r30v2_users_ios BIGINT,
r30v2_users_electron BIGINT,
r30v2_users_web BIGINT,
cpu_average BIGINT,
memory_rss BIGINT,
cache_factor DOUBLE,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_push_good.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
. $(dirname $0)/setup.sh
log "Testing /push with beyond 1.22.0 pushes"

assert_eq "{}" "$(curl -k -d '{"daily_active_users": 10, "timestamp": 20, "total_users": 123, "total_room_count": 17, "daily_messages": 9, "uptime_seconds": 19, "r30_users_all": 5, "r30_users_android": 4, "r30_users_ios": 3, "r30_users_electron": 2, "r30_users_web": 1, "daily_user_type_native": 21, "daily_user_type_guest": 22, "daily_user_type_bridged": 23, "homeserver": "many.turtles", "memory_rss": 12, "cpu_average": 125, "cache_factor": 5.501, "event_cache_size": 10000, "python_version":"3.6.1", "database_engine":"PostgreSql", "database_server_version":"9.5.0", "server_context":"my_context", "log_level":"INFO", "monthly_active_users": 15}' http://localhost:${port}/push 2>/dev/null)"
assert_eq "{}" "$(curl -k -d '{"daily_active_users": 10, "timestamp": 20, "total_users": 123, "total_room_count": 17, "daily_messages": 9, "uptime_seconds": 19, "r30_users_all": 5, "r30_users_android": 4, "r30_users_ios": 3, "r30_users_electron": 2, "r30_users_web": 1, "r30v2_users_all": 4, "r30v2_users_android": 3, "r30v2_users_ios": 2, "r30v2_users_electron": 1, "r30v2_users_web": 0, "daily_user_type_native": 21, "daily_user_type_guest": 22, "daily_user_type_bridged": 23, "homeserver": "many.turtles", "memory_rss": 12, "cpu_average": 125, "cache_factor": 5.501, "event_cache_size": 10000, "python_version":"3.6.1", "database_engine":"PostgreSql", "database_server_version":"9.5.0", "server_context":"my_context", "log_level":"INFO", "monthly_active_users": 15}' http://localhost:${port}/push 2>/dev/null)"

assert_eq "10|123|17|9|20|19|5|4|3|2|1|21|22|23|125|12|5.501|10000|3.6.1|PostgreSql|9.5.0|my_context|INFO|15" "$(sqlite3 ${dir}/stats.db 'SELECT daily_active_users, total_users, total_room_count, daily_messages, remote_timestamp, uptime_seconds, r30_users_all, r30_users_android, r30_users_ios, r30_users_electron, r30_users_web, daily_user_type_native, daily_user_type_guest, daily_user_type_bridged, cpu_average, memory_rss, cache_factor, event_cache_size, python_version, database_engine, database_server_version, server_context, log_level, monthly_active_users FROM stats WHERE homeserver == "many.turtles"')"
assert_eq "10|123|17|9|20|19|5|4|3|2|1|4|3|2|1|0|21|22|23|125|12|5.501|10000|3.6.1|PostgreSql|9.5.0|my_context|INFO|15" "$(sqlite3 ${dir}/stats.db 'SELECT daily_active_users, total_users, total_room_count, daily_messages, remote_timestamp, uptime_seconds, r30_users_all, r30_users_android, r30_users_ios, r30_users_electron, r30_users_web, r30v2_users_all, r30v2_users_android, r30v2_users_ios, r30v2_users_electron, r30v2_users_web, daily_user_type_native, daily_user_type_guest, daily_user_type_bridged, cpu_average, memory_rss, cache_factor, event_cache_size, python_version, database_engine, database_server_version, server_context, log_level, monthly_active_users FROM stats WHERE homeserver == "many.turtles"')"


assert_eq "1" "$(sqlite3 ${dir}/stats.db 'SELECT COUNT(*) AS count FROM stats WHERE homeserver == "many.turtles" AND (remote_addr LIKE "127.0.0.1%" OR remote_addr LIKE "[::1]%")')"
Expand Down