Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/__tests__/__snapshots__/construct-hub.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/__tests__/devapp/__snapshots__/snapshot.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/__tests__/overview-dashboard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ test('It adds cloud front distribution to the dashboard when present', () => {
{
Ref: 'DistributionCFDistribution882A7313',
},
'","Region","Global",{"region":"us-east-1"}],["AWS/CloudFront","4xxErrorRate","DistributionId","',
'","Region","Global",{"region":"us-east-1","period":86400,"stat":"Sum"}],["AWS/CloudFront","4xxErrorRate","DistributionId","',
{
Ref: 'DistributionCFDistribution882A7313',
},
'","Region","Global",{"region":"us-east-1","yAxis":"right"}],["AWS/CloudFront","5xxErrorRate","DistributionId","',
'","Region","Global",{"region":"us-east-1","period":86400,"yAxis":"right"}],["AWS/CloudFront","5xxErrorRate","DistributionId","',
{
Ref: 'DistributionCFDistribution882A7313',
},
'","Region","Global",{"region":"us-east-1","yAxis":"right"}]],"yAxis":{"left":{"label":"Requests count"},"right":{"label":"Request Percent","min":0,"max":100}}}}]}',
'","Region","Global",{"region":"us-east-1","period":86400,"yAxis":"right"}]],"yAxis":{"left":{"label":"Requests count"},"right":{"label":"Request Percent","min":0,"max":100}}}}]}',
],
],
},
Expand Down
11 changes: 7 additions & 4 deletions src/overview-dashboard/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { IOverviewDashboard } from './api';
import { SQSDLQWidget } from './sqs-dlq-widget';
import { Inventory } from '../backend/inventory';
import { RUNBOOK_URL } from '../runbook-url';
import { Duration } from 'aws-cdk-lib';

/**
* Properties for OverviewDashboard
Expand Down Expand Up @@ -127,10 +128,12 @@ export class OverviewDashboard extends Construct implements IOverviewDashboard {
this.dashboard.addWidgets(this.cloudFrontMetricWidget);
}

// see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/programming-cloudwatch-metrics.html#cloudfront-metrics-distribution-values

const totalRequest = new Metric({
metricName: 'Requests',
namespace: 'AWS/CloudFront',
statistic: Statistic.AVERAGE,
statistic: Statistic.SUM,
dimensionsMap: {
DistributionId: distribution.distributionId,
Region: 'Global',
Expand Down Expand Up @@ -160,9 +163,9 @@ export class OverviewDashboard extends Construct implements IOverviewDashboard {
region: 'us-east-1', // global metric
});

this.cloudFrontMetricWidget.addLeftMetric(totalRequest);
this.cloudFrontMetricWidget.addRightMetric(errorRate4xx);
this.cloudFrontMetricWidget.addRightMetric(errorRate5xx);
this.cloudFrontMetricWidget.addLeftMetric(totalRequest.with({ period: Duration.days(1) }));
this.cloudFrontMetricWidget.addRightMetric(errorRate4xx.with({ period: Duration.days(1) }));
this.cloudFrontMetricWidget.addRightMetric(errorRate5xx.with({ period: Duration.days(1) }));
}

private addCloudFrontMetricWidget() {
Expand Down