nomad
/
matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Element to 1.11.62 and cleanup metrics handling

This commit is contained in:
Daniel Berteaud 2024-03-27 12:01:55 +01:00
parent 70f26fbcc4
commit 992cd61904
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/images/matrix-element/Dockerfile
View File

@ -1,7 +1,7 @@
FROM nginxinc/nginx-unprivileged:alpine FROM nginxinc/nginx-unprivileged:alpine
MAINTAINER Daniel Berteaud <dbd@ehtrace.com> MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG ELEMENT_VERSION=1.11.61 \ ARG ELEMENT_VERSION=1.11.62 \
SYNAPSE_ADMIN_VERSION=0.9.1 SYNAPSE_ADMIN_VERSION=0.9.1
ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \ ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \

14
example/matrix.nomad.hcl
View File

@ -4,6 +4,8 @@ job "matrix" {
region = "global" region = "global"
group "matrix" { group "matrix" {
network { network {
@ -24,9 +26,13 @@ job "matrix" {
port = 8008 port = 8008
meta { meta {
alloc = "${NOMAD_ALLOC_INDEX}" alloc = "${NOMAD_ALLOC_INDEX}"
job = "${NOMAD_JOB_NAME}" datacenter = "${NOMAD_DC}"
namespace = "${NOMAD_NAMESPACE}" group = "${NOMAD_GROUP_NAME}"
job = "${NOMAD_JOB_NAME}"
namespace = "${NOMAD_NAMESPACE}"
node = "${node.unique.name}"
region = "${NOMAD_REGION}"
} }
@ -311,7 +317,7 @@ _EOT
driver = "docker" driver = "docker"
config { config {
image = "danielberteaud/matrix-element:1.11.61-1" image = "danielberteaud/matrix-element:1.11.62-1"
readonly_rootfs = true readonly_rootfs = true
pids_limit = 100 pids_limit = 100
volumes = [ volumes = [

2
matrix.nomad.hcl
View File

@ -7,7 +7,7 @@ job "[[ .instance ]]" {
network { network {
mode = "bridge" mode = "bridge"
[[- if $c.prometheus.enabled ]] [[- if conv.ToBool $c.prometheus.enabled ]]
port "metrics" {} port "metrics" {}
[[- end ]] [[- end ]]
} }

2
templates/homeserver.yml.tpl
View File

@ -14,7 +14,7 @@ listeners:
- client - client
- federation - federation
compress: false compress: false
[[- if .prometheus.enabled ]] [[- if conv.ToBool .prometheus.enabled ]]
- port: 9000 - port: 9000
type: metrics type: metrics
bind_addresses: ['127.0.0.1'] bind_addresses: ['127.0.0.1']

6
variables.yml
View File

@ -110,7 +110,7 @@ matrix:
# Note : element will be served by the nginx container, so all the image, resources etc. are set there # Note : element will be served by the nginx container, so all the image, resources etc. are set there
element: element:
map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx
version: 1.11.61 version: 1.11.62
synapse_admin: synapse_admin:
version: 0.9.1 version: 0.9.1
@ -153,3 +153,7 @@ matrix:
data: data:
type: csi type: csi
source: "[[ .instance ]]-synapse-data" source: "[[ .instance ]]-synapse-data"
prometheus:
# Enable prometheus metrics if available
enabled: '[[ .prometheus.available ]]'