paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 05:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

smokescreen: Move metrics port from the default 9810, to 4760.

Browse Source 
This prevents errors if Smokescreen is running on a host with more
than 10 Tornado shards.

(cherry picked from commit b11cbbab01)
This commit is contained in:
Alex Vandiver
2025-04-11 15:00:11 +00:00
committed by Tim Abbott
parent da72e9447e
commit d7293735e1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/kandra/manifests/profile/chat_zulip_org.pp
View File

@@ -7,7 +7,7 @@ class kandra::profile::chat_zulip_org inherits kandra::profile::base {
include kandra::app_frontend_monitoring include kandra::app_frontend_monitoring
include kandra::prometheus::redis include kandra::prometheus::redis
include kandra::prometheus::postgresql include kandra::prometheus::postgresql
kandra::firewall_allow { 'smokescreen_metrics': port => '9810' } kandra::firewall_allow { 'smokescreen_metrics': port => '4760' }
kandra::firewall_allow { 'http': } kandra::firewall_allow { 'http': }
kandra::firewall_allow { 'https': } kandra::firewall_allow { 'https': }
kandra::firewall_allow { 'smtp': } kandra::firewall_allow { 'smtp': }

2
puppet/kandra/manifests/profile/smokescreen.pp
View File

@@ -3,7 +3,7 @@ class kandra::profile::smokescreen inherits kandra::profile::base {
include zulip::profile::smokescreen include zulip::profile::smokescreen
kandra::firewall_allow { 'smokescreen': port => '4750' } kandra::firewall_allow { 'smokescreen': port => '4750' }
kandra::firewall_allow { 'smokescreen_metrics': port => '9810' } kandra::firewall_allow { 'smokescreen_metrics': port => '4760' }
include kandra::camo include kandra::camo
} }

4
puppet/kandra/templates/prometheus/prometheus.yaml.template.erb
View File

@@ -69,14 +69,14 @@ scrape_configs:
- job_name: "smokescreen" - job_name: "smokescreen"
ec2_sd_configs: ec2_sd_configs:
- region: us-east-1 - region: us-east-1
port: 9810 port: 4760
filters: filters:
- name: "tag:role" - name: "tag:role"
values: ["smokescreen"] values: ["smokescreen"]
- name: instance-state-name - name: instance-state-name
values: ["running"] values: ["running"]
static_configs: static_configs:
- targets: ["<%= @czo %>:9810"] - targets: ["<%= @czo %>:4760"]
labels: labels:
deploy: prod deploy: prod
instance: <%= @czo %> instance: <%= @czo %>

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

@@ -1,5 +1,5 @@
[program:smokescreen] [program:smokescreen]
command=<%= @bin %> --listen-ip <%= @listen_address %> --expose-prometheus-metrics command=<%= @bin %> --listen-ip <%= @listen_address %> --expose-prometheus-metrics --prometheus-port 4760
priority=15 priority=15
autostart=true autostart=true
autorestart=true autorestart=true