Skip to content

Commit

Permalink
Merge pull request #800 from PRX/chore/remove_signoz
Browse files Browse the repository at this point in the history
Remove signoz ENVs
cavis authored Jan 15, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents e42f5de + 0cc64ea commit ed63132
Showing 6 changed files with 0 additions and 58 deletions.
2 changes: 0 additions & 2 deletions spire/templates/apps-200A.yml
Original file line number Diff line number Diff line change
@@ -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 }
19 changes: 0 additions & 19 deletions spire/templates/apps/augury.yml
Original file line number Diff line number Diff line change
@@ -67,7 +67,6 @@ Parameters:
CmsHostname: { Type: String }
DovetailRouterHostname: { Type: String }
AdFilesS3BucketArn: { Type: AWS::SSM::Parameter::Value<String> }
HoneycombApiKey: { Type: AWS::SSM::Parameter::Value<String>, 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
12 changes: 0 additions & 12 deletions spire/templates/apps/exchange.yml
Original file line number Diff line number Diff line change
@@ -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:
17 changes: 0 additions & 17 deletions spire/templates/apps/feeder.yml
Original file line number Diff line number Diff line change
@@ -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:
6 changes: 0 additions & 6 deletions spire/templates/apps/id.yml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 0 additions & 2 deletions spire/templates/root.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@ Parameters:
SharedAuroraPostgresqlEndpoint: { Type: AWS::SSM::Parameter::Value<String> }
SharedAuroraPostgresqlPort: { Type: String, Default: "3306" }
NewRelicApiKeyPrxLite: { Type: AWS::SSM::Parameter::Value<String>, Default: /prx/global/Spire/new-relic-lite-api-key }
SignozAccessToken: { Type: AWS::SSM::Parameter::Value<String>, Default: /prx/global/Spire/signoz-access-token }
AuthorizedKeys: { Type: AWS::SSM::Parameter::Value<List<String>>, 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

0 comments on commit ed63132

Please sign in to comment.