Merge branch 'main' into feature/shadcn-forms

exceptionless · Oct 10, 2024 · 3e59459 · 3e59459
2 parents aa7ab62 + 83aa53a
commit 3e59459
Show file tree

Hide file tree

Showing 33 changed files with 493 additions and 478 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/dotnet:0-8.0
+FROM mcr.microsoft.com/devcontainers/dotnet:0-9.0
 
 RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
 

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.14.1
+    image: exceptionless/elasticsearch:8.15.2
     environment:
       node.name: elasticsearch
       cluster.name: exceptionless
@@ -38,7 +38,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.14.1
+    image: docker.elastic.co/kibana/kibana:8.15.2
     environment:
       xpack.security.enabled: "false"
     ports:

diff --git a/.github/workflows/build-arm64.yml b/.github/workflows/build-arm64.yml
@@ -25,8 +25,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
-          #dotnet-quality: preview
+          dotnet-version: 9.0.*
+          dotnet-quality: preview
       - name: Build Reason
         env:
           GITHUB_EVENT: ${{ toJson(github) }}

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -38,8 +38,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
-          #dotnet-quality: preview
+          dotnet-version: 9.0.*
+          dotnet-quality: preview
 
       - name: Version
         id: version
@@ -64,8 +64,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
-          #dotnet-quality: preview
+          dotnet-version: 9.0.*
+          dotnet-quality: preview
 
       - name: Start Services
         working-directory: docker

diff --git a/.github/workflows/elasticsearch-docker-7.yml b/.github/workflows/elasticsearch-docker-7.yml
@@ -18,8 +18,8 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.*
-        #dotnet-quality: preview
+        dotnet-version: 9.0.*
+        dotnet-quality: preview
     - name: Build Reason
       env:
         GITHUB_EVENT: ${{ toJson(github) }}

diff --git a/.github/workflows/elasticsearch-docker-8.yml b/.github/workflows/elasticsearch-docker-8.yml
@@ -18,8 +18,8 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.*
-        #dotnet-quality: preview
+        dotnet-version: 9.0.*
+        dotnet-quality: preview
     - name: Build Reason
       env:
         GITHUB_EVENT: ${{ toJson(github) }}

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,7 +7,7 @@
       "request": "launch",
       "preLaunchTask": "build",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net8.0/Exceptionless.Web.dll",
+      "program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net9.0/Exceptionless.Web.dll",
       "args": [],
       "cwd": "${workspaceFolder}/src/Exceptionless.Web",
       "stopAtEntry": false,
@@ -25,7 +25,7 @@
       "request": "launch",
       "preLaunchTask": "build",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net8.0/Exceptionless.Job.dll",
