Update to 8.13.0

This commit is contained in:
Daniel Berteaud 2024-03-28 09:29:45 +01:00
parent 0c09fdbc7f
commit 86ee5be1be
3 changed files with 8 additions and 7 deletions

View File

@ -15,7 +15,7 @@ job "[[ .instance ]]" {
network {
mode = "bridge"
port "transport" {}
[[- if $c.prometheus.enabled ]]
[[- if conv.ToBool $c.prometheus.enabled ]]
port "metrics" {}
[[- end ]]
}
@ -181,7 +181,7 @@ _EOT
[[ template "common/resources" $c ]]
}
[[- if $c.prometheus.enabled ]]
[[- if conv.ToBool $c.prometheus.enabled ]]
[[- $e := merge .elasticsearch.exporter .elasticsearch . ]]
# Prometheus exporter

View File

@ -2,11 +2,11 @@ FROM [[ .docker.repo ]][[ .docker.base_images.alpine.image ]] AS builder
ARG ES_VERSION=[[ .docker.base_images.elasticsearch8.build_args.ES_VERSION ]]
ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz /tmp
ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz.sha512 /tmp
RUN set -eux &&\
apk add ca-certificates curl tar &&\
apk add tar &&\
cd /tmp &&\
curl -sSLO https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz &&\
curl -sSLO https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz.sha512 &&\
sha512sum -c elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz.sha512 &&\
tar xzf elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz &&\
mv elasticsearch-${ES_VERSION} /opt/elasticsearch &&\

View File

@ -118,6 +118,7 @@ elasticsearch:
# Prometheus settings
prometheus:
enabled: '[[ .prometheus.available ]]'
# Metrics URL, as seen from inside the alloc
metrics_url: http://127.0.0.1:9114/metrics
@ -135,9 +136,9 @@ docker:
- elasticsearch7:latest
elasticsearch8:
image: elasticsearch:[[ .docker.base_images.elasticsearch8.build_args.ES_VERSION ]]-3
image: elasticsearch:[[ .docker.base_images.elasticsearch8.build_args.ES_VERSION ]]-1
build_args:
ES_VERSION: 8.12.2
ES_VERSION: 8.13.0
tags:
- elasticsearch:8
- elasticsearch8:latest