diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 1ab8d8637e..9d8ce8a7b2 100644 --- 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:password@smtp.host.com: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 index ee25eea75e..8bab7e6403 100644 --- 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 index 59c5cac574..6c879bb4ad 100644 --- 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 index cbda6c773e..c7bfc2a380 100644 --- 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 index d9688c954c..08d7949cdf 100644 --- 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 deleted file mode 100644 index 56d007dd27..0000000000 --- a/k8s/exceptionless/templates/statsd.yaml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if .Values.statsd.token -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "exceptionless.fullname" . }}-statsd - labels: - app: {{ template "exceptionless.name" . }} - component: {{ template "exceptionless.fullname" . }}-statsd - chart: {{ template "exceptionless.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: 1 - selector: - matchLabels: - component: {{ template "exceptionless.fullname" . }}-statsd - template: - metadata: - labels: - app: {{ template "exceptionless.name" . }} - component: {{ template "exceptionless.fullname" . }}-statsd - chart: {{ template "exceptionless.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} - spec: - containers: - - name: {{ template "exceptionless.name" . }}-statsd - image: everydayhero/statsd:latest - imagePullPolicy: {{ .Values.jobs.image.pullPolicy }} - env: - - name: LIBRATO_SOURCE - value: unique-per-statsd-instance - - name: LIBRATO_TOKEN - value: {{ .Values.statsd.token }} - - name: LIBRATO_USER - value: {{ .Values.statsd.user }} - resources: - requests: - memory: 100Mi - cpu: 100m - limits: - memory: 400Mi - cpu: 300m ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ template "exceptionless.fullname" . }}-statsd - labels: - app: {{ template "exceptionless.name" . }} - component: {{ template "exceptionless.fullname" . }}-statsd - chart: {{ template "exceptionless.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - - port: 8125 - targetPort: 8125 - protocol: UDP - name: statsd - selector: - component: {{ template "exceptionless.fullname" . }}-statsd - -{{- end -}} diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml index 468fe76283..7d5606b6db 100644 --- 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 index 97e51b7630..b5ea4f4b20 100644 --- 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:password@smtp.host.com: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 index 0c828acb12..627450fe93 100644 --- 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 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 index aa4941f594..d85f097bb2 100644 --- a/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj +++ b/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj @@ -9,6 +9,7 @@ + @@ -31,4 +32,4 @@ - \ No newline at end of file +