Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api): keep the failed alerts #2419

Merged
merged 5 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions keep/api/models/db/alert.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ class AlertRaw(SQLModel, table=True):
id: UUID = Field(default_factory=uuid4, primary_key=True)
tenant_id: str = Field(foreign_key="tenant.id")
raw_alert: dict = Field(sa_column=Column(JSON))
timestamp: datetime = Field(default_factory=datetime.utcnow)
provider_type: str | None = Field(default=None)

class Config:
arbitrary_types_allowed = True
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
"""Add timestamp and provider_type to alertraw

Revision ID: 895fe80117aa
Revises: ef0b5b0df41c
Create Date: 2024-11-08 20:58:40.201477

"""

import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision = "895fe80117aa"
down_revision = "ef0b5b0df41c"
branch_labels = None
depends_on = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###

with op.batch_alter_table("alertraw", schema=None) as batch_op:
batch_op.add_column(
sa.Column(
"timestamp",
sa.DateTime(),
nullable=False,
server_default=sa.text("CURRENT_TIMESTAMP"),
)
)
batch_op.add_column(sa.Column("provider_type", sa.String(), nullable=True))
shahargl marked this conversation as resolved.
Show resolved Hide resolved

# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("alertraw", schema=None) as batch_op:
batch_op.drop_column("timestamp")
batch_op.drop_column("provider_type")
# ### end Alembic commands ###
38 changes: 38 additions & 0 deletions keep/api/tasks/process_event_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def __save_to_db(
alert = AlertRaw(
tenant_id=tenant_id,
raw_alert=raw_event,
provider_type=provider_type,
)
session.add(alert)
# add audit to the deduplicated events
Expand Down Expand Up @@ -568,6 +569,8 @@ def process_event(
)
except Exception:
logger.exception("Error processing event", extra=extra_dict)
# In case of exception, add the alerts to the defect table
__save_error_alerts(tenant_id, provider_type, raw_event)
# Retrying only if context is present (running the job in arq worker)
if bool(ctx):
raise Retry(defer=ctx["job_try"] * TIMES_TO_RETRY_JOB)
Expand All @@ -576,5 +579,40 @@ def process_event(
logger.info("Event processed", extra=extra_dict)


def __save_error_alerts(
tenant_id, provider_type, raw_events: dict | list[dict] | list[AlertDto] | None
):
if not raw_events:
logger.info("No raw events to save as errors")
return

try:
logger.info("Getting database session")
session = get_session_sync()

# Convert to list if single dict
if isinstance(raw_events, dict):
logger.info("Converting single dict to list")
raw_events = [raw_events]

logger.info(f"Saving {len(raw_events)} error alerts")
for raw_event in raw_events:
# Convert AlertDto to dict if needed
if isinstance(raw_event, AlertDto):
logger.info("Converting AlertDto to dict")
raw_event = raw_event.dict()

alert = AlertRaw(
tenant_id=tenant_id, raw_alert=raw_event, provider_type=provider_type
)
session.add(alert)
session.commit()
logger.info("Successfully saved error alerts")
except Exception:
logger.exception("Failed to save error alerts")
finally:
session.close()


async def async_process_event(*args, **kwargs):
return process_event(*args, **kwargs)
Loading