diff options
author | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
---|---|---|
committer | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
commit | 7b97188b728c85c498acc8acdce1750c472f2c85 (patch) | |
tree | 12c1436ab7eb97e9434e774671e8ffea134d61db /extras | |
parent | f70f65f7466a480a45a8260b35887cb7ed36b466 (diff) | |
parent | 7d404abf07d865d253ac2cfc353741e8d4af4867 (diff) |
Merge remote-tracking branch 'refs/remotes/tech-server/master'
Diffstat (limited to 'extras')
-rw-r--r-- | extras/misc/varnish.vcl | 6 | ||||
-rwxr-xr-x | extras/tools/add_switches.txt.pl | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/extras/misc/varnish.vcl b/extras/misc/varnish.vcl index 8f67a4d..271211b 100644 --- a/extras/misc/varnish.vcl +++ b/extras/misc/varnish.vcl @@ -12,6 +12,10 @@ backend default { backend graphite { .host = "gondul-graphite"; .port = "80"; + .first_byte_timeout = 3s; + .between_bytes_timeout = 3s; + .connect_timeout = 1s; + .max_connections = 20; } backend templating { @@ -39,7 +43,7 @@ sub vcl_recv { return (synth(418,"LOLOLOL")); } - if (req.url ~ "^/render") { + if (req.url ~ "^/render" || req.url ~ "^/metric") { set req.backend_hint = graphite; } if (req.url ~ "^/grafana") { diff --git a/extras/tools/add_switches.txt.pl b/extras/tools/add_switches.txt.pl index b4f4ef2..0ec38b1 100755 --- a/extras/tools/add_switches.txt.pl +++ b/extras/tools/add_switches.txt.pl @@ -8,7 +8,7 @@ use strict; use warnings; use Data::Dumper; -use lib '/opt/gondul/include'; +use lib '/home/tech/gondul/include'; use JSON; use nms::util; |