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

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

(cherry picked from commit b11cbbab01)

puppet/kandra/manifests/profile/chat_zulip_org.pp

@@ -7,7 +7,7 @@ class kandra::profile::chat_zulip_org inherits kandra::profile::base {
   include kandra::app_frontend_monitoring
   include kandra::prometheus::redis
   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 { 'https': }
   kandra::firewall_allow { 'smtp': }

puppet/kandra/manifests/profile/smokescreen.pp

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

puppet/kandra/templates/prometheus/prometheus.yaml.template.erb

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

puppet/zulip/templates/supervisor/smokescreen.conf.erb

@@ -1,5 +1,5 @@
 [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
 autostart=true
 autorestart=true