Merge branch 'main' into feature/aspire

exceptionless · Apr 9, 2024 · bd4fd97 · bd4fd97
2 parents b9fa64f + d89fcd7
commit bd4fd97
Show file tree

Hide file tree

Showing 78 changed files with 452 additions and 393 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
   elasticsearch:
-    image: exceptionless/elasticsearch:8.11.1
+    image: exceptionless/elasticsearch:8.13.1
     environment:
       node.name: elasticsearch
       cluster.name: exceptionless
@@ -38,7 +38,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.11.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     environment:
       xpack.security.enabled: "false"
     ports:

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,5 +1,11 @@
 name: Build
-on: [push, pull_request]
+
+on:
+  push:
+    branches: [main]
+    tags: ['v*']
+  pull_request:
+
 env:
   TERM: xterm
   DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
@@ -144,7 +150,7 @@ jobs:
       - name: Run Integration Tests
         run: echo "npm run test:integration"
 
-  build-docker:
+  build-and-push-docker:
 
     runs-on: ubuntu-latest
     needs: [version]
@@ -206,7 +212,7 @@ jobs:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Wait for test jobs
+      - name: Wait for test jobs # doing it this way so we don't have to copy artifacts between jobs
         uses: yogeshlonkar/wait-for-jobs@v0
         with:
           jobs: 'test-api,test-client'
@@ -245,7 +251,7 @@ jobs:
 
   deploy:
     if: "${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }}"
-    needs: [version,build-docker]
+    needs: [version,build-and-push-docker]
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
@@ -260,9 +266,7 @@ jobs:
 
       - name: Install Helm
         if: "${{ env.DOCKER_USERNAME != '' && github.event_name != 'pull_request' }}"
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.13.0
+        uses: azure/setup-helm@v4
 
       - name: Deploy Changes to Development Environment
         if: "${{ env.DOCKER_USERNAME != '' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}"

diff --git a/Dockerfile b/Dockerfile
@@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
 
 # completely self-contained
 
-FROM exceptionless/elasticsearch:8.11.1 AS exceptionless
+FROM exceptionless/elasticsearch:8.13.1 AS exceptionless
 
 WORKDIR /app
 COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -157,7 +157,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]
 
 # completely self-contained 7.x
 
