summaryrefslogtreecommitdiffstats
path: root/docker-compose
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2017-06-30 22:30:02 -0400
committermbeierl <mark.beierl@dell.com>2017-07-04 12:19:47 -0400
commite7b94bbe52fdb0cdb5a95c5657a2e207580aca86 (patch)
tree1a1912a4e97e4b93f61863ddaa12f36d8b6c398a /docker-compose
parent2c95b01efa53c7e7d4ea7d73fde0da6099938e50 (diff)
Multi-threaded HTTP Support
Adds multithreaded HTTP request abilities to ReST Server. Fixes docker-compose to ensure pull prior to up. Fixes metrics typo to make jobs API query work again. Change-Id: Ibac6188379cae0489792c5ea80f37dd3abf37082 JIRA: STORPERF-183 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'docker-compose')
-rw-r--r--docker-compose/nginx.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf
index b7933ac..6771358 100644
--- a/docker-compose/nginx.conf
+++ b/docker-compose/nginx.conf
@@ -20,6 +20,11 @@ http {
proxy_set_header Host $host:$proxy_port;
}
+ location /graphite/ {
+ proxy_pass http://storperf:8000;
+ proxy_set_header Host $host:$proxy_port;
+ }
+
location /swagger/ {
if ($containsurl = 0) {
return 302 $scheme://$host:$server_port$uri?url=http://$host:$server_port/api/spec.json$args;