diff --git a/venusclient/v1/analyse.py b/venusclient/v1/analyse.py index 5cb8ff7..9ddd53e 100644 --- a/venusclient/v1/analyse.py +++ b/venusclient/v1/analyse.py @@ -27,21 +27,18 @@ class AnalyseManager(basemodels.BaseModelManager): base_url = "search" resource_class = LogAnalyse - def analyse_log(self, start_time=0, end_time=20, page_size=15, - page_num=1, module_name='', host_name='', program_name='', - level=''): + def analyse_log(self, group_name='', host_name='', module_name='', + program_name='', level='', start_time=0, end_time=20): url = '/v1/search/analyse/logs' params = { - 'start_time': start_time, - 'end_time': end_time, - 'page_size': page_size, - 'page_num': page_num, - 'module_name': module_name, + 'group_name': group_name, 'host_name': host_name, + 'module_name': module_name, 'program_name': program_name, - 'group_name': "program_name", - 'level': level + 'level': level, + 'start_time': start_time, + 'end_time': end_time } url += utils.prepare_query_string(params) diff --git a/venusclient/v1/analyse_shell.py b/venusclient/v1/analyse_shell.py index 75efbe9..5787716 100644 --- a/venusclient/v1/analyse_shell.py +++ b/venusclient/v1/analyse_shell.py @@ -12,10 +12,42 @@ # License for the specific language governing permissions and limitations # under the License. +from venusclient.common import cliutils as utils + +@utils.arg('group_name', + metavar='', + help='Group name. "host_name" or "program_name".') +@utils.arg('--host_name', + metavar='', + dest='host_name', + help='Host name. optional') +@utils.arg('--module_name', + metavar='', + dest='module_name', + help='The module name. optional') +@utils.arg('--program_name', + metavar='', + dest='program_name', + help='The program name. optional') +@utils.arg('--level', + metavar='', + dest='level', + help="The level of log, such as 'error', 'info'. optional") +@utils.arg('--start_time', + metavar='', + dest='start_time', + help='The start timestamp of time frame. optional') +@utils.arg('--end_time', + metavar='', + dest='end_time', + help='The end timestamp of time frame. optional') def do_analyse_log(cs, args): """get analyse log content""" - endpoint = cs.analyse.analyse_log(args) + endpoint = cs.analyse.analyse_log(args.group_name, args.host_name, + args.module_name, args.program_name, + args.level, args.start_time, + args.end_time) print(endpoint) return endpoint