Skip to content

Commit

Permalink
feat: Merge branch 'feature/rules' of https://github.com/palad-in/keep
Browse files Browse the repository at this point in the history
…into feature/rules
  • Loading branch information
shahargl committed Dec 18, 2023
2 parents 1e2ec09 + 0cfbc45 commit 2771344
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 15 deletions.
6 changes: 4 additions & 2 deletions keep-ui/app/alerts/alerts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ export default function Alerts({
combinedAlerts.forEach((alert) => {
let alertKey = "";
try {
alertKey = `${alert.id}-${alert.lastReceived.toISOString()}`;
alertKey = `${
alert.fingerprint
}-${alert.lastReceived.toISOString()}`;
} catch {
alertKey = alert.id;
alertKey = alert.fingerprint;
}
uniqueObjectsMap.set(alertKey, alert);
});
Expand Down
4 changes: 2 additions & 2 deletions keep/api/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import os
import threading
import time
from importlib import metadata

import jwt
import pkg_resources
import requests
import uvicorn
from dotenv import find_dotenv, load_dotenv
Expand Down Expand Up @@ -59,7 +59,7 @@
CONSUMER = os.environ.get("CONSUMER", "true") == "true"
AUTH_TYPE = os.environ.get("AUTH_TYPE", AuthenticationType.NO_AUTH.value)
try:
KEEP_VERSION = pkg_resources.get_distribution("keep").version
KEEP_VERSION = metadata.version("keep")
except Exception:
KEEP_VERSION = os.environ.get("KEEP_VERSION", "unknown")

Expand Down
2 changes: 2 additions & 0 deletions keep/api/core/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,8 @@ def run_rule(tenant_id, rule):
filters.append(Alert.tenant_id == tenant_id)
# TODO: maybe timeframe should support lastReceived? but idk if there is a use case for that
filters.append(Alert.timestamp >= timeframe_datetime)
# Exclude events created by the rule engine itself
filters.append(Alert.provider_type != "rules")
# Construct and execute the ORM query
query = session.query(Alert).filter(*filters)
# Shahar: to get the RAW query -
Expand Down
15 changes: 7 additions & 8 deletions keep/cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from importlib import metadata

import click
import pkg_resources
import requests
import yaml
from dotenv import find_dotenv, load_dotenv
Expand All @@ -25,9 +24,12 @@
load_dotenv(find_dotenv())
posthog_client = get_posthog_client()
try:
KEEP_VERSION = pkg_resources.get_distribution("keep").version
except Exception:
KEEP_VERSION = os.environ.get("KEEP_VERSION", "unknown")
KEEP_VERSION = metadata.version("keep")
except metadata.PackageNotFoundError:
try:
KEEP_VERSION = metadata.version("keephq")
except metadata.PackageNotFoundError:
KEEP_VERSION = os.environ.get("KEEP_VERSION", "unknown")


logging_config = {
Expand Down Expand Up @@ -213,10 +215,7 @@ def cleanup():
@cli.command()
def version():
"""Get the library version."""
try:
click.echo(click.style(f"{metadata.version('keep')}", bold=True))
except metadata.PackageNotFoundError:
click.echo(click.style(f"{metadata.version('keephq')}", bold=True))
click.echo(click.style(KEEP_VERSION, bold=True))


@cli.command()
Expand Down
14 changes: 11 additions & 3 deletions keep/rulesengine/rulesengine.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import datetime
import hashlib
import logging

Expand Down Expand Up @@ -71,16 +72,23 @@ def run_rules(self, events: list[AlertDto]):
event={
"events": event_payload,
"name": group_alert_name,
"lastReceived": max(
[event["lastReceived"] for event in event_payload]
"lastReceived": datetime.datetime.now(
tz=datetime.timezone.utc
).isoformat(),
"severity": max(
[
event["severity"]
for event in event_payload
if event["severity"] is not None
]
),
"severity": max([event["severity"] for event in event_payload]),
"source": list(
set([event["source"][0] for event in event_payload])
),
# TODO: should be calculated somehow else
"id": fingerprint,
"status": "firing",
"pushed": True,
},
fingerprint=fingerprint,
)
Expand Down

0 comments on commit 2771344

Please sign in to comment.