centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save only organizations with integrations in cache (#2190)

Browse source 
Save only organizations with integrations in cache for collecting
metrics
This commit is contained in:
Yulya Artyukhina 2023-06-13 15:31:14 +02:00 • committed by GitHub
parent 57b62c269c
commit 0271cdb8a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/apps/metrics_exporter/helpers.py
View file

@ -21,13 +21,23 @@ from apps.metrics_exporter.constants import (
)
def get_organization_ids_from_db():
AlertReceiveChannel = apps.get_model("alerts", "AlertReceiveChannel")
# get only not deleted organizations that have integrations
organizations_ids = (
AlertReceiveChannel.objects.filter(organization__deleted_at__isnull=True)
.values_list("organization_id", flat=True)
.distinct()
)
organizations_ids = list(organizations_ids)
return organizations_ids
def get_organization_ids():
"""Try getting organizations ids from cache, otherwise get from db and save values in cache"""
Organization = apps.get_model("user_management", "Organization")
"""Try to get organizations ids from cache, otherwise get from db and save values in cache"""
organizations_ids = cache.get(METRICS_ORGANIZATIONS_IDS, [])
if not organizations_ids:
organizations_ids = Organization.objects.all().values_list("id", flat=True)
organizations_ids = list(organizations_ids)
organizations_ids = get_organization_ids_from_db()
cache.set(organizations_ids, METRICS_ORGANIZATIONS_IDS, METRICS_ORGANIZATIONS_IDS_CACHE_TIMEOUT)
return organizations_ids

11
engine/apps/metrics_exporter/tasks.py
View file

@ -19,9 +19,9 @@ from apps.metrics_exporter.helpers import (
get_metric_alert_groups_total_key,
get_metrics_cache_timer_key,
get_metrics_recalculation_timeout,
get_organization_ids_from_db,
get_response_time_period,
)
from apps.user_management.models import Organization
from common.custom_celery_tasks import shared_dedicated_queue_retry_task
from common.database import get_random_readonly_database_key_if_present_otherwise_default
@ -30,8 +30,7 @@ from common.database import get_random_readonly_database_key_if_present_otherwis
autoretry_for=(Exception,), retry_backoff=True, max_retries=1 if settings.DEBUG else None
)
def save_organizations_ids_in_cache():
organizations_ids = Organization.objects.all().values_list("id", flat=True)
organizations_ids = list(organizations_ids)
organizations_ids = get_organization_ids_from_db()
cache.set(organizations_ids, METRICS_ORGANIZATIONS_IDS, METRICS_ORGANIZATIONS_IDS_CACHE_TIMEOUT)
@ -80,11 +79,7 @@ def calculate_and_cache_metrics(organization_id, force=False):
integrations = (
AlertReceiveChannel.objects.using(get_random_readonly_database_key_if_present_otherwise_default())
.filter(
~Q(integration=AlertReceiveChannel.INTEGRATION_MAINTENANCE)
& Q(organization__deleted_at__isnull=True)
& Q(organization_id=organization_id)
)
.filter(~Q(integration=AlertReceiveChannel.INTEGRATION_MAINTENANCE) & Q(organization_id=organization_id))
.select_related("organization", "team")
.prefetch_related("alert_groups")
)