diff --git a/app/modules/roxywi/user.py b/app/modules/roxywi/user.py index 3efb112e..386f8eff 100644 --- a/app/modules/roxywi/user.py +++ b/app/modules/roxywi/user.py @@ -1,6 +1,6 @@ import os -from flask import render_template, request, make_response +from flask import render_template, make_response import modules.db.sql as sql import modules.roxywi.common as roxywi_common diff --git a/app/routes/metric/routes.py b/app/routes/metric/routes.py index 46276494..e211011d 100644 --- a/app/routes/metric/routes.py +++ b/app/routes/metric/routes.py @@ -29,7 +29,7 @@ def metrics(service): service_desc = sql.select_service(service) roxywi_common.check_user_group_for_flask() servers = '' - + services = '0' is_redirect = roxywi_auth.check_login(user_params['user_uuid'], user_params['token'], service=service_desc.service_id) if is_redirect != 'ok': @@ -41,10 +41,10 @@ def metrics(service): else: cmd = "rpm -q roxy-wi-metrics-* |awk -F\"metrics\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'" service_ver, stderr = server_mod.subprocess_execute(cmd) - services = '0' + if not stderr: if len(service_ver) > 0: - if service_ver[0] == ' is not installed': + if 'is not installed' in service_ver[0]: servers = '' else: services = '1' diff --git a/app/templates/ajax/stick_table.html b/app/templates/ajax/stick_table.html index d2861382..25055347 100644 --- a/app/templates/ajax/stick_table.html +++ b/app/templates/ajax/stick_table.html @@ -70,6 +70,11 @@ {% endif %} {% if headers|length > 8 %} +