Skip to content

Commit 2187970

Browse files
committed
Merge branch 'main' into feature/october-updates
2 parents 75c449e + e05167a commit 2187970

File tree

13 files changed

+28
-28
lines changed

13 files changed

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

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9595

9696
# completely self-contained
9797

98-
FROM exceptionless/elasticsearch:8.19.2 AS exceptionless
98+
FROM exceptionless/elasticsearch:8.19.6 AS exceptionless
9999

100100
WORKDIR /app
101101
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
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.19.5
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.19.6
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.19.2
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.19.6
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.19.2
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.19.6
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.19.2
101+
image: docker.elastic.co/kibana/kibana:8.19.6
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.19.2
127+
image: docker.elastic.co/apm/apm-server:8.19.6
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.19.2
53+
image: exceptionless/elasticsearch:8.19.6
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.19.2
67+
image: docker.elastic.co/kibana/kibana:8.19.6
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.19.2
3+
image: exceptionless/elasticsearch:8.19.6
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.19.2
19+
image: docker.elastic.co/kibana/kibana:8.19.6
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.19.5
7+
version: 8.19.6
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.19.5
54+
version: 8.19.6
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.19.5
148+
version: 8.19.6
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.19.5
172+
version: 8.19.6
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.19.5
8-
image: exceptionless/elasticsearch:8.19.5 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.19.6
8+
image: exceptionless/elasticsearch:8.19.6 # 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.19.5
60+
version: 8.19.6
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.19.5
8-
image: exceptionless/elasticsearch:8.19.5 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.19.6
8+
image: exceptionless/elasticsearch:8.19.6 # 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.19.5
71+
version: 8.19.6
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.19.5
54+
tag: 8.19.6
5555
pullPolicy: IfNotPresent
5656

5757
redis:

0 commit comments

Comments
 (0)