From fd2a1787d46eb48290cadee7d79becc193bf4c11 Mon Sep 17 00:00:00 2001 From: Alex Stuart Date: Wed, 27 Mar 2024 10:12:07 +0000 Subject: [PATCH] Remove machinery for generating stats for wugen See ukf/ukf-meta#398 for details --- utilities/stats-generate.sh | 18 ------------------ utilities/stats-sync.sh | 3 --- 2 files changed, 21 deletions(-) diff --git a/utilities/stats-generate.sh b/utilities/stats-generate.sh index 7017fed..5682485 100755 --- a/utilities/stats-generate.sh +++ b/utilities/stats-generate.sh @@ -596,19 +596,6 @@ fi # ukf-meta issue 338: These have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669 - -# ===== -# Wugen stats -# ===== - -# Total WAYFless URLs generated -#wugencount=$(grep $date $logslocation/wugen/urlgenerator-audit.* $logslocation/wugen/wayfless-url-generator-audit.* | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') -wugencount=$(grep -s $date $logslocation/wugen/wayfless-url-generator-process.* | grep "Returning wayfless url" | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') - -# New subscribers to WAYFless URLs -wugennewsubs=$(grep -s $date $logslocation/wugen/urlgenerator-process.* $logslocation/wugen/wayfless-url-generator-process.* | grep "Subscribing user and service provider" | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') - - # ===== # Test IdP stats # ===== @@ -695,7 +682,6 @@ if [[ "$timeperiod" == "day" ]]; then msg+=">-> $mdqminqueriesperip/$mdqavgqueriesperip/$mdqmaxqueriesperip min/avg/max queries per querying IP\n" msg+=">-> $mdqcountallentities queries for collection of all entities\n" msg+=">*CDS:* These have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669\n" - msg+=">*Wugen:* $wugencount WAYFless URLs generated, $wugennewsubs new subscriptions.\n" msg+=">*Test IdP:* $testidplogincount logins to $testidpspcount SPs.\n" msg+=">*Test SP:* $testsplogincount logins from $testspidpcount IdPs.\n" msg+=">*Website:* $wwwaccesscountfriendly hits from $wwwaccessipcount unique IPs." @@ -747,10 +733,6 @@ else msg+="Central Discovery Service:\n" msg+="These stats have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669\n" msg+="\n-----\n" - msg+="Wugen:\n" - msg+="-> $wugencount WAYFless URLs generated\n" - msg+="-> $wugennewsubs new subscriptions.\n" - msg+="\n-----\n" msg+="Test IdP usage:\n" msg+="-> $testidplogincount logins to $testidpspcount SPs.\n" msg+="\n-> Logins per test user:\n" diff --git a/utilities/stats-sync.sh b/utilities/stats-sync.sh index d90b19a..d97dc16 100755 --- a/utilities/stats-sync.sh +++ b/utilities/stats-sync.sh @@ -19,9 +19,6 @@ rsync -at --exclude modsec* stats@md-we-02:/var/log/httpd/* $logslocation/md/md- rsync -at --exclude modsec* stats@www-ne-01:/var/log/httpd/* $logslocation/www/www-ne-01/ rsync -at --exclude modsec* stats@www-we-01:/var/log/httpd/* $logslocation/www/www-we-01/ -# Logs from Wugen -rsync -at stats@dockerpub-ne-01:./wugen/wayfless-* $logslocation/wugen/ - # Logs from Test IdP rsync -at --exclude modsec* stats@test-idp:/var/log/httpd/* $logslocation/test-idp/ rsync -at stats@test-idp:/opt/shibboleth-idp/logs/idp-audit* $logslocation/test-idp/