Remove statsd

exceptionless · Jul 31, 2023 · ef3b7f8 · ef3b7f8
1 parent daed593
commit ef3b7f8
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 87 deletions.
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -15,7 +15,6 @@ services:
       EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
       #EX_ConnectionStrings__Email: smtps://user:[email protected]:587
       EX_ConnectionStrings__MessageBus: provider=redis
-      #EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
       EX_ConnectionStrings__Queue: provider=redis
       EX_ConnectionStrings__Redis: server=redis,abortConnect=false
       #ASPNETCORE_URLS: http://+;https://+
@@ -44,7 +43,6 @@ services:
       EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
       EX_ConnectionStrings__Email: smtp://localhost:1025
       EX_ConnectionStrings__MessageBus: provider=redis
-      #EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
       EX_ConnectionStrings__Queue: provider=redis
       EX_ConnectionStrings__Redis: server=redis,abortConnect=false
       EX_ConnectionStrings__Storage: provider=folder;path=/app/storage

diff --git a/k8s/ex-prod-tasks.ps1 b/k8s/ex-prod-tasks.ps1
@@ -100,8 +100,6 @@ helm upgrade `
     --set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `
     --set "redis.connectionString=$REDIS_CONNECTIONSTRING" `
     --set "storage.connectionString=$STORAGE_CONNECTIONSTRING" `
-    --set "statsd.token=$STATSD_TOKEN" `
-    --set "statsd.user=$STATSD_USER" `
     --set "config.EX_ApplicationInsightsKey=$EX_ApplicationInsightsKey" `
     --set "config.EX_ConnectionStrings__OAuth=$EX_ConnectionStrings__OAuth" `
     --set "config.EX_ExceptionlessApiKey=$EX_ExceptionlessApiKey" `

diff --git a/k8s/ex-prod-values.yaml b/k8s/ex-prod-values.yaml
@@ -41,4 +41,4 @@ config:
   EX_Apm__EnableMetrics: "true"
   EX_Apm__EnableTracing: "true"
   EX_Apm__FullDetails: "true"
-  EX_Apm__Insecure: "false"
+  EX_Apm__Insecure: "true"
diff --git a/k8s/ex-setup.ps1 b/k8s/ex-setup.ps1
@@ -154,8 +154,6 @@ helm install ex-$ENV .\exceptionless --namespace ex-$ENV --values ex-$ENV-values
     --set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `
     --set "redis.connectionString=$REDIS_CONNECTIONSTRING" `
     --set "storage.connectionString=$STORAGE_CONNECTIONSTRING" `
-    --set "statsd.token=$STATSD_TOKEN" `
-    --set "statsd.user=$STATSD_USER" `
     --set "config.EX_ApplicationInsightsKey=$EX_ApplicationInsightsKey" `
     --set "config.EX_ConnectionStrings__OAuth=$EX_ConnectionStrings__OAuth" `
     --set "config.EX_ExceptionlessApiKey=$EX_ExceptionlessApiKey" `

diff --git a/k8s/exceptionless/templates/config.yaml b/k8s/exceptionless/templates/config.yaml
@@ -21,9 +21,7 @@ data:
     EX_ConnectionStrings__Storage: {{ default "provider=folder;path=/app/storage" .Values.storage.connectionString }}
     EX_ConnectionStrings__Cache: {{ default "provider=redis;" .Values.cache.connectionString }}
     EX_ConnectionStrings__MessageBus: {{ default "provider=redis;" .Values.messagebus.connectionString }}
-    {{- if .Values.statsd.token }}
-    EX_ConnectionStrings__Metrics: provider=statsd;server={{ template "exceptionless.fullname" . }}-statsd
-    {{- else if .Values.metrics.connectionString }}
+    {{- if .Values.metrics.connectionString }}
     EX_ConnectionStrings__Metrics: {{ .Values.metrics.connectionString }}
     {{- end }}
     EX_ConnectionStrings__Queue: {{ default "provider=redis;" .Values.queue.connectionString }}

diff --git a/k8s/exceptionless/templates/statsd.yaml b/k8s/exceptionless/templates/statsd.yaml
diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml
@@ -41,10 +41,6 @@ jobs:
   eventUsage:
     replicaCount: 1
 
-statsd:
-  token:
-  user:
-
 config: {}
 #  key: value
 

diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml
@@ -11,7 +11,6 @@ services:
       EX_ConnectionStrings__Cache: provider=redis
       EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
       EX_ConnectionStrings__MessageBus: provider=redis
-      #EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
       EX_ConnectionStrings__Queue: provider=redis
       EX_ConnectionStrings__Redis: server=redis,abortConnect=false
       EX_ConnectionStrings__Storage: provider=folder;path=/app/storage
@@ -39,7 +38,6 @@ services:
       EX_ConnectionStrings__Elasticsearch: server=http://elasticsearch:9200
       #EX_ConnectionStrings__Email: smtps://user:[email protected]:587
       EX_ConnectionStrings__MessageBus: provider=redis
-      #EX_ConnectionStrings__Metrics: provider=statsd;server=statsd;
       EX_ConnectionStrings__Queue: provider=redis
       EX_ConnectionStrings__Redis: server=redis,abortConnect=false
       EX_ConnectionStrings__Storage: provider=folder;path=/app/storage

diff --git a/src/Exceptionless.Insulation/Bootstrapper.cs b/src/Exceptionless.Insulation/Bootstrapper.cs
@@ -142,9 +142,7 @@ private static void RegisterMessageBus(IServiceCollection container, MessageBusO
 
     private static IConnectionMultiplexer GetRedisConnection(Dictionary<string, string> options)
     {
-        // TODO: Remove this extra config parse step when sentinel bug is fixed
-        var config = ConfigurationOptions.Parse(options.GetString("server"));
-        return ConnectionMultiplexer.Connect(config);
+        return ConnectionMultiplexer.Connect(options.GetString("server"));
     }
 
     private static void RegisterQueue(IServiceCollection container, QueueOptions options, bool runMaintenanceTasks)

diff --git a/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj b/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="Foundatio.Minio" Version="10.6.1" />
     <PackageReference Include="Foundatio.RabbitMQ" Version="10.6.1" />
     <PackageReference Include="Foundatio.Redis" Version="10.6.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
@@ -31,4 +32,4 @@
     <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="..\.." />
     <Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="..\.." />
   </Target>
-</Project>
+</Project>