From 6ae99062fd0f7deede77cf4b591547fd77e8469f Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sun, 12 Jun 2022 18:23:35 +0100 Subject: [PATCH] nixos/middleman: Add nginx netdata monitoring --- .../vms/shill/containers/middleman/default.nix | 16 ++++++++++++++++ .../vms/shill/containers/middleman/vhosts.nix | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/boxes/colony/vms/shill/containers/middleman/default.nix b/nixos/boxes/colony/vms/shill/containers/middleman/default.nix index 5456167..d3b99ab 100644 --- a/nixos/boxes/colony/vms/shill/containers/middleman/default.nix +++ b/nixos/boxes/colony/vms/shill/containers/middleman/default.nix @@ -170,9 +170,23 @@ }; services = { + netdata = { + enable = true; + configDir = { + "go.d/nginxvts.conf" = pkgs.writeText "netdata-nginxvts.conf" '' + jobs: + - name: local + url: http://localhost/status/format/json + ''; + }; + }; + nginx = { enable = true; enableReload = true; + additionalModules = with pkgs.nginxModules; [ + vts + ]; recommendedTlsSettings = true; clientMaxBodySize = "0"; @@ -231,6 +245,8 @@ proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Protocol $scheme; proxy_set_header X-Scheme $scheme; + + vhost_traffic_status_zone; ''; }; }; diff --git a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix index f6566fd..f42bac9 100644 --- a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix +++ b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix @@ -63,6 +63,21 @@ in wellKnown ]; }; + "localhost" = { + forceSSL = false; + onlySSL = false; + locations = { + "/status".extraConfig = '' + access_log off; + allow 127.0.0.1; + allow ::1; + deny all; + + vhost_traffic_status_display; + vhost_traffic_status_display_format html; + ''; + }; + }; "sso.${lib.my.pubDomain}" = { locations."/".proxyPass = config.my.nginx-sso.includes.endpoint; @@ -71,7 +86,7 @@ in "netdata-colony.${lib.my.pubDomain}" = let - hosts = [ "vm" "fw" "ctr" "jackflix-ctr" ]; + hosts = [ "vm" "fw" "ctr" "http" "jackflix-ctr" ]; matchHosts = concatStringsSep "|" hosts; in mkMerge [