diff --git a/ansible/configuration.yml b/ansible/configuration.yml index 33b2cd3..9549ba2 100644 --- a/ansible/configuration.yml +++ b/ansible/configuration.yml @@ -4,6 +4,7 @@ notes_port: 41080 dayoff_port: 41081 homepage_port: 41082 + netdata_port: 41083 vars_files: - vars/vars.yml @@ -65,6 +66,7 @@ name: netdata vars: netdata_version: 'v1.36.0' + netdata_exposed_port: '{{ netdata_port }}' tags: - monitoring diff --git a/ansible/roles/netdata/defaults/main.yml b/ansible/roles/netdata/defaults/main.yml index 9c87105..54d0b73 100644 --- a/ansible/roles/netdata/defaults/main.yml +++ b/ansible/roles/netdata/defaults/main.yml @@ -1,3 +1,4 @@ --- netdata_version: 'v1.18.0' netdata_image: 'netdata/netdata:{{ netdata_version }}' +netdata_exposed_port: '19999' diff --git a/ansible/roles/netdata/tasks/main.yml b/ansible/roles/netdata/tasks/main.yml index 7156fb8..f742c75 100644 --- a/ansible/roles/netdata/tasks/main.yml +++ b/ansible/roles/netdata/tasks/main.yml @@ -9,7 +9,7 @@ image: '{{ netdata_image }}' restart_policy: 'always' published_ports: - - '127.0.0.1:19999:19999' + - '127.0.0.1:{{ netdata_exposed_port }}:19999' volumes: - '/proc:/host/proc:ro' - '/sys:/host/sys:ro' diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2 index 6ec52c0..4db7ae7 100644 --- a/ansible/templates/Caddyfile.j2 +++ b/ansible/templates/Caddyfile.j2 @@ -4,13 +4,16 @@ vakhrushev.me { tls anwinged@ya.ru - respond "Hello!" + + reverse_proxy { + to 127.0.0.1:{{ homepage_port }} + } } # NetData proxy status.vakhrushev.me, :29999 { reverse_proxy { - to 127.0.0.1:19999 + to 127.0.0.1:{{ netdata_port }} } tls anwinged@ya.ru