Skip to content

feat: add location block for upstream agent and metrics endpoints in proxy nodes #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phot0n wants to merge 2 commits into
base: develop
Choose a base branch
from
+32 −4
Open

feat: add location block for upstream agent and metrics endpoints in proxy nodes #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e6a987
feat: add location block for upstream agent and metrics endpoints in …
phot0n Jan 8, 2026
03c4b5b
feat: add proxied servers template in servers.yml
phot0n Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions agent/templates/agent/nginx.conf.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,23 @@ server {
more_set_headers "Access-Control-Allow-Origin: {{ press_url }}";
{%- endif %}

{% if name.startswith('n') %}
# Dynamic upstream routing with regex capture
# Matches /{upstream_name}/agent/ or /{upstream_name}/metrics
# Supports port: /{upstream_name}:{port}/agent/
location ~ ^/([^/]+)?/(agent|metrics|status)(.*)$ {
set $upstream_host $1;
set $upstream_path $2$3;

proxy_pass https://$upstream_host/$upstream_path;
proxy_ssl_server_name on;
proxy_ssl_protocols TLSv1.3;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
{% endif %}

location /agent/ {
proxy_http_version 1.1;
proxy_cache_bypass $http_upgrade;
Expand Down Expand Up @@ -102,7 +119,7 @@ server {
location /metrics/mariadb {
proxy_pass http://127.0.0.1:9104/metrics;
}

location /metrics/mariadb_proxy {
proxy_pass http://127.0.0.1:9104/metrics;
}
Expand All @@ -126,7 +143,7 @@ server {
location /metrics/blackbox {
proxy_pass http://127.0.0.1:9115/blackbox/metrics;
}

location /metrics/grafana {
proxy_pass http://127.0.0.1:3000/grafana/metrics;
}
Expand Down Expand Up @@ -209,7 +226,7 @@ server {
auth_basic_user_file /home/frappe/agent/nginx/grafana.htpasswd;
proxy_pass http://127.0.0.1:9115/blackbox;
}

location /grafana {
auth_basic "Grafana UI";
auth_basic_user_file /home/frappe/agent/nginx/grafana-ui.htpasswd;
Expand Down Expand Up @@ -240,7 +257,7 @@ server {
location /kibana/ {
auth_basic "Kibana";
auth_basic_user_file /home/frappe/agent/nginx/kibana.htpasswd;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header host $host;
Expand Down
11 changes: 11 additions & 0 deletions agent/templates/prometheus/servers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,14 @@
job: "{{ job }}"
__metrics_path__: /metrics/{{ job }}
## endfor ##

## for job, servers in (cluster.jobs.proxied | default({})).items() ##
##- for server in servers ##
- targets:
- "{{ server.proxy }}"
labels:
cluster: "{{ cluster.name }}"
job: "{{ job }}"
__metrics_path__: {{ server.server }}/metrics/{{ job }}
##- endfor ##
## endfor ##