aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2024-09-20 11:04:49 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2024-09-20 11:04:49 +0200
commitc044078a6e15b90dd4e59021b2196997cbdfe689 (patch)
tree3d61d98aaad34a312d75716d1ae487a1b1b3afec
parentac4ca90eca4bf4f2c7bce5fcb7706a11f2909080 (diff)
downloadnixcfg-c044078a6e15b90dd4e59021b2196997cbdfe689.tar.gz
nixcfg-c044078a6e15b90dd4e59021b2196997cbdfe689.zip
finalize jitsiHEADmain
-rw-r--r--cluster/prod/app/jitsi/deploy/jitsi.hcl7
-rw-r--r--cluster/prod/app/telemetry/config/prometheus.yml10
-rw-r--r--cluster/prod/app/telemetry/deploy/telemetry-storage.hcl2
3 files changed, 18 insertions, 1 deletions
diff --git a/cluster/prod/app/jitsi/deploy/jitsi.hcl b/cluster/prod/app/jitsi/deploy/jitsi.hcl
index f2cafd2..f43c4fb 100644
--- a/cluster/prod/app/jitsi/deploy/jitsi.hcl
+++ b/cluster/prod/app/jitsi/deploy/jitsi.hcl
@@ -260,6 +260,13 @@ EOF
port = "video_port"
address_mode = "host"
name = "video-jitsi"
+ }
+
+ service {
+ tags = [ "jitsi" ]
+ port = "management_port"
+ address_mode = "host"
+ name = "management-video-jitsi"
check {
type = "tcp"
port = "management_port"
diff --git a/cluster/prod/app/telemetry/config/prometheus.yml b/cluster/prod/app/telemetry/config/prometheus.yml
index fd426cc..99167e7 100644
--- a/cluster/prod/app/telemetry/config/prometheus.yml
+++ b/cluster/prod/app/telemetry/config/prometheus.yml
@@ -26,6 +26,16 @@ scrape_configs:
cert_file: /etc/prometheus/consul-client.crt
key_file: /etc/prometheus/consul-client.key
+ - job_name: 'jitsi-videobridge'
+ consul_sd_configs:
+ - server: 'https://localhost:8501'
+ services:
+ - 'management-video-jitsi'
+ tls_config:
+ ca_file: /etc/prometheus/consul-ca.crt
+ cert_file: /etc/prometheus/consul-client.crt
+ key_file: /etc/prometheus/consul-client.key
+
- job_name: 'garage'
authorization:
type: Bearer
diff --git a/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl b/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
index 34fc059..d87f3c6 100644
--- a/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
+++ b/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
@@ -20,7 +20,7 @@ job "telemetry-storage" {
task "prometheus" {
driver = "docker"
config {
- image = "prom/prometheus:v2.46.0"
+ image = "prom/prometheus:v2.50.1"
network_mode = "host"
ports = [ "prometheus" ]
args = [