+      "program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net9.0/Exceptionless.Job.dll",
       "args": [],
       "cwd": "${workspaceFolder}",
       "stopAtEntry": false,

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 WORKDIR /app
 
 COPY ./*.sln ./NuGet.Config ./
@@ -36,7 +36,7 @@ RUN dotnet publish -c Release -o out
 
 # job
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS job
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS job
 WORKDIR /app
 COPY --from=job-publish /app/src/Exceptionless.Job/out ./
 
@@ -50,13 +50,13 @@ FROM build AS api-publish
 WORKDIR /app/src/Exceptionless.Web
 
 RUN apt-get update -yq
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
 
 RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true
 
 # api
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS api
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS api
 WORKDIR /app
 COPY --from=api-publish /app/src/Exceptionless.Web/out ./
 
@@ -70,13 +70,13 @@ FROM build AS app-publish
 WORKDIR /app/src/Exceptionless.Web
 
 RUN apt-get update -yq
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
 
 RUN dotnet publish -c Release -o out
 
 # app
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS app
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS app
 
 WORKDIR /app
 COPY --from=app-publish /app/src/Exceptionless.Web/out ./
@@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
 
 # completely self-contained
 
-FROM exceptionless/elasticsearch:8.14.1 AS exceptionless
+FROM exceptionless/elasticsearch:8.15.2 AS exceptionless
 
 WORKDIR /app
 COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -148,7 +148,7 @@ USER elasticsearch
 
 RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
     chmod +x dotnet-install.sh && \
-    ./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
+    ./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
     rm dotnet-install.sh
 
 EXPOSE 8080 9200
@@ -206,7 +206,7 @@ USER elasticsearch
 
 RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
     chmod +x dotnet-install.sh && \
-    ./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
+    ./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
     rm dotnet-install.sh
 
 EXPOSE 8080 9200

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ _In appreciation for anyone who submits a non-trivial pull request, we will give
 - Please read the [contributing document](https://github.com/exceptionless/Exceptionless/blob/main/CONTRIBUTING.md)
 - Requirements
   - [Docker](https://www.docker.com/get-docker)
-  - [.NET 8.0](https://dotnet.microsoft.com/)
+  - [.NET 9.0](https://dotnet.microsoft.com/)
   - [Node 20+](https://nodejs.org/)
 - Visual Studio Code
   - Open Visual Studio Code and then open the Exceptionless root folder

diff --git a/build/docker/elasticsearch/8.x/Dockerfile b/build/docker/elasticsearch/8.x/Dockerfile
@@ -1,5 +1,5 @@
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.14.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.15.2
 
 RUN elasticsearch-plugin install -b mapper-size
 
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.14.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
     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.14.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
     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.14.1
+    image: docker.elastic.co/kibana/kibana:8.15.2
     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.14.1
+    image: docker.elastic.co/apm/apm-server:8.15.2
     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.14.1
+    image: exceptionless/elasticsearch:8.15.2
     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.14.1
+    image: docker.elastic.co/kibana/kibana:8.15.2
     ports:
       - 5601:5601
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: exceptionless/elasticsearch:8.14.1
+    image: exceptionless/elasticsearch:8.15.2
     environment:
       node.name: elasticsearch
       cluster.name: exceptionless
@@ -16,7 +16,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.14.1
+    image: docker.elastic.co/kibana/kibana:8.15.2
     environment:
       xpack.security.enabled: "false"
     ports:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100-rc*",
     "rollForward": "latestMinor"
   }
 }
diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml
@@ -4,7 +4,13 @@ metadata:
   name: elastic-monitor
   namespace: elastic-system
 spec:
-  version: 8.14.1
+  version: 8.15.2
+  podDisruptionBudget:
+    spec:
+      minAvailable: 2
+      selector:
+        matchLabels:
+          elasticsearch.k8s.elastic.co/cluster-name: elastic-monitor
   nodeSets:
     - name: main
       count: 3
@@ -50,7 +56,7 @@ metadata:
   name: kibana-monitor
   namespace: elastic-system
 spec:
-  version: 8.14.1
+  version: 8.15.2
   count: 1
   elasticsearchRef:
     name: elastic-monitor
@@ -144,7 +150,7 @@ metadata:
   name: fleet-server
   namespace: elastic-system
 spec:
-  version: 8.14.1
+  version: 8.15.2
   kibanaRef:
     name: kibana-monitor
   elasticsearchRefs:
@@ -168,7 +174,7 @@ metadata:
   name: elastic-agent
   namespace: elastic-system
 spec:
-  version: 8.14.1
+  version: 8.15.2
   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.14.1
-  image: exceptionless/elasticsearch:8.14.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.15.2
+  image: exceptionless/elasticsearch:8.15.2 # 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.14.1
+  version: 8.15.2
   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.14.1
-  image: exceptionless/elasticsearch:8.14.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.15.2
+  image: exceptionless/elasticsearch:8.15.2 # 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.14.1
+  version: 8.15.2
   count: 1
   elasticsearchRef:
     name: ex-prod

diff --git a/k8s/ex-prod-tasks.ps1 b/k8s/ex-prod-tasks.ps1
@@ -80,9 +80,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.13.0/crds.yaml
-kubectl create -f https://download.elastic.co/downloads/eck/2.13.0/crds.yaml
-kubectl apply -f https://download.elastic.co/downloads/eck/2.13.0/operator.yaml
+kubectl replace -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
+kubectl create -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
+kubectl apply -f https://download.elastic.co/downloads/eck/2.14.0/operator.yaml
 
 # upgrade elasticsearch
 kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml

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.13.0/crds.yaml
-kubectl apply -f https://download.elastic.co/downloads/eck/2.13.0/operator.yaml
+kubectl create -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
+kubectl apply -f https://download.elastic.co/downloads/eck/2.14.0/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.14.1
+    tag: 8.15.2
     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.14.1
+    image: docker.elastic.co/kibana/kibana:8.15.2
     ports:
       - 5601:5601