Skip to content

Commit e239e13

Browse files
ejsmithejsmith
committed
Updating ES
1 parent 353737d commit e239e13

17 files changed

+199
-198
lines changed

‎.devcontainer/docker-compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: "3"
22

33
services:
44
app:
@@ -22,12 +22,12 @@ services:
2222
# (Adding the "ports" property to this file will not forward from a Codespace.)
2323

2424
elasticsearch:
25-
image: exceptionless/elasticsearch:8.8.0
25+
image: exceptionless/elasticsearch:8.9.0
2626
environment:
2727
node.name: elasticsearch
2828
cluster.name: exceptionless
2929
discovery.type: single-node
30-
xpack.security.enabled: 'false'
30+
xpack.security.enabled: "false"
3131
action.destructive_requires_name: false
3232
ES_JAVA_OPTS: -Xms1g -Xmx1g
3333
ports:
@@ -38,9 +38,9 @@ services:
3838
kibana:
3939
depends_on:
4040
- elasticsearch
41-
image: docker.elastic.co/kibana/kibana:8.8.0
41+
image: docker.elastic.co/kibana/kibana:8.9.0
4242
environment:
43-
xpack.security.enabled: 'false'
43+
xpack.security.enabled: "false"
4444
ports:
4545
- 5601:5601
4646

@@ -57,4 +57,4 @@ services:
5757

5858
volumes:
5959
esdata:
60-
driver: local
60+
driver: local

‎.vscode/settings.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"elasticsearch",
2020
"gitignore"
2121
],
22-
"powershell.codeFormatting.addWhitespaceAroundPipe": true
23-
}
22+
"powershell.codeFormatting.addWhitespaceAroundPipe": true,
23+
"dotnet.defaultSolution": "Exceptionless.sln"
24+
}

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9999

100100
# completely self-contained
101101

102-
FROM exceptionless/elasticsearch:8.8.0 AS exceptionless
102+
FROM exceptionless/elasticsearch:8.9.0 AS exceptionless
103103

104104
WORKDIR /app
105105
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -155,7 +155,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]
155155

156156
# completely self-contained 7.x
157157

158-
FROM exceptionless/elasticsearch:7.17.10 AS exceptionless7
158+
FROM exceptionless/elasticsearch:7.17.12 AS exceptionless7
159159

160160
WORKDIR /app
161161
COPY --from=job-publish /app/src/Exceptionless.Job/out ./

‎build/docker/elasticsearch/7.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:7.17.10
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.12
33

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

‎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.8.0
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.9.0
33

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

‎docker/docker-compose.7x.yml‎

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

33
services:
44
elasticsearch:
5-
image: exceptionless/elasticsearch:7.17.10
5+
image: exceptionless/elasticsearch:7.17.12
66
environment:
77
discovery.type: single-node
8-
xpack.security.enabled: 'false'
8+
xpack.security.enabled: "false"
99
ES_JAVA_OPTS: -Xms1g -Xmx1g
1010
ports:
1111
- 9200:9200
@@ -16,7 +16,7 @@ services:
1616
kibana:
1717
depends_on:
1818
- elasticsearch
19-
image: docker.elastic.co/kibana/kibana:7.17.10
19+
image: docker.elastic.co/kibana/kibana:7.17.12
2020
ports:
2121
- 5601:5601
2222

‎docker/docker-compose.apm.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
version: '2.2'
1+
version: "2.2"
22

33
services:
44
setup:
5-
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.0
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.9.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.8.0
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.9.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.8.0
101+
image: docker.elastic.co/kibana/kibana:8.9.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.8.0
127+
image: docker.elastic.co/apm/apm-server:8.9.0
128128
volumes:
129129
- certs:/usr/share/apm-server/certs
130130
ports:

‎docker/docker-compose.dev.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
services:
44
app:
@@ -22,7 +22,7 @@ services:
2222
#ASPNETCORE_HTTPS_PORT: 5201
2323
#ASPNETCORE_Kestrel__Certificates__Default__Password: password
2424
#ASPNETCORE_Kestrel__Certificates__Default__Path: /https/aspnetapp.pfx
25-
EX_RunJobsInProcess: 'false'
25+
EX_RunJobsInProcess: "false"
2626
ports:
2727
- 5200:80
2828
- 5201:443
@@ -52,10 +52,10 @@ services:
5252
- appdata:/app/storage
5353

5454
elasticsearch:
55-
image: exceptionless/elasticsearch:7.17.10
55+
image: exceptionless/elasticsearch:7.17.12
5656
environment:
5757
discovery.type: single-node
58-
xpack.security.enabled: 'false'
58+
xpack.security.enabled: "false"
5959
ES_JAVA_OPTS: -Xms1g -Xmx1g
6060
ports:
6161
- 9200:9200
@@ -66,7 +66,7 @@ services:
6666
kibana:
6767
depends_on:
6868
- elasticsearch
69-
image: docker.elastic.co/kibana/kibana:7.17.10
69+
image: docker.elastic.co/kibana/kibana:7.17.12
7070
ports:
7171
- 5601:5601
7272

