Skip to content

Commit

Permalink
Elasticsearch update
Browse files Browse the repository at this point in the history
  • Loading branch information
ejsmith committed May 28, 2024
1 parent 20e3aef commit 40a3be2
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.)

elasticsearch:
image: exceptionless/elasticsearch:8.13.1
image: exceptionless/elasticsearch:8.13.4
environment:
node.name: elasticsearch
cluster.name: exceptionless
Expand All @@ -38,7 +38,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
environment:
xpack.security.enabled: "false"
ports:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]

# completely self-contained

FROM exceptionless/elasticsearch:8.13.1 AS exceptionless
FROM exceptionless/elasticsearch:8.13.4 AS exceptionless

WORKDIR /app
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
Expand Down
2 changes: 1 addition & 1 deletion build/docker/elasticsearch/8.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://www.docker.elastic.co/
FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.1
FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.4

RUN elasticsearch-plugin install -b mapper-size

8 changes: 4 additions & 4 deletions docker/docker-compose.apm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
setup:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
volumes:
- certs:/usr/share/elasticsearch/config/certs
user: "0"
Expand Down Expand Up @@ -53,7 +53,7 @@ services:
depends_on:
setup:
condition: service_healthy
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
volumes:
- certs:/usr/share/elasticsearch/config/certs
- esdata:/usr/share/elasticsearch/data
Expand Down Expand Up @@ -98,7 +98,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
volumes:
- certs:/usr/share/kibana/config/certs
ports:
Expand All @@ -124,7 +124,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/apm/apm-server:8.13.1
image: docker.elastic.co/apm/apm-server:8.13.4
volumes:
- certs:/usr/share/apm-server/certs
ports:
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:8.13.1
image: exceptionless/elasticsearch:8.13.4
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -64,7 +64,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
ports:
- 5601:5601

Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
elasticsearch:
image: exceptionless/elasticsearch:8.13.1
image: exceptionless/elasticsearch:8.13.4
environment:
node.name: elasticsearch
cluster.name: exceptionless
Expand All @@ -16,7 +16,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
environment:
xpack.security.enabled: "false"
ports:
Expand Down
8 changes: 4 additions & 4 deletions k8s/elastic-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: elastic-monitor
namespace: elastic-system
spec:
version: 8.13.1
version: 8.13.4
nodeSets:
- name: main
count: 3
Expand Down Expand Up @@ -50,7 +50,7 @@ metadata:
name: kibana-monitor
namespace: elastic-system
spec:
version: 8.13.1
version: 8.13.4
count: 1
elasticsearchRef:
name: elastic-monitor
Expand Down Expand Up @@ -144,7 +144,7 @@ metadata:
name: fleet-server
namespace: elastic-system
spec:
version: 8.13.1
version: 8.13.4
kibanaRef:
name: kibana-monitor
elasticsearchRefs:
Expand All @@ -168,7 +168,7 @@ metadata:
name: elastic-agent
namespace: elastic-system
spec:
version: 8.13.1
version: 8.13.4
kibanaRef:
name: kibana-monitor
fleetServerRef:
Expand Down
6 changes: 3 additions & 3 deletions k8s/ex-dev-elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: ex-dev
namespace: ex-dev
spec:
version: 8.13.1
image: exceptionless/elasticsearch:8.13.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
version: 8.13.4
image: exceptionless/elasticsearch:8.13.4 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
secureSettings:
- secretName: ex-dev-snapshots
http:
Expand Down Expand Up @@ -57,7 +57,7 @@ metadata:
name: ex-dev
namespace: ex-dev
spec:
version: 8.13.1
version: 8.13.4
count: 1
elasticsearchRef:
name: ex-dev
Expand Down
6 changes: 3 additions & 3 deletions k8s/ex-prod-elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: ex-prod
namespace: ex-prod
spec:
version: 8.13.1
image: exceptionless/elasticsearch:8.13.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
version: 8.13.4
image: exceptionless/elasticsearch:8.13.4 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
monitoring:
metrics:
elasticsearchRefs:
Expand Down Expand Up @@ -68,7 +68,7 @@ metadata:
name: ex-prod
namespace: ex-prod
spec:
version: 8.13.1
version: 8.13.4
count: 1
elasticsearchRef:
name: ex-prod
Expand Down
1 change: 1 addition & 0 deletions k8s/ex-prod-tasks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $ELASTIC_JOB = kubectl port-forward --namespace elastic-system service/elastic-m
Remove-Job $ELASTIC_JOB

curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cluster/health?pretty
curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cat/allocation?v
curl -k https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cluster/allocation/explain?pretty
curl -k "https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cat/indices/*traces*?v=true&s=index"
curl -X PUT -H "Content-Type: application/json" -g -k -d '{ "transient": { "action.destructive_requires_name": false } }' https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/_cluster/settings
Expand Down
2 changes: 1 addition & 1 deletion k8s/exceptionless/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ elasticsearch:
connectionString:
image:
repository: exceptionless/elasticsearch
tag: 8.13.1
tag: 8.13.4
pullPolicy: IfNotPresent

redis:
Expand Down
2 changes: 1 addition & 1 deletion samples/docker-compose.all-in-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
ports:
- 5601:5601

Expand Down
4 changes: 2 additions & 2 deletions samples/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ services:
- ex_appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:8.13.1
image: exceptionless/elasticsearch:8.13.4
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -58,7 +58,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.13.1
image: docker.elastic.co/kibana/kibana:8.13.4
ports:
- 5601:5601

Expand Down

0 comments on commit 40a3be2

Please sign in to comment.