From 0cc64ea02b28d41d5738eb133c646e36641fb4bd Mon Sep 17 00:00:00 2001 From: cavis Date: Wed, 15 Jan 2025 09:19:40 -0700 Subject: [PATCH] Remove signoz envs --- spire/templates/apps-200A.yml | 2 -- spire/templates/apps/augury.yml | 19 ------------------- spire/templates/apps/exchange.yml | 12 ------------ spire/templates/apps/feeder.yml | 17 ----------------- spire/templates/apps/id.yml | 6 ------ spire/templates/root.yml | 2 -- 6 files changed, 58 deletions(-) diff --git a/spire/templates/apps-200A.yml b/spire/templates/apps-200A.yml index c384a8f8..30fdccb0 100644 --- a/spire/templates/apps-200A.yml +++ b/spire/templates/apps-200A.yml @@ -24,7 +24,6 @@ Parameters: VpcCidrBlock: { Type: String } VpcIpv6CidrBlocks: { Type: String } NewRelicApiKeyPrxLite: { Type: String } - SignozAccessToken: { Type: String } VpcPublicSubnet1Id: { Type: AWS::EC2::Subnet::Id } VpcPublicSubnet2Id: { Type: AWS::EC2::Subnet::Id } VpcPublicSubnet3Id: { Type: AWS::EC2::Subnet::Id } @@ -288,7 +287,6 @@ Resources: DovetailAppleApiBridgeEndpointUrl: !Ref DovetailAppleApiBridgeEndpointUrl EchoServiceToken: !Ref EchoServiceToken SlackMessageRelaySnsTopicArn: !Ref SlackMessageRelaySnsTopicArn - SignozAccessToken: !Ref SignozAccessToken Tags: - { Key: prx:meta:tagging-version, Value: "2021-04-07" } - { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName } diff --git a/spire/templates/apps/augury.yml b/spire/templates/apps/augury.yml index e0034701..9476213e 100644 --- a/spire/templates/apps/augury.yml +++ b/spire/templates/apps/augury.yml @@ -67,7 +67,6 @@ Parameters: CmsHostname: { Type: String } DovetailRouterHostname: { Type: String } AdFilesS3BucketArn: { Type: AWS::SSM::Parameter::Value } - HoneycombApiKey: { Type: AWS::SSM::Parameter::Value, Default: /prx/global/Spire/honeycomb-api-key } SlackMessageRelaySnsTopicArn: { Type: String } Conditions: @@ -402,12 +401,6 @@ Resources: Value: !If [IsProduction, production, staging] - Name: SLOW_WORKER_RELAY_SQS_URL Value: !Ref SlowWorkerRelaySqsQueue - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://api.honeycomb.io - - Name: OTEL_EXPORTER_OTLP_HEADERS - Value: !Sub x-honeycomb-team=${HoneycombApiKey} - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, Augury Production, Augury Staging] - Name: SLACK_SNS_TOPIC Value: !Ref SlackMessageRelaySnsTopicArn - Name: SLACK_CHANNEL_ID @@ -545,12 +538,6 @@ Resources: Value: !Ref SlowWorkerRelaySqsQueue - Name: RAILS_ENV Value: !Ref EnvironmentTypeLowercase - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://api.honeycomb.io - - Name: OTEL_EXPORTER_OTLP_HEADERS - Value: !Sub x-honeycomb-team=${HoneycombApiKey} - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, Augury Production, Augury Staging] - Name: SLACK_SNS_TOPIC Value: !Ref SlackMessageRelaySnsTopicArn - Name: SLACK_CHANNEL_ID @@ -1011,12 +998,6 @@ Resources: Value: !If [IsProduction, production, staging] - Name: RAILS_ENV Value: !Ref EnvironmentTypeLowercase - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://api.honeycomb.io - - Name: OTEL_EXPORTER_OTLP_HEADERS - Value: !Sub x-honeycomb-team=${HoneycombApiKey} - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, Augury Production, Augury Staging] - Name: SLACK_SNS_TOPIC Value: !Ref SlackMessageRelaySnsTopicArn - Name: SLACK_CHANNEL_ID diff --git a/spire/templates/apps/exchange.yml b/spire/templates/apps/exchange.yml index 8642cf77..b1eefe9d 100644 --- a/spire/templates/apps/exchange.yml +++ b/spire/templates/apps/exchange.yml @@ -490,12 +490,6 @@ Resources: Value: mem_cache_store - Name: RUBYOPT Value: "-W0" - - Name: OTEL_EXPORTER - Value: otlp - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, ID Production, ID Staging] - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://otel.signoz.prx.tech:443 Essential: true Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag} LinuxParameters: @@ -733,12 +727,6 @@ Resources: Value: mem_cache_store - Name: RUBYOPT Value: "-W0" - - Name: OTEL_EXPORTER - Value: otlp - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, ID Production, ID Staging] - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://otel.signoz.prx.tech:443 Essential: true Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag} LinuxParameters: diff --git a/spire/templates/apps/feeder.yml b/spire/templates/apps/feeder.yml index 40a0fc73..1c52ec2b 100644 --- a/spire/templates/apps/feeder.yml +++ b/spire/templates/apps/feeder.yml @@ -72,7 +72,6 @@ Parameters: PublicFeedsHostname: { Type: String } DovetailAppleApiBridgeEndpointUrl: { Type: String } SlackMessageRelaySnsTopicArn: { Type: String } - SignozAccessToken: { Type: String } Conditions: IsProduction: !Equals [!Ref EnvironmentType, Production] @@ -860,14 +859,6 @@ Resources: Value: !Ref S3SigningAccessKeyId - Name: UPLOAD_SIGNING_SERVICE_URL Value: !Ref S3SigningEndpointUrl - - Name: OTEL_EXPORTER - Value: otlp - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, Feeder Production, Feeder Staging] - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://otel.signoz.prx.tech:443 - # - Name: OTEL_EXPORTER_OTLP_HEADERS - # Value: !Sub signoz-access-token=${SignozAccessToken} Essential: true Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag} LinuxParameters: @@ -1032,14 +1023,6 @@ Resources: Value: true - Name: WORKER_COUNT Value: !If [IsProduction, 8, 5] - - Name: OTEL_EXPORTER - Value: otlp - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, Feeder Production, Feeder Staging] - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://otel.signoz.prx.tech:443 - # - Name: OTEL_EXPORTER_OTLP_HEADERS - # Value: !Sub signoz-access-token=${SignozAccessToken} Essential: true Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag} LinuxParameters: diff --git a/spire/templates/apps/id.yml b/spire/templates/apps/id.yml index 3028e447..85a49150 100644 --- a/spire/templates/apps/id.yml +++ b/spire/templates/apps/id.yml @@ -320,12 +320,6 @@ Resources: Value: !Ref FeederHostname - Name: METRICS_HOST Value: !Ref MetricsHostname - - Name: OTEL_EXPORTER - Value: otlp - - Name: OTEL_SERVICE_NAME - Value: !If [IsProduction, ID Production, ID Staging] - - Name: OTEL_EXPORTER_OTLP_ENDPOINT - Value: https://otel.signoz.prx.tech:443 Essential: true Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag} LinuxParameters: diff --git a/spire/templates/root.yml b/spire/templates/root.yml index 5fae618d..3e2c0cdc 100644 --- a/spire/templates/root.yml +++ b/spire/templates/root.yml @@ -23,7 +23,6 @@ Parameters: SharedAuroraPostgresqlEndpoint: { Type: AWS::SSM::Parameter::Value } SharedAuroraPostgresqlPort: { Type: String, Default: "3306" } NewRelicApiKeyPrxLite: { Type: AWS::SSM::Parameter::Value, Default: /prx/global/Spire/new-relic-lite-api-key } - SignozAccessToken: { Type: AWS::SSM::Parameter::Value, Default: /prx/global/Spire/signoz-access-token } AuthorizedKeys: { Type: AWS::SSM::Parameter::Value>, Default: /prx/global/Spire/authorized-keys, NoEcho: true } NestedChangeSetScrubbingResourcesState: Type: String @@ -753,7 +752,6 @@ Resources: VpcCidrBlock: !GetAtt SharedVpcStack.Outputs.VpcCidrBlock VpcIpv6CidrBlocks: !GetAtt SharedVpcStack.Outputs.VpcIpv6CidrBlocks NewRelicApiKeyPrxLite: !Ref NewRelicApiKeyPrxLite - SignozAccessToken: !Ref SignozAccessToken EnvironmentType: !Ref EnvironmentType EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation EnvironmentTypeLowercase: !GetAtt Constants2.Outputs.EnvironmentTypeLowercase