From e01868ca5e177d28f91eb77a9eeb8e38cf7ae80f Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Wed, 9 May 2018 13:45:01 +0200 Subject: [PATCH] Remove references to obsolete addon collector (retired in 2012) --- settings.py | 2 -- src/olympia/lib/settings_base.py | 3 --- src/olympia/stats/tasks.py | 3 --- 3 files changed, 8 deletions(-) diff --git a/settings.py b/settings.py index 7fbe770aec..da29cfebb6 100644 --- a/settings.py +++ b/settings.py @@ -79,8 +79,6 @@ SERVICES_URL = SITE_URL ALLOWED_HOSTS = ALLOWED_HOSTS + [SERVICES_DOMAIN] -ADDON_COLLECTOR_ID = 1 - # Default AMO user id to use for tasks (from users.json fixture in zadmin). TASK_USER_ID = 10968 diff --git a/src/olympia/lib/settings_base.py b/src/olympia/lib/settings_base.py index ba8a602a89..169a431d9c 100644 --- a/src/olympia/lib/settings_base.py +++ b/src/olympia/lib/settings_base.py @@ -1637,9 +1637,6 @@ JINGO_MINIFY_USE_STATIC = True # Allow URL style format override. eg. "?format=json" URL_FORMAT_OVERRIDE = 'format' -# Add on used to collect stats (!technical dept around!) -ADDON_COLLECTOR_ID = 11950 - # Connection to the hive server. HIVE_CONNECTION = { 'host': 'peach-gw.peach.metrics.scl3.mozilla.com', diff --git a/src/olympia/stats/tasks.py b/src/olympia/stats/tasks.py index 636d8d23b3..b94810f6b9 100644 --- a/src/olympia/stats/tasks.py +++ b/src/olympia/stats/tasks.py @@ -1,7 +1,6 @@ import datetime import itertools -from django.conf import settings from django.db import connection from django.db.models import Max, Sum @@ -180,8 +179,6 @@ def _get_metrics_jobs(date=None): stats = { 'addon_total_updatepings': lambda: UpdateCount.objects.filter( date=date).aggregate(sum=Sum('count'))['sum'], - 'collector_updatepings': lambda: UpdateCount.objects.get( - addon=settings.ADDON_COLLECTOR_ID, date=date).count, } return stats