diff --git a/nodes b/nodes index 13c12de..8ed70d5 160000 --- a/nodes +++ b/nodes @@ -1 +1 @@ -Subproject commit 13c12de5742a0c3c7b8bc4f75a6eb97d7575e713 +Subproject commit 8ed70d582766d09341ceef0765de60c9220a0134 diff --git a/site-cookbooks/kosmos_prometheus/recipes/server.rb b/site-cookbooks/kosmos_prometheus/recipes/server.rb index ef73331..9d17c7d 100644 --- a/site-cookbooks/kosmos_prometheus/recipes/server.rb +++ b/site-cookbooks/kosmos_prometheus/recipes/server.rb @@ -89,6 +89,11 @@ jobs = node["kosmos_prometheus"]["jobs"].merge( "query" => "role:garage_node", "port" => 3903 }, + # strfry relay metrics + "strfry" => { + "query" => "role:strfry", + "port" => 7777 + }, }.transform_values do |config| { "targets" => search(:node, config["query"]).map do |n| diff --git a/site-cookbooks/kosmos_strfry/templates/nginx_conf_strfry.erb b/site-cookbooks/kosmos_strfry/templates/nginx_conf_strfry.erb index c4b6418..1e01cfd 100644 --- a/site-cookbooks/kosmos_strfry/templates/nginx_conf_strfry.erb +++ b/site-cookbooks/kosmos_strfry/templates/nginx_conf_strfry.erb @@ -31,6 +31,10 @@ server { proxy_pass http://_substr; } + location /metrics { + return 404; + } + location / { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/site-cookbooks/strfry b/site-cookbooks/strfry index 2c6e64d..9c04b39 160000 --- a/site-cookbooks/strfry +++ b/site-cookbooks/strfry @@ -1 +1 @@ -Subproject commit 2c6e64d2311d2a50b207f4d970c3a951b73d2a5c +Subproject commit 9c04b393ec69588eebce036df406372d9faa3f59