Ottomata has submitted this change and it was merged. Change subject: Ignore traffic from cache-local SSL terminators ......................................................................
Ignore traffic from cache-local SSL terminators Since https://gerrit.wikimedia.org/r/#/c/175465/ all caches (not only ulsfo's caches) come with their own SSL terminator. So we ignore requests from the subnets of the caches to not count SSL requests twice. This change will slow down filter by ~5%. But as the filter process is running at <20% utilization of a CPU after fixing the compiler optimization flag, the additional ~5% should be fine. Also this change stops counting some monitoring requests (which seems fair), and also has some few false negatives, as not counting requests from xenon. Bug: T76390 Change-Id: Ic6e1f8e6f58091b2274a3ab45ddfe38bc9489591 --- M filter.c M tests/test.sh 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/filter.c b/filter.c index 00921e9..663bb24 100644 --- a/filter.c +++ b/filter.c @@ -48,6 +48,9 @@ */ char *dupes[] = { + "10.20.0.", + "10.64.0.", + "10.64.32.", "10.128.0.", "208.80.152.", "208.80.153.", diff --git a/tests/test.sh b/tests/test.sh index d7f536b..ab8e435 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -350,6 +350,9 @@ LOG_LINE_IP="208.80.155.3" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/208.80.155.x' LOG_LINE_IP="91.198.174.5" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/91.198.141.x' LOG_LINE_IP="10.128.0.108" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/10.128.0.x' +LOG_LINE_IP="10.20.0.109" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/10.20.0.x/cp3013-cp3018__amssq31-amssq47' +LOG_LINE_IP="10.64.0.110" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/10.64.0.x/cp1059-cp1068' +LOG_LINE_IP="10.64.32.111" ; assert_not_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/10.64.32.x/cp1046-cp1055' # Then some internal IP addresses not covered by 'filter'. LOG_LINE_IP="198.35.26.6" ; assert_counted 'http://en.wikipedia.org/wiki/Idiosyncrasy/Do_not_count_internal/198.35.26.x_not_covered' 'en' 'Idiosyncrasy/Do_not_count_internal/198.35.26.x_not_covered' -- To view, visit https://gerrit.wikimedia.org/r/177101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6e1f8e6f58091b2274a3ab45ddfe38bc9489591 Gerrit-PatchSet: 1 Gerrit-Project: analytics/webstatscollector Gerrit-Branch: master Gerrit-Owner: QChris <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
