Merge pull request #1 from python-discord/case-sensitive-tokens

Author: jb3

docs/configuration.md

@@ -51,11 +51,14 @@ color = "#ff5f5f"
 
 [[olli.tokens]]
 token = "INFO"
+case_sensitive = true
 # When no color is provided it falls back to blurple.
 ```
 
 Tokens accept a `token` and `color` key, the first one is required. `token` represents the phrase that should be searched for and `color` is a hex color (**with** hashtag) that will be used for the generated embeds.
 
+Tokens also accept a `case_sensitive` key which defaults to `false`. If you want to match the case as written in the `token` field set `case_sensitive` to `true` in the token config.
+
 ## `loki`
 
 `api_url`: The base URL of your Loki instance, for example `"http://localhost:3100/"`.
@@ -94,6 +97,7 @@ color = "#ff5f5f"
 [[olli.tokens]]
 token = "WARN"
 color = "#ffe24d"
+case_sensitive = true
 
 [[olli.tokens]]
 token = "INFO"

olli/alert.py

@@ -14,7 +14,7 @@ def get_match(token: TokenConfig) -> TokenMatch:
     """Search the configured service logs for a given token."""
     try:
         logger.debug(f"Searching for token {token.token}")
-        svc_logs = api_client.get_token_logs(token.token)
+        svc_logs = api_client.get_token_logs(token)
     except httpx.ConnectError:
         logger.error("Could not connect to Loki")
         return webhook.send_olli_error("Loki refused to connect.")

olli/api.py

@@ -4,7 +4,7 @@
 
 import httpx
 
-from olli.config import CONFIG
+from olli.config import CONFIG, TokenConfig
 
 
 class LokiHTTPClient:
@@ -15,7 +15,7 @@ def route(path: str) -> str:
         """Generate the Loki API route for a given path."""
         return CONFIG.loki.api_url + "/loki/api/v1/" + path
 
-    def get_token_logs(self, token: str) -> dict[str, Any]:
+    def get_token_logs(self, token: TokenConfig) -> dict[str, Any]:
         """
         Fetch the logs from configured services for a matchign token.
 
@@ -28,8 +28,10 @@ def get_token_logs(self, token: str) -> dict[str, Any]:
 
         job_regex = "|".join(CONFIG.loki.jobs)
 
+        case_filter = '(?i)' if not token.case_sensitive else ''
+
         resp = httpx.get(self.route("query_range"), params={
-            "query": f'{{job=~"({job_regex})"}} |~ "(?i){token}"',
+            "query": f'{{job=~"({job_regex})"}} |~ "{case_filter}{token.token}"',
             "start": f"{start_ts:0.0f}",
             "limit": CONFIG.loki.max_logs
         })

olli/config.py

@@ -24,7 +24,8 @@ class TokenConfig(BaseModel):
     """Class representing a token config entry."""
 
     token: str
-    color: str = "#7289DA"
+    color: Optional[str] = "#7289DA"
+    case_sensitive: Optional[bool] = False
 
 
 class LokiConfig(BaseModel):