chore: Clean up structure

Author: greynewell

lib/cell-stack.ts

@@ -6,15 +6,14 @@ import { EventConsumer } from './eventConsumer';
 import { EventProducer } from './eventProducer';
 import { EventRouter } from './eventRouter';
 import { Queue } from 'aws-cdk-lib/aws-sqs';
-import { EventDashboard } from './eventDashboard';
-import { EventAlarms } from './eventAlarms';
+import { EventMonitoring } from './eventMonitoring';
+import { consumers } from 'stream';
 
 export class CellStack extends cdk.Stack {
     router: EventRouter;
     producer: EventProducer;
     consumers: EventConsumer[] = [];
-    dashboard: EventDashboard;
-    alarms: EventAlarms;
+    monitoring: EventMonitoring;
 
     constructor(scope: Construct, id: string, props?: cdk.StackProps) {
         super(scope, id, props);
@@ -42,7 +41,10 @@ export class CellStack extends cdk.Stack {
         });
 
         // create Dashboards and Alarms
-        this.dashboard = new EventDashboard(this, id + 'Dashboard');
-        this.alarms = new EventAlarms(this, id + 'Alarms');
+        this.monitoring = new EventMonitoring(this, id + 'Dashboard', {
+            router: this.router,
+            producer: this.producer,
+            consumers: this.consumers
+        });
     }
 }

lib/eventAlarms.ts

@@ -0,0 +1,24 @@
+import * as cdk from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { EventRouter } from './eventRouter';
+import { EventProducer } from './eventProducer';
+import { EventConsumer } from './eventConsumer';
+
+export interface EventMonitoringProps {
+  router: EventRouter;
+  producer: EventProducer;
+  consumers: EventConsumer[];
+}
+
+export class EventMonitoring extends Construct {
+  // Public properties
+  public readonly dashboardName: string;
+
+  constructor(scope: Construct, id: string, props?: EventMonitoringProps) {
+    super(scope, id);
+
+    // Initialize your construct logic here
+  }
+
+  // Add any helper methods here
+}

lib/eventDashboard.ts

@@ -43,8 +43,8 @@ export class EventRouter extends Construct {
             eventPattern: {}
         });
 
-        // Custom metrics for EventBridge
-        new Metric({
+        // Create metrics for EventBridge
+        const eventsProcessedMetric = new Metric({
             namespace: 'ApplicationEvents',
             metricName: 'EventsProcessed',
             dimensionsMap: {
@@ -53,7 +53,9 @@ export class EventRouter extends Construct {
             },
             statistic: 'Sum',
             period: Duration.minutes(1)
-        }).createAlarm(this, 'LowEventThroughputAlarm', {
+        })
+        
+        eventsProcessedMetric.createAlarm(this, 'LowEventThroughputAlarm', {
             evaluationPeriods: 3,
             // Tune this threshold based on your application
             threshold: 100,
@@ -124,7 +126,7 @@ export class EventRouter extends Construct {
         const numberOfNotificationsDelivered = topic.metricNumberOfNotificationsDelivered();
         const numberOfNotificationsFailed = topic.metricNumberOfNotificationsFailed();
 
-        // Create alarms for important metrics
+        // Create alarms for failed notifications
         numberOfNotificationsFailed.createAlarm(stack, `${name}FailedNotificationsAlarm`, {
             threshold: 1,
             evaluationPeriods: 1,