removed enrichment
This commit is contained in:
@@ -1,5 +0,0 @@
|
|||||||
def enrich_event(event, game: str):
|
|
||||||
"""Add the game tag to the event. All other data passes through unchanged."""
|
|
||||||
event.data = event.data or {}
|
|
||||||
event.data["game"] = game
|
|
||||||
return event
|
|
||||||
@@ -24,16 +24,15 @@ if INFLUX_URL and INFLUX_TOKEN:
|
|||||||
else:
|
else:
|
||||||
logger.warning("InfluxDB environment variables missing – writing disabled")
|
logger.warning("InfluxDB environment variables missing – writing disabled")
|
||||||
|
|
||||||
def write_event(event) -> bool:
|
def write_event(event, game: str) -> bool:
|
||||||
if write_api is None:
|
if write_api is None:
|
||||||
logger.debug("InfluxDB not available, skipping write")
|
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
p = Point(event.type).time(event.time * 1_000_000_000)
|
p = Point(event.type).time(event.time * 1_000_000_000)
|
||||||
p.tag("game", event.data.get("game", "unknown"))
|
p.tag("game", game)
|
||||||
p.tag("serverId", event.serverId)
|
p.tag("serverId", event.serverId)
|
||||||
# Write all data fields as InfluxDB fields (no game-specific tags)
|
# Ensure data is a dict, even if not provided
|
||||||
for k, v in event.data.items():
|
for k, v in (event.data or {}).items():
|
||||||
if isinstance(v, (int, float, str, bool)):
|
if isinstance(v, (int, float, str, bool)):
|
||||||
p.field(k, v)
|
p.field(k, v)
|
||||||
write_api.write(bucket=INFLUX_BUCKET, record=p)
|
write_api.write(bucket=INFLUX_BUCKET, record=p)
|
||||||
|
|||||||
@@ -45,13 +45,9 @@ async def ingest_event(payload: Event | BatchEvents, game: str = Depends(verify_
|
|||||||
|
|
||||||
if isinstance(payload, BatchEvents):
|
if isinstance(payload, BatchEvents):
|
||||||
for event in payload.events:
|
for event in payload.events:
|
||||||
check_event(event)
|
write_event(event, game)
|
||||||
enriched = enrich_event(event, game)
|
|
||||||
write_event(enriched)
|
|
||||||
else:
|
else:
|
||||||
check_event(payload)
|
write_event(payload, game)
|
||||||
enriched = enrich_event(payload, game)
|
|
||||||
write_event(enriched)
|
|
||||||
return {"success": True}
|
return {"success": True}
|
||||||
|
|
||||||
# ---------- Serve the admin HTML ----------
|
# ---------- Serve the admin HTML ----------
|
||||||
|
|||||||
Reference in New Issue
Block a user