Add a few more metrics

Author: strugee

seagl-scripts/.gitignore

@@ -0,0 +1 @@
+/node_modules

seagl-scripts/get-metrics.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -euo pipefail
 
@@ -10,17 +10,29 @@ function prompt_continue() {
 }
 
 function remote_psql() {
-	ssh -t $(date +%Y)-ephemeral.host.seagl.org sudo docker exec -it matrix-postgres psql ${2-} -c \""$1"\" synapse
+	# LogLevel suppresses disconnection messages - https://superuser.com/a/1172143/121259
+	# See also https://serverfault.com/a/981481/167999 for pager=off
+	ssh -o LogLevel=QUIET -t $(date +%Y)-ephemeral.host.seagl.org sudo docker exec -it matrix-postgres psql -P pager=off ${2-} -c \""$1"\" synapse
 }
 
 echo You will need to review the users database to make sure we\'re eliminating all staff/test users.
 prompt_continue
 
-eliminators="name NOT SIMILAR TO '@room-[[:digit:]]+:$(date +%Y).seagl.org' AND admin = 0 AND name NOT IN $elimination_set"
-remote_psql "SELECT name, admin, user_type, deactivated, approved, locked, suspended FROM users WHERE $eliminators;"
+with_nonstaff_clause="WITH non_staff_users AS (SELECT "'*'" FROM users WHERE name NOT SIMILAR TO '@room-[[:digit:]]+:$(date +%Y).seagl.org' AND admin = 0 AND name NOT IN $elimination_set)"
+remote_psql "$with_nonstaff_clause SELECT name, admin, user_type, deactivated, approved, locked, suspended FROM non_staff_users;"
 
 echo 'If there are staff users still present in the listing, ^C to abort this script, edit it, and then try again.'
 prompt_continue
 
 printf 'Number of non-staff/test accounts registered on ephemeral homeserver: '
-remote_psql "SELECT COUNT("'*'") FROM users WHERE $eliminators;" -t | tr -d ' '
+remote_psql "$with_nonstaff_clause SELECT COUNT("'*'") FROM non_staff_users;" -t | tr -d ' '
+
+echo 'Ephemeral homeserver device registrations, excluding staff:'
+echo '(suppressed due to suspected attend portal bugginess - device names did not correspond to UAs)'
+echo
+#remote_psql "$with_nonstaff_clause SELECT display_name AS \\\"Device display name\\\", COUNT(display_name) AS \\\"Registered devices\\\" FROM devices INNER JOIN non_staff_users ON non_staff_users.name = devices.user_id WHERE display_name != 'master signing key' AND display_name != 'self_signing signing key' AND display_name != 'user_signing signing key' GROUP BY display_name;"
+
+echo 'Ephemeral homeserver device registration count, excluding staff:'
+remote_psql "$with_nonstaff_clause SELECT count AS \\\"Number of devices registered\\\", COUNT(count) AS \\\"Users in population\\\" FROM (SELECT user_id, COUNT(user_id) FROM devices INNER JOIN non_staff_users ON non_staff_users.name = devices.user_id WHERE display_name != 'master signing key' AND display_name != 'self_signing signing key' AND display_name != 'user_signing signing key' GROUP BY user_id) GROUP BY count;"
+
+remote_psql "$with_nonstaff_clause SELECT user_agent FROM devices INNER JOIN non_staff_users ON non_staff_users.name = devices.user_id WHERE display_name != 'master signing key' AND display_name != 'self_signing signing key' AND display_name != 'user_signing signing key';" -t | grep -Ev '\([[:digit:]]+ rows\)' | node $(dirname $BASH_SOURCE)/process-uas.js | sort | uniq -c | sort -rh | sed 's/^[[:space:]]*//' | column -t -s' ' --table-columns-limit 2 -o ' | '

seagl-scripts/package-lock.json

@@ -0,0 +1,15 @@
+{
+  "name": "seagl-scripts",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "AJ Jordan <alex@strugee.net>",
+  "license": "LGPL-3.0+",
+  "private": true,
+  "dependencies": {
+    "ua-parser-js": "^2.0.6"
+  }
+}

seagl-scripts/package.json

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+var UAParser = require('ua-parser-js');
+var readline = require('readline');
+
+var rl = readline.createInterface({
+	input: process.stdin,
+	output: process.stdout,
+	terminal: false
+});
+
+rl.on('line', function(line) {
+	line = line.trim();
+	if (!line) return;
+	if (line.includes(' rows)')) process.exit(0);
+
+	var parser = new UAParser(line);
+	var result = parser.getResult();
+	console.log(`${result.browser.name || 'unknown'}:${result.os.name.replaceAll(' ', '_') || 'unknown'}`);
+});