Skip to content

Commit 22ca089

Browse files
niemyjskiniemyjski
committed
Merge branch 'main' into feature/stack-api-improvements
2 parents 1541d01 + 123ff5c commit 22ca089

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+957
-243
lines changed

‎.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.16.1
25+
image: exceptionless/elasticsearch:8.17.0
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.16.1
41+
image: docker.elastic.co/kibana/kibana:8.17.0
4242
environment:
4343
xpack.security.enabled: "false"
4444
ports:

‎Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ COPY ./*.sln ./NuGet.Config ./
55
COPY ./src/*.props ./src/
66
COPY ./tests/*.props ./tests/
77
COPY ./build/packages/* ./build/packages/
8-
COPY ./docker/docker-compose.dcproj ./docker/
98

109
# Copy the main source project files
1110
COPY src/*/*.csproj ./
@@ -99,7 +98,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9998

10099
# completely self-contained
101100

102-
FROM exceptionless/elasticsearch:8.16.1 AS exceptionless
101+
FROM exceptionless/elasticsearch:8.17.0 AS exceptionless
103102

104103
WORKDIR /app
105104
COPY --from=job-publish /app/src/Exceptionless.Job/out ./

‎Exceptionless.sln

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
.github\workflows\build.yaml = .github\workflows\build.yaml
1212
CONTRIBUTING.md = CONTRIBUTING.md
1313
src\Directory.Build.props = src\Directory.Build.props
14-
docker\docker-compose.yml = docker\docker-compose.yml
1514
Dockerfile = Dockerfile
1615
exceptionless.http = exceptionless.http
1716
global.json = global.json
@@ -28,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Tests", "test
2827
EndProject
2928
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Job", "src\Exceptionless.Job\Exceptionless.Job.csproj", "{788BA00C-FFBE-42A9-92A3-89E24FC137B5}"
3029
EndProject
31-
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker\docker-compose.dcproj", "{9F933018-9E8B-4649-8C9A-D217B5E1C184}"
32-
EndProject
3330
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{97ED03A0-8C49-4B15-8D93-C56AF4DDC30F}"
3431
ProjectSection(SolutionItems) = preProject
3532
tests\http\admin.http = tests\http\admin.http
@@ -44,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "http", "http", "{97ED03A0-8
4441
tests\http\webhooks.http = tests\http\webhooks.http
4542
EndProjectSection
4643
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.AppHost", "src\Exceptionless.AppHost\Exceptionless.AppHost.csproj", "{EB1AF004-A00D-4016-BA97-5E89177B0074}"
45+
EndProject
4746
Global
4847
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4948
Debug|Any CPU = Debug|Any CPU
@@ -70,10 +69,10 @@ Global
7069
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
7170
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
7271
{788BA00C-FFBE-42A9-92A3-89E24FC137B5}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{9F933018-9E8B-4649-8C9A-D217B5E1C184}.Release|Any CPU.Build.0 = Release|Any CPU
72+
{EB1AF004-A00D-4016-BA97-5E89177B0074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73+
{EB1AF004-A00D-4016-BA97-5E89177B0074}.Debug|Any CPU.Build.0 = Debug|Any CPU
74+
{EB1AF004-A00D-4016-BA97-5E89177B0074}.Release|Any CPU.ActiveCfg = Release|Any CPU
75+
{EB1AF004-A00D-4016-BA97-5E89177B0074}.Release|Any CPU.Build.0 = Release|Any CPU
7776
EndGlobalSection
7877
GlobalSection(SolutionProperties) = preSolution
7978
HideSolutionNode = FALSE

‎build/docker/elasticsearch/8.x/Dockerfile

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.16.1
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.17.0
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.16.1
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
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.16.1
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
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.16.1
101+
image: docker.elastic.co/kibana/kibana:8.17.0
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.16.1
127+
image: docker.elastic.co/apm/apm-server:8.17.0
128128
volumes:
129129
- certs:/usr/share/apm-server/certs
130130
ports:

‎docker/docker-compose.dcproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎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.16.1
53+
image: exceptionless/elasticsearch:8.17.0
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.16.1
67+
image: docker.elastic.co/kibana/kibana:8.17.0
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.16.1
3+
image: exceptionless/elasticsearch:8.17.0
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.16.1
19+
image: docker.elastic.co/kibana/kibana:8.17.0
2020
environment:
2121
xpack.security.enabled: "false"
2222
ports:

‎k8s/elastic-monitor.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elastic-monitor
55
namespace: elastic-system
66
spec:
7-
version: 8.16.1
7+
version: 8.17.0
88
podDisruptionBudget: {}
99
nodeSets:
1010
- name: main
@@ -51,7 +51,7 @@ metadata:
5151
name: kibana-monitor
5252
namespace: elastic-system
5353
spec:
54-
version: 8.16.1
54+
version: 8.17.0
5555
count: 1
5656
elasticsearchRef:
5757
name: elastic-monitor
@@ -145,7 +145,7 @@ metadata:
145145
name: fleet-server
146146
namespace: elastic-system
147147
spec:
148-
version: 8.16.1
148+
version: 8.17.0
149149
kibanaRef:
150150
name: kibana-monitor
151151
elasticsearchRefs:
@@ -169,7 +169,7 @@ metadata:
169169
name: elastic-agent
170170
namespace: elastic-system
171171
spec:
172-
version: 8.16.1
172+
version: 8.17.0
173173
kibanaRef:
174174
name: kibana-monitor
175175
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.16.1
8-
image: exceptionless/elasticsearch:8.16.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.17.0
8+
image: exceptionless/elasticsearch:8.17.0 # 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.16.1
60+
version: 8.17.0
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.16.1
8-
image: exceptionless/elasticsearch:8.16.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.17.0
8+
image: exceptionless/elasticsearch:8.17.0 # 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.16.1
71+
version: 8.17.0
7272
count: 1
7373
elasticsearchRef:
7474
name: ex-prod

‎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.16.1
54+
tag: 8.17.0
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.16.1
23+
image: docker.elastic.co/kibana/kibana:8.17.0
2424
ports:
2525
- 5601:5601
2626

‎samples/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ services:
4444
- ex_appdata:/app/storage
4545

4646
elasticsearch:
47-
image: exceptionless/elasticsearch:8.16.1
47+
image: exceptionless/elasticsearch:8.17.0
4848
environment:
4949
discovery.type: single-node
5050
xpack.security.enabled: "false"
51-
ES_JAVA_OPTS: -Xms1g -Xmx1g
51+
ES_JAVA_OPTS: -XX:UseSVE=0 -Xms1g -Xmx1g
5252
ports:
5353
- 9200:9200
5454
- 9300:9300
@@ -58,7 +58,7 @@ services:
5858
kibana:
5959
depends_on:
6060
- elasticsearch
61-
image: docker.elastic.co/kibana/kibana:8.16.1
61+
image: docker.elastic.co/kibana/kibana:8.17.0
6262
ports:
6363
- 5601:5601
6464

‎src/Exceptionless.AppHost/Exceptionless.AppHost.csproj

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
4+
5+
<PropertyGroup>
6+
<OutputType>Exe</OutputType>
7+
<TargetFramework>net9.0</TargetFramework>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<Nullable>enable</Nullable>
10+
<IsAspireHost>true</IsAspireHost>
11+
<UserSecretsId>a9c2ddcc-e51d-4cd1-9782-96e1d74eec87</UserSecretsId>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
16+
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.0.0" />
17+
<PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
18+
<PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1" />
19+
<PackageReference Include="Foundatio.AWS" Version="11.0.6" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<ProjectReference Include="..\Exceptionless.Job\Exceptionless.Job.csproj" />
24+
<ProjectReference Include="..\Exceptionless.Web\Exceptionless.Web.csproj" />
25+
</ItemGroup>
26+
27+
</Project>

0 commit comments

Comments
 (0)