Switch to a common account id field

Author: ZainRizvi

lambdas/collector/__tests__/transformers/base.test.ts

@@ -16,7 +16,7 @@ class TestTransformer extends BaseTransformer {
       priority: this.extractPriority(rawPayload.priority),
       occurred_at: this.parseTimestamp(rawPayload.timestamp),
       team: this.extractTeam(rawPayload.team),
-      identity: { org_id: "", rule_id: "" },
+      identity: { account_id: "", rule_id: "" },
       links: {},
       raw_provider: rawPayload,
     };

lambdas/collector/__tests__/transformers/cloudwatch.test.ts

@@ -31,7 +31,7 @@ describe("CloudWatchTransformer", () => {
         priority: "P2",
         team: "platform",
         identity: {
-          aws_account: "123456789012",
+          account_id: "123456789012",
           region: "us-east-1",
           alarm_arn: "arn:aws:cloudwatch:us-east-1:123456789012:alarm:HighCPU",
         },

lambdas/collector/__tests__/transformers/grafana.test.ts

@@ -32,7 +32,7 @@ describe("GrafanaTransformer", () => {
         priority: "P1",
         team: "dev-infra",
         identity: {
-          org_id: "1",
+          account_id: "1",
           rule_id: "abc123",
         },
         links: {
@@ -167,7 +167,7 @@ describe("GrafanaTransformer", () => {
       const result = transformer.transform(payload, mockEnvelope);
 
       expect(result.identity).toMatchObject({
-        org_id: "42",
+        account_id: "42",
         rule_id: "unique-fingerprint-123",
       });
     });

lambdas/collector/__tests__/transformers/normalized.test.ts

@@ -17,7 +17,7 @@ describe("NormalizedTransformer", () => {
     occurred_at: "2024-01-15T10:30:00.000Z",
     team: "platform-team",
     identity: {
-      aws_account: "123456789012",
+      account_id: "123456789012",
       region: "us-west-2",
       rule_id: "cpu-high-alert",
     },

lambdas/collector/__tests__/utils/schema-validator.test.ts

@@ -44,10 +44,9 @@ describe("Schema Validator", () => {
         summary: "Test summary",
         reason: "Test reason",
         identity: {
-          aws_account: "123456789012",
+          account_id: "123456789012",
           region: "us-west-2",
           alarm_arn: "arn:aws:cloudwatch:us-west-2:123456789012:alarm:test",
-          org_id: "12345",
           rule_id: "rule-123",
         },
         links: {

lambdas/collector/__tests__/utils/test-fixtures.ts

@@ -37,7 +37,7 @@ export const testAlertEvents = {
     occurred_at: "2025-09-16T12:00:00.000Z",
     team: "dev-infra",
     identity: {
-      org_id: "1",
+      account_id: "1",
       rule_id: "test-rule-123",
     },
     links: {
@@ -59,7 +59,7 @@ export const testAlertEvents = {
     occurred_at: "2025-09-16T12:05:00.000Z",
     team: "dev-infra",
     identity: {
-      org_id: "1",
+      account_id: "1",
       rule_id: "test-rule-123",
     },
     links: {
@@ -81,7 +81,7 @@ export const testAlertEvents = {
     occurred_at: "2025-09-16T12:00:00.000Z",
     team: "platform",
     identity: {
-      org_id: "123456789012",
+      account_id: "123456789012",
       rule_id: "arn:aws:cloudwatch:us-east-1:123456789012:alarm:HighCPU",
     },
     links: {

lambdas/collector/schemas/README.md

@@ -42,8 +42,7 @@ const alert = {
   priority: "P1",
   occurred_at: "2024-01-15T10:30:00.000Z",
   team: "platform-team",
-  resource: { type: "instance", id: "i-123456" },
-  identity: { rule_id: "cpu-high" },
+  identity: { account_id: "123456789012", rule_id: "cpu-high" },
   links: { runbook_url: "https://wiki.company.com/cpu-runbook" },
 };
 
@@ -73,8 +72,7 @@ alert = {
     "priority": "P1",
     "occurred_at": "2024-01-15T10:30:00.000Z",
     "team": "platform-team",
-    "resource": {"type": "instance", "id": "i-123456"},
-    "identity": {"rule_id": "cpu-high"},
+    "identity": {"account_id": "123456789012", "rule_id": "cpu-high"},
     "links": {"runbook_url": "https://wiki.company.com/cpu-runbook"}
 }
 
@@ -107,8 +105,7 @@ func main() {
         "priority":       "P1",
         "occurred_at":    "2024-01-15T10:30:00.000Z",
         "team":           "platform-team",
-        "resource":       map[string]interface{}{"type": "instance", "id": "i-123456"},
-        "identity":       map[string]interface{}{"rule_id": "cpu-high"},
+        "identity":       map[string]interface{}{"account_id": "123456789012", "rule_id": "cpu-high"},
         "links":          map[string]interface{}{"runbook_url": "https://wiki.company.com/cpu-runbook"},
     }
 
@@ -152,21 +149,12 @@ func main() {
 | `description`  | string | Detailed description (max 4000 chars)              |
 | `summary`      | string | High-level summary (max 1000 chars)                |
 | `reason`       | string | Provider-specific reason (max 2000 chars)          |
-| `resource`     | object | Resource information (requires `type` if provided) |
 | `raw_provider` | any    | Original payload for debugging                     |
 
-### Resource Types
-
-- `runner` - CI/CD runner or build agent
-- `instance` - Virtual machine or container instance
-- `job` - Scheduled job or task
-- `service` - Application service or microservice
-- `generic` - Generic resource type
-
 ### Validation Rules
 
 - **URLs**: Must be valid HTTP/HTTPS URLs (max 2048 chars)
-- **AWS Account**: Must be 12-digit string
+- **Account ID**: Alphanumeric, hyphens, underscores only (max 100 chars)
 - **CloudWatch ARN**: Must start with "arn:aws:cloudwatch:"
 - **Source/Team**: Alphanumeric, hyphens, underscores only
 

lambdas/collector/schemas/alert-event.schema.json

@@ -64,10 +64,12 @@
     "identity": {
       "type": "object",
       "properties": {
-        "aws_account": {
+        "account_id": {
           "type": "string",
-          "pattern": "^[0-9]{12}$",
-          "description": "AWS account ID (12 digits)"
+          "minLength": 1,
+          "maxLength": 100,
+          "pattern": "^[a-zA-Z0-9_-]+$",
+          "description": "Unified account identifier (AWS account ID, organization ID, tenant ID, etc.)"
         },
         "region": {
           "type": "string",
@@ -81,11 +83,6 @@
           "pattern": "^arn:aws:cloudwatch:",
           "description": "CloudWatch alarm ARN (if applicable)"
         },
-        "org_id": {
-          "type": "string",
-          "maxLength": 100,
-          "description": "Organization ID (for Grafana or other multi-tenant systems)"
-        },
         "rule_id": {
           "type": "string",
           "maxLength": 255,
@@ -154,7 +151,7 @@
       "occurred_at": "2024-01-15T10:30:00.000Z",
       "team": "platform-team",
       "identity": {
-        "aws_account": "123456789012",
+        "account_id": "123456789012",
         "region": "us-west-2",
         "rule_id": "cpu-high-prod-web"
       },

lambdas/collector/src/fingerprint.ts

@@ -20,8 +20,8 @@ function generateCloudWatchFingerprint(alertEvent: AlertEvent): string {
   };
 
   // Add CloudWatch-specific identity fields
-  if (alertEvent.identity.aws_account) {
-    fingerprintInputs.aws_account = alertEvent.identity.aws_account;
+  if (alertEvent.identity.account_id) {
+    fingerprintInputs.account_id = alertEvent.identity.account_id;
   }
   if (alertEvent.identity.region) {
     fingerprintInputs.region = alertEvent.identity.region;
@@ -41,8 +41,8 @@ function generateGrafanaFingerprint(alertEvent: AlertEvent): string {
   };
 
   // Add Grafana-specific identity fields
-  if (alertEvent.identity.org_id) {
-    fingerprintInputs.org_id = alertEvent.identity.org_id;
+  if (alertEvent.identity.account_id) {
+    fingerprintInputs.account_id = alertEvent.identity.account_id;
   }
   if (alertEvent.identity.rule_id) {
     fingerprintInputs.rule_id = alertEvent.identity.rule_id;

lambdas/collector/src/transformers/cloudwatch.ts

@@ -70,7 +70,7 @@ export class CloudWatchTransformer extends BaseTransformer {
 
     // Build identity information
     const identity: AlertIdentity = {
-      aws_account: this.safeString(alarmData.AWSAccountId),
+      account_id: this.safeString(alarmData.AWSAccountId),
       region:
         this.extractRegionFromArn(alarmData.AlarmArn) ||
         this.normalizeRegion(alarmData.Region || ""),