Skip to content

Commit ef3b7f8

Browse files
committed
Remove statsd
1 parent daed593 commit ef3b7f8

File tree

10 files changed

+5
-87
lines changed

10 files changed

+5
-87
lines changed

docker/docker-compose.dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ services:
1515
EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
1616
#EX_ConnectionStrings__Email: smtps://user:password@smtp.host.com:587
1717
EX_ConnectionStrings__MessageBus: provider=redis
18-
#EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
1918
EX_ConnectionStrings__Queue: provider=redis
2019
EX_ConnectionStrings__Redis: server=redis,abortConnect=false
2120
#ASPNETCORE_URLS: http://+;https://+
@@ -44,7 +43,6 @@ services:
4443
EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
4544
EX_ConnectionStrings__Email: smtp://localhost:1025
4645
EX_ConnectionStrings__MessageBus: provider=redis
47-
#EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
4846
EX_ConnectionStrings__Queue: provider=redis
4947
EX_ConnectionStrings__Redis: server=redis,abortConnect=false
5048
EX_ConnectionStrings__Storage: provider=folder;path=/app/storage

k8s/ex-prod-tasks.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ helm upgrade `
100100
--set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `
101101
--set "redis.connectionString=$REDIS_CONNECTIONSTRING" `
102102
--set "storage.connectionString=$STORAGE_CONNECTIONSTRING" `
103-
--set "statsd.token=$STATSD_TOKEN" `
104-
--set "statsd.user=$STATSD_USER" `
105103
--set "config.EX_ApplicationInsightsKey=$EX_ApplicationInsightsKey" `
106104
--set "config.EX_ConnectionStrings__OAuth=$EX_ConnectionStrings__OAuth" `
107105
--set "config.EX_ExceptionlessApiKey=$EX_ExceptionlessApiKey" `

k8s/ex-prod-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ config:
4141
EX_Apm__EnableMetrics: "true"
4242
EX_Apm__EnableTracing: "true"
4343
EX_Apm__FullDetails: "true"
44-
EX_Apm__Insecure: "false"
44+
EX_Apm__Insecure: "true"

k8s/ex-setup.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ helm install ex-$ENV .\exceptionless --namespace ex-$ENV --values ex-$ENV-values
154154
--set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `
155155
--set "redis.connectionString=$REDIS_CONNECTIONSTRING" `
156156
--set "storage.connectionString=$STORAGE_CONNECTIONSTRING" `
157-
--set "statsd.token=$STATSD_TOKEN" `
158-
--set "statsd.user=$STATSD_USER" `
159157
--set "config.EX_ApplicationInsightsKey=$EX_ApplicationInsightsKey" `
160158
--set "config.EX_ConnectionStrings__OAuth=$EX_ConnectionStrings__OAuth" `
161159
--set "config.EX_ExceptionlessApiKey=$EX_ExceptionlessApiKey" `

k8s/exceptionless/templates/config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ data:
2121
EX_ConnectionStrings__Storage: {{ default "provider=folder;path=/app/storage" .Values.storage.connectionString }}
2222
EX_ConnectionStrings__Cache: {{ default "provider=redis;" .Values.cache.connectionString }}
2323
EX_ConnectionStrings__MessageBus: {{ default "provider=redis;" .Values.messagebus.connectionString }}
24-
{{- if .Values.statsd.token }}
25-
EX_ConnectionStrings__Metrics: provider=statsd;server={{ template "exceptionless.fullname" . }}-statsd
26-
{{- else if .Values.metrics.connectionString }}
24+
{{- if .Values.metrics.connectionString }}
2725
EX_ConnectionStrings__Metrics: {{ .Values.metrics.connectionString }}
2826
{{- end }}
2927
EX_ConnectionStrings__Queue: {{ default "provider=redis;" .Values.queue.connectionString }}

k8s/exceptionless/templates/statsd.yaml

Lines changed: 0 additions & 67 deletions
This file was deleted.

k8s/exceptionless/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ jobs:
4141
eventUsage:
4242
replicaCount: 1
4343

44-
statsd:
45-
token:
46-
user:
47-
4844
config: {}
4945
# key: value
5046

samples/docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ services:
1111
EX_ConnectionStrings__Cache: provider=redis
1212
EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
1313
EX_ConnectionStrings__MessageBus: provider=redis
14-
#EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
1514
EX_ConnectionStrings__Queue: provider=redis
1615
EX_ConnectionStrings__Redis: server=redis,abortConnect=false
1716
EX_ConnectionStrings__Storage: provider=folder;path=/app/storage
@@ -39,7 +38,6 @@ services:
3938
EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
4039
#EX_ConnectionStrings__Email: smtps://user:password@smtp.host.com:587
4140
EX_ConnectionStrings__MessageBus: provider=redis
42-
#EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
4341
EX_ConnectionStrings__Queue: provider=redis
4442
EX_ConnectionStrings__Redis: server=redis,abortConnect=false
4543
EX_ConnectionStrings__Storage: provider=folder;path=/app/storage

src/Exceptionless.Insulation/Bootstrapper.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,7 @@ private static void RegisterMessageBus(IServiceCollection container, MessageBusO
142142

143143
private static IConnectionMultiplexer GetRedisConnection(Dictionary<string, string> options)
144144
{
145-
// TODO: Remove this extra config parse step when sentinel bug is fixed
146-
var config = ConfigurationOptions.Parse(options.GetString("server"));
147-
return ConnectionMultiplexer.Connect(config);
145+
return ConnectionMultiplexer.Connect(options.GetString("server"));
148146
}
149147

150148
private static void RegisterQueue(IServiceCollection container, QueueOptions options, bool runMaintenanceTasks)

src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<PackageReference Include="Foundatio.Minio" Version="10.6.1" />
1010
<PackageReference Include="Foundatio.RabbitMQ" Version="10.6.1" />
1111
<PackageReference Include="Foundatio.Redis" Version="10.6.1" />
12+
<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
1213
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
1314
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
1415
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
@@ -31,4 +32,4 @@
3132
<Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="..\.." />
3233
<Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="..\.." />
3334
</Target>
34-
</Project>
35+
</Project>

0 commit comments

Comments
 (0)