File tree Expand file tree Collapse file tree 3 files changed +10
-5
lines changed
cloud_controller/config_schemas/base Expand file tree Collapse file tree 3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -143,6 +143,9 @@ class WorkerSchema < VCAP::Config
143143 optional ( :port ) => Integer
144144 } ,
145145
146+ optional ( :publish_metrics ) => bool ,
147+ optional ( :prometheus_port ) => Integer ,
148+
146149 skip_cert_verify : bool ,
147150
148151 optional ( :routing_api ) => {
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ def initialize(options)
2222
2323 def start_working
2424 config = RakeConfig . config
25- setup_metrics_endpoint if @publish_metrics
25+ setup_metrics_endpoint ( config ) if @publish_metrics
2626 BackgroundJobEnvironment . new ( config ) . setup_environment ( readiness_port )
2727
2828 logger = Steno . logger ( 'cc-worker' )
@@ -99,8 +99,8 @@ def is_first_generic_worker_on_machine?
9999 RakeConfig . context != :api && ENV [ 'INDEX' ] &.to_i == 1
100100 end
101101
102- def setup_metrics_endpoint
103- prometheus_dir = File . join ( RakeConfig . config . get ( :directories , :tmpdir ) , 'prometheus' )
102+ def setup_metrics_endpoint ( config )
103+ prometheus_dir = File . join ( config . get ( :directories , :tmpdir ) , 'prometheus' )
104104 Prometheus ::Client . config . data_store = Prometheus ::Client ::DataStores ::DirectFileStore . new ( dir : prometheus_dir )
105105 return unless is_first_generic_worker_on_machine?
106106
@@ -124,7 +124,7 @@ def setup_metrics_endpoint
124124
125125 Thread . new do
126126 server = Puma ::Server . new ( metrics_app )
127- server . add_tcp_listener '0.0.0.0' , 9394
127+ server . add_tcp_listener '0.0.0.0' , config . get ( :prometheus_port ) || 9394
128128 server . run
129129 end
130130 end
Original file line number Diff line number Diff line change @@ -66,10 +66,12 @@ namespace :jobs do
6666
6767 ENV [ 'PROCESS_TYPE' ] = 'cc-worker'
6868
69+ publish_metrics = RakeConfig . config . get ( :publish_metrics ) || false
70+
6971 CloudController ::DelayedWorker . new ( queues : queues ,
7072 name : args . name ,
7173 num_threads : args . num_threads ,
7274 thread_grace_period_seconds : args . thread_grace_period_seconds ,
73- publish_metrics : true ) . start_working
75+ publish_metrics : publish_metrics ) . start_working
7476 end
7577end
You can’t perform that action at this time.
0 commit comments