@@ -87,4 +87,4 @@ volumes:
8787
appdata:
8888
driver: local
8989
ssldata:
90-
driver: local
90+
driver: local

‎docker/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
version: '2.2'
1+
version: "2.2"
22

33
services:
44
elasticsearch:
5-
image: exceptionless/elasticsearch:8.8.0
5+
image: exceptionless/elasticsearch:8.9.0
66
environment:
77
node.name: elasticsearch
88
cluster.name: exceptionless
99
discovery.type: single-node
10-
xpack.security.enabled: 'false'
10+
xpack.security.enabled: "false"
1111
action.destructive_requires_name: false
1212
ES_JAVA_OPTS: -Xms1g -Xmx1g
1313
ports:
@@ -18,9 +18,9 @@ services:
1818
kibana:
1919
depends_on:
2020
- elasticsearch
21-
image: docker.elastic.co/kibana/kibana:8.8.0
21+
image: docker.elastic.co/kibana/kibana:8.9.0
2222
environment:
23-
xpack.security.enabled: 'false'
23+
xpack.security.enabled: "false"
2424
ports:
2525
- 5601:5601
2626

‎k8s/ex-dev-elasticsearch.yaml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@ metadata:
44
name: ex-dev
55
namespace: ex-dev
66
spec:
7-
version: 7.17.10
8-
image: exceptionless/elasticsearch:7.17.10 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 7.17.12
8+
image: exceptionless/elasticsearch:7.17.12 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-dev-snapshots
1111
http:
1212
tls:
1313
selfSignedCertificate:
1414
disabled: true
1515
nodeSets:
16-
- name: main
17-
count: 1
18-
config:
19-
node.master: true
20-
node.data: true
21-
node.ingest: true
22-
action.destructive_requires_name: false
23-
podTemplate:
24-
spec:
25-
containers:
26-
- name: elasticsearch
27-
env:
28-
- name: ES_JAVA_OPTS
29-
value: -Xms6g -Xmx6g
30-
resources:
31-
requests:
32-
memory: 12Gi
33-
cpu: 0.5
34-
limits:
35-
memory: 12Gi
36-
cpu: 2
37-
# related to "node.store.allow_mmap: false" setting above
38-
initContainers:
39-
- name: sysctl
40-
securityContext:
41-
privileged: true
42-
runAsUser: 0
43-
command: ['sh', '-c', 'sysctl -w vm.max_map_count=262144']
44-
volumeClaimTemplates:
45-
- metadata:
46-
name: elasticsearch-data
47-
spec:
48-
accessModes:
49-
- ReadWriteOnce
50-
resources:
51-
requests:
52-
storage: 100Gi
53-
storageClassName: default
16+
- name: main
17+
count: 1
18+
config:
19+
node.master: true
20+
node.data: true
21+
node.ingest: true
22+
action.destructive_requires_name: false
23+
podTemplate:
24+
spec:
25+
containers:
26+
- name: elasticsearch
27+
env:
28+
- name: ES_JAVA_OPTS
29+
value: -Xms6g -Xmx6g
30+
resources:
31+
requests:
32+
memory: 12Gi
33+
cpu: 0.5
34+
limits:
35+
memory: 12Gi
36+
cpu: 2
37+
# related to "node.store.allow_mmap: false" setting above
38+
initContainers:
39+
- name: sysctl
40+
securityContext:
41+
privileged: true
42+
runAsUser: 0
43+
command: ["sh", "-c", "sysctl -w vm.max_map_count=262144"]
44+
volumeClaimTemplates:
45+
- metadata:
46+
name: elasticsearch-data
47+
spec:
48+
accessModes:
49+
- ReadWriteOnce
50+
resources:
51+
requests:
52+
storage: 100Gi
53+
storageClassName: default
5454

5555
---
5656
apiVersion: kibana.k8s.elastic.co/v1
@@ -59,7 +59,7 @@ metadata:
5959
name: ex-dev
6060
namespace: ex-dev
6161
spec:
62-
version: 7.17.10
62+
version: 7.17.12
6363
count: 1
6464
elasticsearchRef:
6565
name: ex-dev
@@ -72,11 +72,11 @@ spec:
7272
podTemplate:
7373
spec:
7474
containers:
75-
- name: kibana
76-
resources:
77-
requests:
78-
memory: 300Mi
79-
cpu: 50m
80-
limits:
81-
memory: 1Gi
82-
cpu: 500m
75+
- name: kibana
76+
resources:
77+
requests:
78+
memory: 300Mi
79+
cpu: 50m
80+
limits:
81+
memory: 1Gi
82+
cpu: 500m

0 commit comments

Comments
 (0)