update monitoring rds props

umccr · Jan 29, 2024 · 824b22d · 824b22d
1 parent 04d7f93
commit 824b22d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/config/constants.ts b/config/constants.ts
@@ -1,7 +1,7 @@
 import { OrcaBusStatefulConfig } from '../lib/workload/orcabus-stateful-stack';
 import { AuroraPostgresEngineVersion } from 'aws-cdk-lib/aws-rds';
 import { OrcaBusStatelessConfig } from '../lib/workload/orcabus-stateless-stack';
-import { aws_lambda } from 'aws-cdk-lib';
+import { Duration, aws_lambda } from 'aws-cdk-lib';
 
 const regName = 'OrcaBusSchemaRegistry';
 const eventBusName = 'OrcaBusMain';
@@ -25,6 +25,9 @@ const orcaBusStatefulConfig = {
     parameterGroupName: 'default.aurora-postgresql15',
     username: 'admin',
     dbPort: 5432,
+    monitoring: {
+      cloudwatchLogsExports: ['orcabus-postgresql'],
+    },
   },
   securityGroupProps: {
     securityGroupName: lambdaSecurityGroupName,
@@ -86,6 +89,8 @@ export const getEnvironmentConfig = (
               numberOfInstance: 1,
               minACU: 0.5,
               maxACU: 1,
+              enhancedMonitoringInterval: Duration.seconds(60),
+              enablePerformanceInsights: true,
             },
             securityGroupProps: {
               ...orcaBusStatefulConfig.securityGroupProps,
@@ -113,6 +118,8 @@ export const getEnvironmentConfig = (
               numberOfInstance: 1,
               minACU: 0.5,
               maxACU: 1,
+              enhancedMonitoringInterval: Duration.seconds(60),
+              enablePerformanceInsights: true,
             },
             securityGroupProps: {
               ...orcaBusStatefulConfig.securityGroupProps,

diff --git a/lib/workload/stateful/database/component.ts b/lib/workload/stateful/database/component.ts
@@ -1,9 +1,31 @@
 import { Construct } from 'constructs';
-import { RemovalPolicy } from 'aws-cdk-lib';
+import { RemovalPolicy, Duration } from 'aws-cdk-lib';
 import * as rds from 'aws-cdk-lib/aws-rds';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 
-export interface DatabaseProps {
+/**
+ * Props for enabling enhanced monitoring.
+ */
+type MonitoringProps = {
+  /**
+   * Add cloud watch exports.
+   */
+  readonly cloudwatchLogsExports?: string[];
+  /**
+   * Enable performance insights.
+   */
+  readonly enablePerformanceInsights?: boolean;
+  /**
+   * performance insights retention period
+   */
+  readonly performanceInsightsRetention?: rds.PerformanceInsightRetention;
+  /**
+   * Enable enhanced monitoring by specifying the interval
+   */
+  readonly enhancedMonitoringInterval?: Duration;
+};
+
+export type DatabaseProps = MonitoringProps & {
   clusterIdentifier: string;
   defaultDatabaseName: string;
   parameterGroupName: string;
@@ -14,7 +36,7 @@ export interface DatabaseProps {
   maxACU: number;
   dbPort: number;
   allowedInboundSG?: ec2.SecurityGroup;
-}
+};
 
 export class DatabaseConstruct extends Construct {
   readonly dbSecurityGroup: ec2.SecurityGroup;
@@ -62,7 +84,13 @@ export class DatabaseConstruct extends Construct {
       vpcSubnets: {
         subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
       },
-      writer: rds.ClusterInstance.serverlessV2('WriterClusterInstance', {}),
+
+      cloudwatchLogsExports: props.cloudwatchLogsExports,
+      monitoringInterval: props.enhancedMonitoringInterval,
+
+      writer: rds.ClusterInstance.serverlessV2('WriterClusterInstance', {
+        enablePerformanceInsights: props.enablePerformanceInsights,
+      }),
     });
   }
 }