Skip to content

Commit

Permalink
Merge pull request #279 from Uniswap/revert-276-enable-debug-log
Browse files Browse the repository at this point in the history
Revert "chore: enable firehose delivery error logs"
  • Loading branch information
ConjunctiveNormalForm authored Mar 6, 2024
2 parents 66e6dfb + e07c46d commit d2f22bd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
27 changes: 0 additions & 27 deletions bin/stacks/analytics-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,6 @@ export class AnalyticsStack extends cdk.NestedStack {
roleArn: firehoseRole.roleArn,
compressionFormat: 'UNCOMPRESSED',
},
cloudWatchLoggingOptions: {
enabled: true,
},
roleArn: firehoseRole.roleArn,
copyCommand: {
copyOptions: "JSON 'auto ignorecase'",
Expand All @@ -503,9 +500,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const rfqRequestFirehoseStream = new aws_firehose.CfnDeliveryStream(this, 'RfqRequestStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -539,9 +533,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const uraResponseStream = new aws_firehose.CfnDeliveryStream(this, 'UnifiedRoutingResponseStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -575,9 +566,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const rfqResponseFirehoseStream = new aws_firehose.CfnDeliveryStream(this, 'RfqResponseStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -611,9 +599,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const fillStream = new aws_firehose.CfnDeliveryStream(this, 'FillRedshiftStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -647,9 +632,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const orderStream = new aws_firehose.CfnDeliveryStream(this, 'OrderStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -683,9 +665,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const botOrderLoaderStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderLoaderStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -719,9 +698,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const botOrderRouterStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderRouterStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down Expand Up @@ -755,9 +731,6 @@ export class AnalyticsStack extends cdk.NestedStack {

const botOrderBroadcasterStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderBroadcasterStream', {
redshiftDestinationConfiguration: {
cloudWatchLoggingOptions: {
enabled: true,
},
clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
username: 'admin',
password: creds.secretValueFromJson('password').toString(),
Expand Down
5 changes: 1 addition & 4 deletions bin/stacks/firehose-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ export class FirehoseStack extends cdk.NestedStack {
roleArn: firehoseRole.roleArn,
compressionFormat: 'GZIP',
prefix: 'events/',
cloudWatchLoggingOptions: {
enabled: true,
},
},
}
});
this.analyticsStreamArn = analyticsEventsStream.attrArn;
}
Expand Down

0 comments on commit d2f22bd

Please sign in to comment.