-FROM exceptionless/elasticsearch:7.17.18 AS exceptionless7
+FROM exceptionless/elasticsearch:7.17.19 AS exceptionless7
 
 WORKDIR /app
 COPY --from=job-publish /app/src/Exceptionless.Job/out ./

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 
 [![Build](https://github.com/exceptionless/Exceptionless/workflows/Build/badge.svg?branch=main)](https://github.com/exceptionless/Exceptionless/actions?query=branch%3Amain)
 [![Discord](https://img.shields.io/discord/715744504891703319)](https://discord.gg/6HxgFCx)
+[![BuiltWithDot.Net shield](https://builtwithdot.net/project/100/exceptionless-csharp-error-reporting/badge)](https://builtwithdot.net/project/100/exceptionless-csharp-error-reporting)
 
 The definition of the word exceptionless is: to be without exception. [Exceptionless](https://exceptionless.com) provides real-time error reporting for your JavaScript, Node, .NET Core, ASP.NET, Web API, WebForms, WPF, Console, and MVC apps. It organizes the gathered information into simple actionable data that will help your app become exceptionless!
 

diff --git a/build/docker/elasticsearch/7.x/Dockerfile b/build/docker/elasticsearch/7.x/Dockerfile
@@ -1,5 +1,5 @@
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.18
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.19
 
 RUN elasticsearch-plugin install -b mapper-size
 RUN elasticsearch-plugin install -b repository-azure

diff --git a/build/docker/elasticsearch/8.x/Dockerfile b/build/docker/elasticsearch/8.x/Dockerfile
@@ -1,6 +1,5 @@
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.1
 
 RUN elasticsearch-plugin install -b mapper-size
-RUN elasticsearch-plugin install -b repository-azure
-RUN elasticsearch-plugin install -b repository-s3
+
diff --git a/docker/docker-compose.7x.yml b/docker/docker-compose.7x.yml
@@ -2,7 +2,7 @@ version: "2.2"
 
 services:
   elasticsearch:
-    image: exceptionless/elasticsearch:7.17.18
+    image: exceptionless/elasticsearch:7.17.19
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -16,7 +16,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:7.17.18
+    image: docker.elastic.co/kibana/kibana:7.17.19
     ports:
       - 5601:5601
 

diff --git a/docker/docker-compose.apm.yml b/docker/docker-compose.apm.yml
@@ -2,7 +2,7 @@ version: "2.2"
 
 services:
   setup:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
     user: "0"
@@ -53,7 +53,7 @@ services:
     depends_on:
       setup:
         condition: service_healthy
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
       - esdata:/usr/share/elasticsearch/data
@@ -98,7 +98,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/kibana/kibana:8.12.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     volumes:
       - certs:/usr/share/kibana/config/certs
     ports:
@@ -124,7 +124,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/apm/apm-server:8.12.1
+    image: docker.elastic.co/apm/apm-server:8.13.1
     volumes:
       - certs:/usr/share/apm-server/certs
     ports:

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -50,7 +50,7 @@ services:
       - appdata:/app/storage
 
   elasticsearch:
-    image: exceptionless/elasticsearch:8.12.1
+    image: exceptionless/elasticsearch:8.13.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -64,7 +64,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.12.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     ports:
       - 5601:5601
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   elasticsearch:
-    image: exceptionless/elasticsearch:8.12.1
+    image: exceptionless/elasticsearch:8.13.1
     environment:
       node.name: elasticsearch
       cluster.name: exceptionless
@@ -18,7 +18,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.12.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     environment:
       xpack.security.enabled: "false"
     ports:

diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   name: elastic-monitor
   namespace: elastic-system
 spec:
-  version: 8.11.1
+  version: 8.13.1
   nodeSets:
     - name: main
       count: 3
@@ -50,7 +50,7 @@ metadata:
   name: kibana-monitor
   namespace: elastic-system
 spec:
-  version: 8.11.1
+  version: 8.13.1
   count: 1
   elasticsearchRef:
     name: elastic-monitor
@@ -115,12 +115,12 @@ metadata:
   name: elastic-monitor
   namespace: elastic-system
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: letsencrypt-prod
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     nginx.ingress.kubernetes.io/proxy-ssl-verify: "off"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
         - kibana.exceptionless.io
@@ -144,7 +144,7 @@ metadata:
   name: fleet-server
   namespace: elastic-system
 spec:
-  version: 8.11.1
+  version: 8.13.1
   kibanaRef:
     name: kibana-monitor
   elasticsearchRefs:
@@ -168,7 +168,7 @@ metadata:
   name: elastic-agent
   namespace: elastic-system
 spec:
-  version: 8.11.1
+  version: 8.13.1
   kibanaRef:
     name: kibana-monitor
   fleetServerRef:

diff --git a/k8s/ex-dev-elasticsearch.yaml b/k8s/ex-dev-elasticsearch.yaml
@@ -4,8 +4,8 @@ metadata:
   name: ex-dev
   namespace: ex-dev
 spec:
-  version: 8.11.1
-  image: exceptionless/elasticsearch:8.11.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.13.1
+  image: exceptionless/elasticsearch:8.13.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
   secureSettings:
     - secretName: ex-dev-snapshots
   http:
@@ -57,7 +57,7 @@ metadata:
   name: ex-dev
   namespace: ex-dev
 spec:
-  version: 8.11.1
+  version: 8.13.1
   count: 1
   elasticsearchRef:
     name: ex-dev

diff --git a/k8s/ex-prod-elasticsearch.yaml b/k8s/ex-prod-elasticsearch.yaml
@@ -4,8 +4,8 @@ metadata:
   name: ex-prod
   namespace: ex-prod
 spec:
-  version: 8.11.1
-  image: exceptionless/elasticsearch:8.11.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.13.1
+  image: exceptionless/elasticsearch:8.13.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
   monitoring:
     metrics:
       elasticsearchRefs:
@@ -68,7 +68,7 @@ metadata:
   name: ex-prod
   namespace: ex-prod
 spec:
-  version: 8.11.1
+  version: 8.13.1
   count: 1
   elasticsearchRef:
     name: ex-prod

diff --git a/k8s/ex-prod-tasks.ps1 b/k8s/ex-prod-tasks.ps1
@@ -79,9 +79,9 @@ helm upgrade vpa fairwinds-stable/vpa --namespace vpa -f vpa-values.yaml --reset
 # upgrade elasticsearch operator
 # https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
 # https://github.com/elastic/cloud-on-k8s/releases
-kubectl replace -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml
-kubectl create -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml
-kubectl apply -f https://download.elastic.co/downloads/eck/2.10.0/operator.yaml
+kubectl replace -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml
+kubectl create -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml
+kubectl apply -f https://download.elastic.co/downloads/eck/2.12.1/operator.yaml
 
 # upgrade elasticsearch
 kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml

diff --git a/k8s/ex-prod-values.yaml b/k8s/ex-prod-values.yaml
@@ -37,9 +37,6 @@ config:
   EX_TestEmailAddress: "[email protected]"
   EX_EnableArchive: "false"
   EX_Serilog__MinimumLevel__Default: "Warning"
-  EX_Apm__Endpoint: http://apm.elastic-system.svc:8200
+  EX_OTEL_EXPORTER_OTLP_ENDPOINT: http://apm.elastic-system.svc:8200
   EX_Apm__EnableLogs: "true"
-  EX_Apm__EnableMetrics: "true"
-  EX_Apm__EnableTracing: "true"
   EX_Apm__FullDetails: "true"
-  EX_Apm__Insecure: "true"
diff --git a/k8s/ex-setup.ps1 b/k8s/ex-setup.ps1
@@ -60,8 +60,8 @@ kubectl config set-context --current --namespace=ex-$ENV
 # setup elasticsearch operator
 # https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
 # https://github.com/elastic/cloud-on-k8s/releases
-kubectl create -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml
-kubectl apply -f https://download.elastic.co/downloads/eck/2.10.0/operator.yaml
+kubectl create -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml
+kubectl apply -f https://download.elastic.co/downloads/eck/2.12.1/operator.yaml
 
 # view ES operator logs
 kubectl -n elastic-system logs -f statefulset.apps/elastic-operator

diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml
@@ -51,7 +51,7 @@ elasticsearch:
   connectionString:
   image:
     repository: exceptionless/elasticsearch
-    tag: 8.11.1
+    tag: 8.13.1
     pullPolicy: IfNotPresent
 
 redis:

diff --git a/samples/docker-compose.all-in-one.yml b/samples/docker-compose.all-in-one.yml
@@ -20,7 +20,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.11.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     ports:
       - 5601:5601
 

diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       - ex_appdata:/app/storage
 
   elasticsearch:
-    image: exceptionless/elasticsearch:8.11.1
+    image: exceptionless/elasticsearch:8.13.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -58,7 +58,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.11.1
+    image: docker.elastic.co/kibana/kibana:8.13.1
     ports:
       - 5601:5601
 

diff --git a/src/Exceptionless.Core/Bootstrapper.cs b/src/Exceptionless.Core/Bootstrapper.cs
@@ -199,16 +199,16 @@ public static void LogConfiguration(IServiceProvider serviceProvider, AppOptions
             return;
 
         if (String.IsNullOrEmpty(appOptions.CacheOptions.Provider))
-            logger.LogWarning("Distributed cache is NOT enabled on {MachineName}.", Environment.MachineName);
+            logger.LogWarning("Distributed cache is NOT enabled on {MachineName}", Environment.MachineName);
 
         if (String.IsNullOrEmpty(appOptions.MessageBusOptions.Provider))
-            logger.LogWarning("Distributed message bus is NOT enabled on {MachineName}.", Environment.MachineName);
+            logger.LogWarning("Distributed message bus is NOT enabled on {MachineName}", Environment.MachineName);
 
         if (String.IsNullOrEmpty(appOptions.QueueOptions.Provider))
-            logger.LogWarning("Distributed queue is NOT enabled on {MachineName}.", Environment.MachineName);
+            logger.LogWarning("Distributed queue is NOT enabled on {MachineName}", Environment.MachineName);
 
         if (String.IsNullOrEmpty(appOptions.StorageOptions.Provider))
-            logger.LogWarning("Distributed storage is NOT enabled on {MachineName}.", Environment.MachineName);
+            logger.LogWarning("Distributed storage is NOT enabled on {MachineName}", Environment.MachineName);
 
         if (!appOptions.EnableWebSockets)
             logger.LogWarning("Web Sockets is NOT enabled on {MachineName}", Environment.MachineName);
@@ -268,7 +268,7 @@ public static void AddHostedJobs(IServiceCollection services, ILoggerFactory log
         services.AddCronJob<MaintainIndexesJob>("10 */2 * * *");
 
         var logger = loggerFactory.CreateLogger<Bootstrapper>();
-        logger.LogWarning("Jobs running in process.");
+        logger.LogWarning("Jobs running in process");
     }
 
     public static DynamicTypeContractResolver GetJsonContractResolver()