wolf.r: graphite.shack redirect to graphite:8080

3 files changed, 35 insertions, 11 deletions

diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 3cb358ca3..3c3cf61fa 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -42,19 +42,19 @@ in
     # connect to git.shackspace.de as group runner for rz
     <stockholm/krebs/2configs/shack/gitlab-runner.nix>
 
-    # Statistics collection and visualization
-    <stockholm/krebs/2configs/graphite.nix>
+    # Statistics collection and visualization 
+    <stockholm/krebs/2configs/shack/graphite.nix>
     ## Collect data from mqtt.shack and store in graphite database
     <stockholm/krebs/2configs/shack/mqtt_sub.nix>
     ## Collect radioactive data and put into graphite
     <stockholm/krebs/2configs/shack/radioactive.nix>
     ## mqtt.shack
     <stockholm/krebs/2configs/shack/mqtt.nix>
+    ## influx.shack
+    <stockholm/krebs/2configs/shack/influx.nix>
     ## Collect local statistics via collectd and send to collectd
     <stockholm/krebs/2configs/stats/wolf-client.nix>
 
-    { services.influxdb.enable = true; }
-
     <stockholm/krebs/2configs/shack/netbox.nix>
     <stockholm/krebs/2configs/shack/prometheus/server.nix>
     <stockholm/krebs/2configs/shack/prometheus/node.nix>
diff --git a/krebs/2configs/graphite.nix b/krebs/2configs/shack/graphite.nix
index 64222e43a..1c8ec6a8b 100644
--- a/krebs/2configs/graphite.nix
+++ b/krebs/2configs/shack/graphite.nix
@@ -1,16 +1,22 @@
 { config, lib, pkgs, ... }:
+# hostname: graphite.shack
+
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-
-# TODO: krebs.graphite.minimal.enable
-# TODO: configure firewall
-with import <stockholm/lib>;
-{
-  imports = [ ];
-
+let
+  port = 8080;
+in {
+  networking.firewall.allowedTCPPorts = [ 2003 port ];
+  networking.firewall.allowedUDPPorts = [ 2003 ];
+  services.nginx.virtualHosts."graphite.shack" = {
+    locations."/" = {
+      proxyPass = "http://localhost:${toString port}/";
+    };
+  };
   services.graphite = {
     api = {
+      inherit port;
       enable = true;
       listenAddress = "0.0.0.0";
     };
diff --git a/krebs/2configs/shack/influx.nix b/krebs/2configs/shack/influx.nix
new file mode 100644
index 000000000..599416c97
--- /dev/null
+++ b/krebs/2configs/shack/influx.nix
@@ -0,0 +1,18 @@
+let
+  port = 8086;
+in
+{
+  networking.firewall.allowedTCPPorts = [ port ]; # for legacy applications
+  services.nginx.virtualHosts."influx.shack" = {
+    locations."/" = {
+      proxyPass = "http://localhost:${toString port}/";
+    };
+  };
+  services.influxdb = {
+    enable = true;
+    extraConfig = {
+      bind-address = ":${toString port}";
+      http.log-enabled = false;
+    };
+  };
+}