Skip to content

Commit 3e59459

Browse files
committed
Merge branch 'main' into feature/shadcn-forms
2 parents aa7ab62 + 83aa53a commit 3e59459

33 files changed

+493
-478
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/dotnet:0-8.0
1+
FROM mcr.microsoft.com/devcontainers/dotnet:0-9.0
22

33
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
44

.devcontainer/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
# (Adding the "ports" property to this file will not forward from a Codespace.)
2323

2424
elasticsearch:
25-
image: exceptionless/elasticsearch:8.14.1
25+
image: exceptionless/elasticsearch:8.15.2
2626
environment:
2727
node.name: elasticsearch
2828
cluster.name: exceptionless
@@ -38,7 +38,7 @@ services:
3838
kibana:
3939
depends_on:
4040
- elasticsearch
41-
image: docker.elastic.co/kibana/kibana:8.14.1
41+
image: docker.elastic.co/kibana/kibana:8.15.2
4242
environment:
4343
xpack.security.enabled: "false"
4444
ports:

.github/workflows/build-arm64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: Setup .NET Core
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 8.0.*
29-
#dotnet-quality: preview
28+
dotnet-version: 9.0.*
29+
dotnet-quality: preview
3030
- name: Build Reason
3131
env:
3232
GITHUB_EVENT: ${{ toJson(github) }}

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- name: Setup .NET Core
3939
uses: actions/setup-dotnet@v4
4040
with:
41-
dotnet-version: 8.0.*
42-
#dotnet-quality: preview
41+
dotnet-version: 9.0.*
42+
dotnet-quality: preview
4343

4444
- name: Version
4545
id: version
@@ -64,8 +64,8 @@ jobs:
6464
- name: Setup .NET Core
6565
uses: actions/setup-dotnet@v4
6666
with:
67-
dotnet-version: 8.0.*
68-
#dotnet-quality: preview
67+
dotnet-version: 9.0.*
68+
dotnet-quality: preview
6969

7070
- name: Start Services
7171
working-directory: docker

.github/workflows/elasticsearch-docker-7.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.*
22-
#dotnet-quality: preview
21+
dotnet-version: 9.0.*
22+
dotnet-quality: preview
2323
- name: Build Reason
2424
env:
2525
GITHUB_EVENT: ${{ toJson(github) }}

.github/workflows/elasticsearch-docker-8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.*
22-
#dotnet-quality: preview
21+
dotnet-version: 9.0.*
22+
dotnet-quality: preview
2323
- name: Build Reason
2424
env:
2525
GITHUB_EVENT: ${{ toJson(github) }}

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"request": "launch",
88
"preLaunchTask": "build",
99
// If you have changed target frameworks, make sure to update the program path.
10-
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net8.0/Exceptionless.Web.dll",
10+
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net9.0/Exceptionless.Web.dll",
1111
"args": [],
1212
"cwd": "${workspaceFolder}/src/Exceptionless.Web",
1313
"stopAtEntry": false,
@@ -25,7 +25,7 @@
2525
"request": "launch",
2626
"preLaunchTask": "build",
2727
// If you have changed target frameworks, make sure to update the program path.
28-
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net8.0/Exceptionless.Job.dll",
28+
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net9.0/Exceptionless.Job.dll",
2929
"args": [],
3030
"cwd": "${workspaceFolder}",
3131
"stopAtEntry": false,

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
WORKDIR /app
33

