Add alertmanager as supported sender and update deps

ops_bot/main.py

@@ -1,10 +1,12 @@
 import asyncio
 import logging
 import os
-from typing import Any, Dict, List, Optional, Protocol, Tuple, cast
+import sys
+from contextlib import asynccontextmanager
+from typing import Any, AsyncIterator, Dict, List, Optional, Protocol, Tuple, cast
 
+import json_logging
 import uvicorn
-from dotenv import load_dotenv
 from fastapi import Depends, FastAPI, HTTPException, Request, status
 from fastapi.security import (
     HTTPAuthorizationCredentials,
@@ -13,18 +15,11 @@ from fastapi.security import (
     HTTPBearer,
 )
 
-from ops_bot import aws, pagerduty
+from ops_bot import alertmanager, aws, pagerduty
 from ops_bot.config import BotSettings, RoutingKey, load_config
 from ops_bot.gitlab import hook as gitlab_hook
 from ops_bot.matrix import MatrixClient
 
-load_dotenv()
-
-
-app = FastAPI()
-bearer_security = HTTPBearer(auto_error=False)
-basic_security = HTTPBasic(auto_error=False)
-
 
 async def get_matrix_service(request: Request) -> MatrixClient:
     """A helper to fetch the matrix client from the app state"""
@@ -37,21 +32,29 @@ async def matrix_main(matrix_client: MatrixClient) -> None:
     await asyncio.gather(*workers)
 
 
-@app.on_event("startup")
-async def startup_event() -> None:
+@asynccontextmanager
+async def lifespan(app: FastAPI) -> AsyncIterator[None]:
+
     config_fname = os.environ.get("BOT_CONFIG_FILE", "config.yaml")
     bot_settings = load_config(config_fname)
     c = MatrixClient(settings=bot_settings.matrix, join_rooms=bot_settings.get_rooms())
     app.state.matrix_client = c
     app.state.bot_settings = bot_settings
     asyncio.create_task(matrix_main(c))
-
-
-@app.on_event("shutdown")
-async def shutdown_event() -> None:
+    yield
     await app.state.matrix_client.shutdown()
 
 
+app = FastAPI(lifespan=lifespan)
+bearer_security = HTTPBearer(auto_error=False)
+basic_security = HTTPBasic(auto_error=False)
+
+log = logging.getLogger("ops_bot")
+log.addHandler(logging.StreamHandler(sys.stdout))
+json_logging.init_fastapi(enable_json=True)
+json_logging.init_request_instrument(app)
+
+
 @app.get("/")
 async def root() -> Dict[str, str]:
     return {"message": "Hello World"}
@@ -113,6 +116,7 @@ handlers: Dict[str, Tuple[Authorizer, ParseHandler]] = {
     "gitlab": (gitlab_hook.authorize, gitlab_hook.parse_event),
     "pagerduty": (bearer_token_authorizer, pagerduty.parse_pagerduty_event),
     "aws-sns": (nop_authorizer, aws.parse_sns_event),
+    "alertmanager": (nop_authorizer, alertmanager.parse_alertmanager_event),
 }