From 2c921512aa7235b0408b919bc40a392231505c36 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 3 Oct 2022 16:00:08 +0200
Subject: [PATCH] Update to 2022-10-03 16:00

---
 roles/matrix_element/defaults/main.yml         | 4 ++--
 roles/metabase/defaults/main.yml               | 6 +++---
 roles/nomad/defaults/main.yml                  | 2 +-
 roles/squid/files/acl/software_various.domains | 3 +++
 roles/vault/defaults/main.yml                  | 8 ++++++--
 roles/vault/templates/vault.hcl.j2             | 9 +++++++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml
index 5d13cf9..1df6944 100644
--- a/roles/matrix_element/defaults/main.yml
+++ b/roles/matrix_element/defaults/main.yml
@@ -5,8 +5,8 @@
 element_id: element
 
 # Version to deploy, and expected sha256
-element_version: 1.11.6
-element_archive_sha256: c2f24b624eed057dc0a1a17bdb7e9fc99a54d2a20a5e7cad6e51d074fe367ff4
+element_version: 1.11.8
+element_archive_sha256: e1c1c6b5e7d961a0b2c8fcff5b1d1c56dc518cd6ab2ebb75a319e8666b513688
 
 # Where to install element
 element_root_dir: /opt/matrix/element
diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml
index 452cd2d..e442297 100644
--- a/roles/metabase/defaults/main.yml
+++ b/roles/metabase/defaults/main.yml
@@ -1,15 +1,15 @@
 ---
 
 # Version to deploy
-metabase_version: 0.44.3
+metabase_version: 0.44.4
 # URL to fetch the jar
 metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar
 # Expected sha256 of the jar
-metabase_jar_sha256: ef8fc6d12251bf2062208b02821f4b948345e8c4b952b08a9a77d328f2c8a6bd
+metabase_jar_sha256: 72c3286a523138a4e36588b120230bfed16d19cfe25899ccc1ceacf5ca4729b6
 # When building from source
 metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz
 # Expected sha256 of the archive
-metabase_archive_sha256: 98a51d1f3f5408a8da008745032790e0b32213fb9defa135211cbf44556f30c5
+metabase_archive_sha256: 04cfcb451d79fda049ec08f91925b59ba4f40b8c59ad9c1a93271df985d97d03
 # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled
 metabase_manage_upgrade: True
 
diff --git a/roles/nomad/defaults/main.yml b/roles/nomad/defaults/main.yml
index db5982f..79bd37f 100644
--- a/roles/nomad/defaults/main.yml
+++ b/roles/nomad/defaults/main.yml
@@ -169,7 +169,7 @@ nomad_base_conf:
 
   # Telemetry settings
   telemetry:
-    prometheus_metrics: False
+    prometheus_metrics: True
     disable_hostname: True
     publish_allocation_metrics: True
     publish_node_metrics: True
diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains
index 90efdad..5c77c35 100644
--- a/roles/squid/files/acl/software_various.domains
+++ b/roles/squid/files/acl/software_various.domains
@@ -389,3 +389,6 @@ nexus.squashtest.org
 
 # Hashicorp products (Nomad, Consul, Vault etc.)
 releases.hashicorp.com
+
+# Traefik plugins
+.plugin.pilot.traefik.io
diff --git a/roles/vault/defaults/main.yml b/roles/vault/defaults/main.yml
index fc0d950..90ea251 100644
--- a/roles/vault/defaults/main.yml
+++ b/roles/vault/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version of Vault to install
-vault_version: 1.11.3
+vault_version: 1.11.4
 # URL of the archive
 vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-vault_archive_sha256: b433413ce524f26abe6292f7fc95f267e809daeacdf7ba92b68dead322f92deb
+vault_archive_sha256: 8764a55bdd69faedaaf5d50325d5e6806041e6305b1e66454b46dc6426d26556
 
 # Root dir where Nomad will be installed
 vault_root_dir: /opt/vault
@@ -112,6 +112,10 @@ vault_base_conf:
   #  tls_cert_file: /opt/vault/tls/consul_cert.crt
   #  tls_key_file: /opt/vault/tls/consul_key.crt
 
+  telemetry:
+    prometheus_retention_time: 1h
+    disable_hostname: True
+
 # You can add additional paramters in vault_extra_conf (or vault_host_conf)
 # they will be merged into the vault_base_conf before rendering
 # Example
diff --git a/roles/vault/templates/vault.hcl.j2 b/roles/vault/templates/vault.hcl.j2
index cd00876..8f89245 100644
--- a/roles/vault/templates/vault.hcl.j2
+++ b/roles/vault/templates/vault.hcl.j2
@@ -57,3 +57,12 @@ service_registration "consul" {
 {% endif %}
 
 ui = {{ vault_conf.ui | ternary('true', 'false') }}
+
+telemetry {
+{% for key in ['prometheus_retention_time'] %}
+  {{ key }} = "{{ vault_conf.telemetry[key] }}"
+{% endfor %}
+{% for key in ['disable_hostname'] %}
+  {{ key }} = {{ vault_conf.telemetry[key] | ternary('true', 'false') }}
+{% endfor %}
+}