44
COPY ./*.sln ./NuGet.Config ./
@@ -36,7 +36,7 @@ RUN dotnet publish -c Release -o out
3636

3737
# job
3838

39-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS job
39+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS job
4040
WORKDIR /app
4141
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
4242

@@ -50,13 +50,13 @@ FROM build AS api-publish
5050
WORKDIR /app/src/Exceptionless.Web
5151

5252
RUN apt-get update -yq
53-
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
53+
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
5454

5555
RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true
5656

5757
# api
5858

59-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS api
59+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS api
6060
WORKDIR /app
6161
COPY --from=api-publish /app/src/Exceptionless.Web/out ./
6262

@@ -70,13 +70,13 @@ FROM build AS app-publish
7070
WORKDIR /app/src/Exceptionless.Web
7171

7272
RUN apt-get update -yq
73-
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
73+
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
7474

7575
RUN dotnet publish -c Release -o out
7676

7777
# app
7878

79-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS app
79+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS app
8080

8181
WORKDIR /app
8282
COPY --from=app-publish /app/src/Exceptionless.Web/out ./
@@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9999

100100
# completely self-contained
101101

102-
FROM exceptionless/elasticsearch:8.14.1 AS exceptionless
102+
FROM exceptionless/elasticsearch:8.15.2 AS exceptionless
103103

104104
WORKDIR /app
105105
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -148,7 +148,7 @@ USER elasticsearch
148148

149149
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
150150
chmod +x dotnet-install.sh && \
151-
./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
151+
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
152152
rm dotnet-install.sh
153153

154154
EXPOSE 8080 9200
@@ -206,7 +206,7 @@ USER elasticsearch
206206

207207
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
208208
chmod +x dotnet-install.sh && \
209-
./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
209+
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
210210
rm dotnet-install.sh
211211

212212
EXPOSE 8080 9200

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _In appreciation for anyone who submits a non-trivial pull request, we will give
3232
- Please read the [contributing document](https://github.com/exceptionless/Exceptionless/blob/main/CONTRIBUTING.md)
3333
- Requirements
3434
- [Docker](https://www.docker.com/get-docker)
35-
- [.NET 8.0](https://dotnet.microsoft.com/)
35+
- [.NET 9.0](https://dotnet.microsoft.com/)
3636
- [Node 20+](https://nodejs.org/)
3737
- Visual Studio Code
3838
- Open Visual Studio Code and then open the Exceptionless root folder
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://www.docker.elastic.co/
2-
FROM docker.elastic.co/elasticsearch/elasticsearch:8.14.1
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.15.2
33

44
RUN elasticsearch-plugin install -b mapper-size
55

docker/docker-compose.apm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2.2"
22

33
services:
44
setup:
5-
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
66
volumes:
77
- certs:/usr/share/elasticsearch/config/certs
88
user: "0"
@@ -53,7 +53,7 @@ services:
5353
depends_on:
5454
setup:
5555
condition: service_healthy
56-
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
5757
volumes:
5858
- certs:/usr/share/elasticsearch/config/certs
5959
- esdata:/usr/share/elasticsearch/data
@@ -98,7 +98,7 @@ services:
9898
depends_on:
9999
elasticsearch:
100100
condition: service_healthy
101-
image: docker.elastic.co/kibana/kibana:8.14.1
101+
image: docker.elastic.co/kibana/kibana:8.15.2
102102
volumes:
103103
- certs:/usr/share/kibana/config/certs
104104
ports:
@@ -124,7 +124,7 @@ services:
124124
depends_on:
125125
elasticsearch:
126126
condition: service_healthy
127-
image: docker.elastic.co/apm/apm-server:8.14.1
127+
image: docker.elastic.co/apm/apm-server:8.15.2
128128
volumes:
129129
- certs:/usr/share/apm-server/certs
130130
ports:

docker/docker-compose.dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
- appdata:/app/storage
5151

5252
elasticsearch:
53-
image: exceptionless/elasticsearch:8.14.1
53+
image: exceptionless/elasticsearch:8.15.2
5454
environment:
5555
discovery.type: single-node
5656
xpack.security.enabled: "false"
@@ -64,7 +64,7 @@ services:
6464
kibana:
6565
depends_on:
6666
- elasticsearch
67-
image: docker.elastic.co/kibana/kibana:8.14.1
67+
image: docker.elastic.co/kibana/kibana:8.15.2
6868
ports:
6969
- 5601:5601
7070

docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
elasticsearch:
3-
image: exceptionless/elasticsearch:8.14.1
3+
image: exceptionless/elasticsearch:8.15.2
44
environment:
55
node.name: elasticsearch
66
cluster.name: exceptionless
@@ -16,7 +16,7 @@ services:
1616
kibana:
1717
depends_on:
1818
- elasticsearch
19-
image: docker.elastic.co/kibana/kibana:8.14.1
19+
image: docker.elastic.co/kibana/kibana:8.15.2
2020
environment:
2121
xpack.security.enabled: "false"
2222
ports:

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100-rc*",
44
"rollForward": "latestMinor"
55
}
66
}

k8s/elastic-monitor.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ metadata:
44
name: elastic-monitor
55
namespace: elastic-system
66
spec:
7-
version: 8.14.1
7+
version: 8.15.2
8+
podDisruptionBudget:
9+
spec:
10+
minAvailable: 2
11+
selector:
12+
matchLabels:
13+
elasticsearch.k8s.elastic.co/cluster-name: elastic-monitor
814
nodeSets:
915
- name: main
1016
count: 3
@@ -50,7 +56,7 @@ metadata:
5056
name: kibana-monitor
5157
namespace: elastic-system
5258
spec:
53-
version: 8.14.1
59+
version: 8.15.2
5460
count: 1
5561
elasticsearchRef:
5662
name: elastic-monitor
@@ -144,7 +150,7 @@ metadata:
144150
name: fleet-server
145151
namespace: elastic-system
146152
spec:
147-
version: 8.14.1
153+
version: 8.15.2
148154
kibanaRef:
149155
name: kibana-monitor
150156
elasticsearchRefs:
@@ -168,7 +174,7 @@ metadata:
168174
name: elastic-agent
169175
namespace: elastic-system
170176
spec:
171-
version: 8.14.1
177+
version: 8.15.2
172178
kibanaRef:
173179
name: kibana-monitor
174180
fleetServerRef:

k8s/ex-dev-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-dev
55
namespace: ex-dev
66
spec:
7-
version: 8.14.1
8-
image: exceptionless/elasticsearch:8.14.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.15.2
8+
image: exceptionless/elasticsearch:8.15.2 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-dev-snapshots
1111
http:
@@ -57,7 +57,7 @@ metadata:
5757
name: ex-dev
5858
namespace: ex-dev
5959
spec:
60-
version: 8.14.1
60+
version: 8.15.2
6161
count: 1
6262
elasticsearchRef:
6363
name: ex-dev

k8s/ex-prod-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-prod
55
namespace: ex-prod
66
spec:
7-
version: 8.14.1
8-
image: exceptionless/elasticsearch:8.14.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.15.2
8+
image: exceptionless/elasticsearch:8.15.2 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
monitoring:
1010
metrics:
1111
elasticsearchRefs:
@@ -68,7 +68,7 @@ metadata:
6868
name: ex-prod
6969
namespace: ex-prod
7070
spec:
71-
version: 8.14.1
71+
version: 8.15.2
7272
count: 1
7373
elasticsearchRef:
7474
name: ex-prod

k8s/ex-prod-tasks.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ helm upgrade vpa fairwinds-stable/vpa --namespace vpa -f vpa-values.yaml --reset
8080
# upgrade elasticsearch operator
8181
# https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
8282
# https://github.com/elastic/cloud-on-k8s/releases
83-
kubectl replace -f https://download.elastic.co/downloads/eck/2.13.0/crds.yaml
84-
kubectl create -f https://download.elastic.co/downloads/eck/2.13.0/crds.yaml
85-
kubectl apply -f https://download.elastic.co/downloads/eck/2.13.0/operator.yaml
83+
kubectl replace -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
84+
kubectl create -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
85+
kubectl apply -f https://download.elastic.co/downloads/eck/2.14.0/operator.yaml
8686

8787
# upgrade elasticsearch
8888
kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml

k8s/ex-setup.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ kubectl config set-context --current --namespace=ex-$ENV
6060
# setup elasticsearch operator
6161
# https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
6262
# https://github.com/elastic/cloud-on-k8s/releases
63-
kubectl create -f https://download.elastic.co/downloads/eck/2.13.0/crds.yaml
64-
kubectl apply -f https://download.elastic.co/downloads/eck/2.13.0/operator.yaml
63+
kubectl create -f https://download.elastic.co/downloads/eck/2.14.0/crds.yaml
64+
kubectl apply -f https://download.elastic.co/downloads/eck/2.14.0/operator.yaml
6565

6666
# view ES operator logs
6767
kubectl -n elastic-system logs -f statefulset.apps/elastic-operator

k8s/exceptionless/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ elasticsearch:
5151
connectionString:
5252
image:
5353
repository: exceptionless/elasticsearch
54-
tag: 8.14.1
54+
tag: 8.15.2
5555
pullPolicy: IfNotPresent
5656

5757
redis:

samples/docker-compose.all-in-one.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
kibana:
2121
depends_on:
2222
- elasticsearch
23-
image: docker.elastic.co/kibana/kibana:8.14.1
23+
image: docker.elastic.co/kibana/kibana:8.15.2
2424
ports:
2525
- 5601:5601
2626

0 commit comments

Comments
 (0)