-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #929 from GSA/main
04/17/2024 Production Deploy
- Loading branch information
Showing
26 changed files
with
350 additions
and
331 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,9 +86,11 @@ jobs: | |
| - uses: ./.github/actions/setup-project | ||
| - name: Create requirements.txt | ||
| run: poetry export --without-hashes --format=requirements.txt > requirements.txt | ||
| - uses: pypa/[email protected].6 | ||
| - uses: pypa/[email protected].8 | ||
| with: | ||
| inputs: requirements.txt | ||
| ignore-vulns: | | ||
| GHSA-w3h3-4rj7-4ph4 | ||
| static-scan: | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,11 @@ | ||
| import os | ||
| from datetime import datetime, timedelta | ||
|
|
||
| from flask import current_app | ||
| from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket | ||
| from sqlalchemy import between | ||
| from sqlalchemy.exc import SQLAlchemyError | ||
|
|
||
| from app import notify_celery, redis_store, zendesk_client | ||
| from app import notify_celery, zendesk_client | ||
| from app.celery.tasks import ( | ||
| get_recipient_csv_and_template_and_sender_id, | ||
| process_incomplete_jobs, | ||
|
|
@@ -24,16 +23,12 @@ | |
| find_jobs_with_missing_rows, | ||
| find_missing_row_for_job, | ||
| ) | ||
| from app.dao.notifications_dao import ( | ||
| dao_get_failed_notification_count, | ||
| notifications_not_yet_sent, | ||
| ) | ||
| from app.dao.notifications_dao import notifications_not_yet_sent | ||
| from app.dao.services_dao import ( | ||
| dao_find_services_sending_to_tv_numbers, | ||
| dao_find_services_with_high_failure_rates, | ||
| ) | ||
| from app.dao.users_dao import delete_codes_older_created_more_than_a_day_ago | ||
| from app.delivery.send_to_providers import provider_to_use | ||
| from app.enums import JobStatus, NotificationType | ||
| from app.models import Job | ||
| from app.notifications.process_notifications import send_notification_to_queue | ||
|
|
@@ -92,82 +87,6 @@ def expire_or_delete_invitations(): | |
| raise | ||
|
|
||
|
|
||
| # TODO THIS IS ACTUALLY DEPRECATED, WE ARE REMOVING PHONE NUMBERS FROM THE DB | ||
| # SO THERE WILL BE NO REASON TO KEEP TRACK OF THIS COUNT | ||
| @notify_celery.task(name="check-db-notification-fails") | ||
| def check_db_notification_fails(): | ||
| """ | ||
| We are going to use redis to keep track of the previous fail count. | ||
| If the number of fails is more than 100% of the limit, we want to send an alert every time this | ||
| runs, because it is urgent to fix it. | ||
| If the number is more than 25%, 50% or 75% of the limit, we only want to send an alert | ||
| on a breach. I.e., if the last number was at 23% and the current number is 27%, send an email. | ||
| But if the last number was 26% and the current is 27%, don't. | ||
| """ | ||
| last_value = redis_store.get("LAST_DB_NOTIFICATION_COUNT") | ||
| if not last_value: | ||
| last_value = 0 | ||
| else: | ||
| last_value = int(last_value.decode("utf-8")) | ||
|
|
||
| failed_count = dao_get_failed_notification_count() | ||
| if failed_count > last_value: | ||
| redis_store.set("LAST_DB_NOTIFICATION_COUNT", failed_count) | ||
| message = "" | ||
| curr_env = os.getenv("ENVIRONMENT") | ||
| if failed_count >= MAX_NOTIFICATION_FAILS: | ||
| message = f"We are over 100% in the db for failed notifications on {curr_env}" | ||
| elif ( | ||
| failed_count >= MAX_NOTIFICATION_FAILS * 0.9 | ||
| and last_value < MAX_NOTIFICATION_FAILS * 0.9 | ||
| ): | ||
| message = ( | ||
| "[email protected]", | ||
| f"We crossed above 90% in the db for failed notifications on {curr_env}", | ||
| ) | ||
|
|
||
| elif ( | ||
| failed_count >= MAX_NOTIFICATION_FAILS * 0.75 | ||
| and last_value < MAX_NOTIFICATION_FAILS * 0.75 | ||
| ): | ||
| message = ( | ||
| "[email protected]", | ||
| f"We crossed above 75% in the db for failed notifications on {curr_env}", | ||
| ) | ||
| elif ( | ||
| failed_count >= MAX_NOTIFICATION_FAILS * 0.5 | ||
| and last_value < MAX_NOTIFICATION_FAILS * 0.5 | ||
| ): | ||
| message = ( | ||
| "[email protected]", | ||
| f"We crossed above 50% in the db for failed notifications on {curr_env}", | ||
| ) | ||
| elif ( | ||
| failed_count >= MAX_NOTIFICATION_FAILS * 0.25 | ||
| and last_value < MAX_NOTIFICATION_FAILS * 0.25 | ||
| ): | ||
| message = ( | ||
| "[email protected]", | ||
| f"We crossed above 25% in the db for failed notifications on {curr_env}", | ||
| ) | ||
| # suppress any spam coming from development tier | ||
| if message and curr_env != "development": | ||
| provider = provider_to_use(NotificationType.EMAIL, False) | ||
| from_address = '"{}" <{}@{}>'.format( | ||
| "Failed Notification Count Alert", | ||
| "test_sender", | ||
| current_app.config["NOTIFY_EMAIL_DOMAIN"], | ||
| ) | ||
| provider.send_email( | ||
| from_address, | ||
| "[email protected]", | ||
| "DB Notification Failures Level Breached", | ||
| body=str(message), | ||
| ) | ||
|
|
||
|
|
||
| @notify_celery.task(name="check-job-status") | ||
| def check_job_status(): | ||
| """ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.