Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Allow tusd to be exposed on non-localhost. 

This allows its /metrics endpoint to be monitored.
This commit is contained in:
Alex Vandiver 2024-09-26 23:46:16 -04:00 committed by Tim Abbott
parent 82fd3c9b32
commit 87ee167726
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/kandra/manifests/app_frontend_monitoring.pp
View File

@ -6,6 +6,7 @@ class kandra::app_frontend_monitoring {
include kandra::prometheus::uwsgi include kandra::prometheus::uwsgi
include kandra::prometheus::process include kandra::prometheus::process
kandra::firewall_allow { 'grok_exporter': port => '9144' } kandra::firewall_allow { 'grok_exporter': port => '9144' }
kandra::firewall_allow { 'tusd': port => '9900' }
file { '/etc/cron.d/rabbitmq-monitoring': file { '/etc/cron.d/rabbitmq-monitoring':
ensure => absent, ensure => absent,

2
puppet/zulip/manifests/app_frontend_base.pp
View File

@ -175,6 +175,8 @@ class zulip::app_frontend_base {
$katex_server = zulipconf('application_server', 'katex_server', true) $katex_server = zulipconf('application_server', 'katex_server', true)
$katex_server_port = zulipconf('application_server', 'katex_server_port', '9700') $katex_server_port = zulipconf('application_server', 'katex_server_port', '9700')
$tusd_server_listen = zulipconf('application_server', 'tusd_server_listen', '127.0.0.1')
if $proxy_host != '' and $proxy_port != '' { if $proxy_host != '' and $proxy_port != '' {
$proxy = "http://${proxy_host}:${proxy_port}" $proxy = "http://${proxy_host}:${proxy_port}"
} else { } else {

2
puppet/zulip/templates/supervisor/zulip.conf.template.erb
View File

@ -25,7 +25,7 @@ killasgroup=true ; Without this, we leak processes every restart
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
[program:zulip-tus] [program:zulip-tus]
command=nice -n5 /home/zulip/deployments/current/manage.py runtusd 9900 command=nice -n5 /home/zulip/deployments/current/manage.py runtusd <%= @tusd_server_listen %>:9900
environment=HTTP_proxy="<%= @proxy %>",HTTPS_proxy="<%= @proxy %>" environment=HTTP_proxy="<%= @proxy %>",HTTPS_proxy="<%= @proxy %>"
priority=100 ; the relative start priority (default 999) priority=100 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)