summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2017-07-20 16:52:09 -0400
committermbeierl <mark.beierl@dell.com>2017-07-20 16:52:09 -0400
commit56fefc180443bbc1464be317befe2cfbb65513f3 (patch)
tree21fdc48f043e520414658afa0aef27025eef2d6f
parentb934a2867e39ab27878bc2bbf06bdcaa6b740b88 (diff)
Replay change to reporting
Puts /reporting back into the web server's path. Change-Id: I201a7d5a9d22b4d34d7706711fcd3c8efd76f1eb JIRA: STORPERF-192 Signed-off-by: mbeierl <mark.beierl@dell.com>
-rw-r--r--docker/storperf-httpfrontend/nginx.conf2
-rw-r--r--docker/storperf-reporting/src/app.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/storperf-httpfrontend/nginx.conf b/docker/storperf-httpfrontend/nginx.conf
index d655aee..ef9fe82 100644
--- a/docker/storperf-httpfrontend/nginx.conf
+++ b/docker/storperf-httpfrontend/nginx.conf
@@ -26,7 +26,7 @@ http {
}
location /reporting/ {
- proxy_pass http://storperf-reporting:5000/;
+ proxy_pass http://storperf-reporting:5000;
proxy_set_header Host $host:$proxy_port;
}
diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py
index 1c70faf..25edf48 100644
--- a/docker/storperf-reporting/src/app.py
+++ b/docker/storperf-reporting/src/app.py
@@ -14,14 +14,14 @@ app = Flask(__name__)
app.secret_key = 'storperf_graphing_module'
-@app.route('/success/')
+@app.route('/reporting/success/')
def success():
data = urllib.urlopen(session["url"]).read()
data = json.loads(data)
return render_template('plot_tables.html', data=data)
-@app.route('/url', methods=['POST', 'GET'])
+@app.route('/reporting/url', methods=['POST', 'GET'])
def url():
if request.method == 'POST':
url = request.form['url']
@@ -29,7 +29,7 @@ def url():
return redirect(url_for('success'))
-@app.route('/')
+@app.route('/reporting/')
def index():
return render_template('index.html')