mirrors
/
munin-contrib
mirror of https://github.com/munin-monitoring/contrib.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirrors:294a1a2606405e7b2a4b459810683a292665ef22
Branches Tags
mirrors:master
mirrors:lxc-multigraph
mirrors:0.2013.02.12
...
compare: mirrors:e9f84a12e15f7fd3613c77ec005bd874a94fe464
Branches Tags
mirrors:master
mirrors:lxc-multigraph
mirrors:0.2013.02.12

2 Commits
294a1a2606 ... e9f84a12e1

Author SHA1 Message Date
Kenyon Ralph e9f84a12e1
Merge pull request #1436 from brknkfr/synapse_fix-puppets-count 
[synapse_] Fix for last PR (fix counting puppets)
 2024-05-07 11:20:09 -07:00
Sebastian L. bb301ab215 [synapse_] Fix couting 'inactive' bots as puppets / Fix comparing empty '' 2024-05-06 12:35:49 +02:00
1 changed files with 7 additions and 8 deletions
Show Stats Expand all files Collapse all files

15
plugins/synapse/synapse_
View File

@ -174,23 +174,22 @@ REPORTS=$(fetch_url -H "Authorization: Bearer ${AUTH_TOKEN}" "${SCHEME}${HOMESER
echo multigraph synapse_users_"${CLEANHOMESERVER}"
if USERS="$(echo "$USERS" | jq -r)"; then
total="$(echo "$USERS" | jq -r .total)"
puppets="$(echo "$USERS" | grep -c '"last_seen_ts": null')"
bots="$(echo "$USERS" | grep -c '"user_type": "bot"')"
total="$(echo "$USERS" | jq -r .total)"
puppets="$(echo "$USERS" | jq -r '.users[] | select(.deactivated!="1") | select(.user_type!="bot")' | grep -c '"last_seen_ts": null')"
bots="$(echo "$USERS" | jq -r '.users[] | select(.deactivated!="1")' | grep -c '"user_type": "bot"')"
virtual_users=$(( puppets + bots ))
total_registered=$(( total - virtual_users ))
echo total_registered.value "$total_registered"
active="$(echo "$USERS" | grep -c '"deactivated": 0')"
active="$(echo "$USERS" | grep -c '"deactivated": 0')"
active_users=$(( active - virtual_users ))
echo total_registered.value "$total_registered"
echo active_users.value "$active_users"
echo bots.value "$bots"
# Convert to miliseconds
time_ms=$(($(date +%s) * 1000))
interval_ms=$((INTERVAL * 1000))
time_interval_ago=$(( time_ms - interval_ms ))
last_seen_times_ms=$(echo "$USERS" | grep -E "\"last_seen_ts\": [0-9]+")
online="$(echo "$last_seen_times_ms" | awk -v "count=0" -F": " '$2 > "'$time_interval_ago'" {count++} END {print count}')"
online_users=$(( online - bots ))
last_seen_times_ms=$(echo "$USERS" | jq -r '.users[] | select(.user_type!="bot") | select(.deactivated!="1")' | grep -E "\"last_seen_ts\": [0-9]+")
online_users="$(echo "$last_seen_times_ms" | awk -v "count=0" -F": " '$2 > "'$time_interval_ago'" {count++} END {print count}')"
echo online_users.value "$online_users"
echo deactivated_users.value "$(echo "$USERS" | grep -c '"deactivated": 1')"
echo erased_users.value "$(echo "$USERS" | grep -c '"erased": true')"