From ac70d0ef937e85e053a9263c0d85e40b8d1bf86c Mon Sep 17 00:00:00 2001 From: grewn0uille Date: Fri, 23 Feb 2018 17:32:35 +0100 Subject: [PATCH] Change route and default value for server_name --- sherlog/app.py | 4 +++- sherlog/graph.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sherlog/app.py b/sherlog/app.py index 6e32d00..29336b1 100644 --- a/sherlog/app.py +++ b/sherlog/app.py @@ -16,6 +16,8 @@ def __init__(self, *args, **kwargs): self.route('/graph//', methods=['GET', 'POST'])(get_graph) + self.route('/graph/', + methods=['GET', 'POST'])(get_graph) rest = UnRest(self, self.create_session()) rest(Log, methods=['GET']) @@ -27,7 +29,7 @@ def before(self): g.session = self.create_session() -def get_graph(server_name, ping_service): +def get_graph(ping_service, server_name=''): graph.build_graph(server_name, ping_service) diff --git a/sherlog/graph.py b/sherlog/graph.py index 466f5f3..9afb35f 100644 --- a/sherlog/graph.py +++ b/sherlog/graph.py @@ -49,7 +49,7 @@ def get_data(server_name, ping_service, start): else: data = ( dbsession.query(Log) - .filter(Log.server_name == server_name) + .filter(Log.host == ping_service) .filter(Log.command == '') .filter(Log.start > start) .all() @@ -73,4 +73,4 @@ def build_graph(server_name, ping_service): group = list(group) data.append(float(compute_ok_percent(group, len(group)))) data_range.append(key) - return gen_graph(data, data_range, server_name + ping_service) + gen_graph(data, data_range, server_name + ping_service)