Skip to content

Commit a6a3c37

Browse files
committed
need to send scope header to mimir
1 parent a50a8c9 commit a6a3c37

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

cabotage/celery/tasks/alerting.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ def reconcile_alerts():
3434
if verify is None:
3535
verify = True
3636

37+
headers = {"X-Scope-OrgID": current_app.config.get("MIMIR_TENANT_ID")}
38+
3739
secret = current_app.config.get("ALERTMANAGER_WEBHOOK_SECRET")
38-
headers = {}
3940
if secret:
4041
headers["Authorization"] = f"Bearer {secret}"
4142

cabotage/server/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ class Config(metaclass=MetaFlaskEnv):
109109
TAILSCALE_TAG_PREFIX = "cabotage"
110110
MIMIR_URL = None
111111
MIMIR_VERIFY = None
112+
MIMIR_TENANT_ID = "cabotage-infra"
112113
LOKI_URL = None
113114
LOKI_VERIFY = None
114115
SLACK_CLIENT_ID = None

cabotage/server/user/views.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5276,7 +5276,12 @@ def _mimir_connection():
52765276
verify = False
52775277
else:
52785278
verify = True
5279-
return mimir_url, verify
5279+
headers = {}
5280+
# TODO: Include anonymous until migration to multi-tenant is completed
5281+
tenant_id = str(current_app.config.get("MIMIR_TENANT_ID")) + "|anonymous"
5282+
if tenant_id:
5283+
headers["X-Scope-OrgID"] = tenant_id
5284+
return mimir_url, verify, headers
52805285

52815286

52825287
def _query_mimir_range(query, start, end, step):

0 commit comments

Comments
 (0)