diff --git a/ee/api/chalicelib/core/sessions_insights.py b/ee/api/chalicelib/core/sessions_insights.py index 12ec73215..31310e4d1 100644 --- a/ee/api/chalicelib/core/sessions_insights.py +++ b/ee/api/chalicelib/core/sessions_insights.py @@ -122,9 +122,14 @@ def query_requests_by_period(project_id, start_time, end_time, conn=None): res = conn.execute(query=query) else: query = conn.format(query=query, params=params) + print("--------------------") + print(query) + print("--------------------") res = conn.execute(query=query) table_hh1, table_hh2, columns, this_period_hosts, last_period_hosts = __get_two_values(res, time_index='hh', - name_index='source') + name_index='source') + test = [k[4] for k in table_hh1] + print(f'length {len(test)}, uniques {len(set(test))}') del res new_hosts = [x for x in this_period_hosts if x not in last_period_hosts] @@ -137,20 +142,35 @@ def query_requests_by_period(project_id, start_time, end_time, conn=None): delta_success = dict() for n in common_names: d1_tmp = _table_where(table_hh1, source_idx, n) - # d1_tmp = table_hh1[table_hh1[:, source_idx] == n] d2_tmp = _table_where(table_hh2, source_idx, n) - # d2_tmp = table_hh2[table_hh2[:, source_idx] == n] delta_duration[n] = _mean_table_index(d1_tmp, duration_idx) - _mean_table_index(d2_tmp, duration_idx) - # delta_duration[n] = d1_tmp[:, duration_idx].mean() - d2_tmp[:, duration_idx].mean() delta_success[n] = _mean_table_index(d1_tmp, success_idx) - _mean_table_index(d2_tmp, success_idx) - # delta_success[n] = d1_tmp[:, success_idx].mean() - d2_tmp[:, success_idx].mean() - names_idx = columns.index('names') - d1_tmp = _sort_table_index(table_hh1, success_idx) - # d1_tmp = d1_tmp[d1_tmp[:, success_idx].argsort()] - return {'ratio': list(zip(_table_slice(d1_tmp, source_idx), _table_slice(d1_tmp, success_idx))), - 'increase': sorted(delta_success.items(), key=lambda k: k[1], reverse=False), - 'newEvents': new_hosts} + #names_idx = columns.index('names') + total = _sum_table_index(table_hh1, duration_idx) + d1_tmp = _sort_table_index(table_hh1, duration_idx, reverse=True) + _tmp = _table_slice(d1_tmp, duration_idx) + _tmp2 = _table_slice(d1_tmp, source_idx) + + increase = sorted(delta_duration.items(), key=lambda k: k[1], reverse=True) + ratio = sorted(zip(_tmp2, _tmp), key=lambda k: k[1], reverse=True) + names_ = set([k[0] for k in increase[:3]+ratio[:3]]+new_hosts[:3]) + + results = list() + for n in names_: + data_ = {'category': 'network', 'name': n, 'value': None, 'ratio': None, 'increase': None, 'isNew': True} + for n_, v in ratio: + if n == n_: + data_['value'] = v + data_['ratio'] = v/total + break + for n_, v in increase: + if n == n_: + data_['increase'] = v + data_['isNew'] = False + break + results.append(data_) + return results def query_most_errors_by_period(project_id, start_time, end_time, conn=None): @@ -166,13 +186,13 @@ def query_most_errors_by_period(project_id, start_time, end_time, conn=None): FROM (SELECT arrayJoin(arrayMap(x -> toDateTime(x), range(start, end, %(step_size)s))) as hh) AS T1 LEFT JOIN (SELECT session_id, name, source, message, toStartOfInterval(datetime, INTERVAL %(step_size)s second) as dtime FROM experimental.events - WHERE project_id = {project_id} + WHERE project_id = {project_id} + AND datetime >= toDateTime(%(startTimestamp)s/1000) + AND datetime < toDateTime(%(endTimestamp)s/1000) AND {" AND ".join(conditions)}) AS T2 ON T2.dtime = T1.hh GROUP BY T1.hh, T2.name ORDER BY T1.hh DESC;""" - # print("----------------------------------") - # print(query) - # print("----------------------------------") + if conn is None: with ch_client.ClickHouseClient() as conn: query = conn.format(query=query, params=params) @@ -183,6 +203,7 @@ def query_most_errors_by_period(project_id, start_time, end_time, conn=None): table_hh1, table_hh2, columns, this_period_errors, last_period_errors = __get_two_values(res, time_index='hh', name_index='names') + print(f'res {res}') del res new_errors = [x for x in this_period_errors if x not in last_period_errors] @@ -192,18 +213,31 @@ def query_most_errors_by_period(project_id, start_time, end_time, conn=None): names_idx = columns.index('names') percentage_errors = dict() total = _sum_table_index(table_hh1, sessions_idx) - # total = table_hh1[:, sessions_idx].sum() error_increase = dict() for n in this_period_errors: - percentage_errors[n] = _sum_table_index(_table_where(table_hh1, names_idx, n), sessions_idx) / total - # percentage_errors[n] = (table_hh1[table_hh1[:, names_idx] == n][:, sessions_idx].sum())/total + percentage_errors[n] = _sum_table_index(_table_where(table_hh1, names_idx, n), sessions_idx) for n in common_errors: error_increase[n] = _sum_table_index(_table_where(table_hh1, names_idx, n), names_idx) - _sum_table_index( _table_where(table_hh2, names_idx, n), names_idx) - # error_increase[n] = table_hh1[table_hh1[:, names_idx] == n][:, names_idx].sum() - table_hh2[table_hh2[:, names_idx] == n][:, names_idx].sum() - return {'ratio': sorted(percentage_errors.items(), key=lambda k: k[1], reverse=True), - 'increase': sorted(error_increase.items(), key=lambda k: k[1], reverse=True), - 'newEvents': new_errors} + ratio = sorted(percentage_errors.items(), key=lambda k: k[1], reverse=True) + increase = sorted(error_increase.items(), key=lambda k: k[1], reverse=True) + names_ = set([k[0] for k in increase[:3] + ratio[:3]] + new_errors[:3]) + + results = list() + for n in names_: + data_ = {'category': 'errors', 'name': n, 'value': None, 'ratio': None, 'increase': None, 'isNew': True} + for n_, v in ratio: + if n == n_: + data_['value'] = v + data_['ratio'] = v/total + break + for n_, v in increase: + if n == n_: + data_['increase'] = v + data_['isNew'] = False + break + results.append(data_) + return results def query_cpu_memory_by_period(project_id, start_time, end_time, conn=None): @@ -238,11 +272,11 @@ def query_cpu_memory_by_period(project_id, start_time, end_time, conn=None): cpu_idx = columns.index('cpu_used') _tmp = _mean_table_index(table_hh2, memory_idx) - # _tmp = table_hh2[:, memory_idx].mean() # TODO: what if _tmp=0 ? _tmp = 1 if _tmp == 0 else _tmp - return {'cpuIncrease': _mean_table_index(table_hh1, cpu_idx) - _mean_table_index(table_hh2, cpu_idx), - 'memoryIncrease': (_mean_table_index(table_hh1, memory_idx) - _tmp) / _tmp} + return [{'category': 'resources', + 'cpuIncrease': _mean_table_index(table_hh1, cpu_idx) - _mean_table_index(table_hh2, cpu_idx), + 'memoryIncrease': (_mean_table_index(table_hh1, memory_idx) - _tmp) / _tmp}] def query_click_rage_by_period(project_id, start_time, end_time, conn=None): @@ -253,7 +287,7 @@ def query_click_rage_by_period(project_id, start_time, end_time, conn=None): conditions = ["issue_type = 'click_rage'", "event_type = 'ISSUE'"] query = f"""WITH toUInt32(toStartOfInterval(toDateTime(%(startTimestamp)s/1000), INTERVAL %(step_size)s second)) AS start, toUInt32(toStartOfInterval(toDateTime(%(endTimestamp)s/1000), INTERVAL %(step_size)s second)) AS end - SELECT T1.hh, count(T2.session_id) as sessions, T2.url_host as names, groupUniqArray(T2.url_path) as sources + SELECT T1.hh, count(T2.session_id) as sessions, groupUniqArray(T2.url_host) as names, T2.url_path as sources FROM (SELECT arrayJoin(arrayMap(x -> toDateTime(x), range(start, end, %(step_size)s))) as hh) AS T1 LEFT JOIN (SELECT session_id, url_host, url_path, toStartOfInterval(datetime, INTERVAL %(step_size)s second ) as dtime FROM experimental.events @@ -261,7 +295,7 @@ def query_click_rage_by_period(project_id, start_time, end_time, conn=None): AND datetime >= toDateTime(%(startTimestamp)s/1000) AND datetime < toDateTime(%(endTimestamp)s/1000) AND {" AND ".join(conditions)}) AS T2 ON T2.dtime = T1.hh - GROUP BY T1.hh, T2.url_host + GROUP BY T1.hh, T2.url_path ORDER BY T1.hh DESC;""" if conn is None: with ch_client.ClickHouseClient() as conn: @@ -278,14 +312,16 @@ def query_click_rage_by_period(project_id, start_time, end_time, conn=None): res = conn.execute(query=query) table_hh1, table_hh2, columns, this_period_rage, last_period_rage = __get_two_values(res, time_index='hh', - name_index='names') + name_index='sources') del res new_names = [x for x in this_period_rage if x not in last_period_rage] common_names = [x for x in this_period_rage if x not in new_names] + print(f'[res...] {new_names}\n') + print(f'[common...] {common_names}\n') sessions_idx = columns.index('sessions') - names_idx = columns.index('names') + names_idx = columns.index('sources') raged_increment = dict() # TODO verify line (188) _tmp = table_hh2[:, sessions_idx][n].sum() @@ -293,61 +329,52 @@ def query_click_rage_by_period(project_id, start_time, end_time, conn=None): if n is None: continue _tmp = _sum_table_index(_table_where(table_hh2, names_idx, n), sessions_idx) - # _tmp = table_hh2[:, sessions_idx][n].sum() raged_increment[n] = (_sum_table_index(_table_where(table_hh1, names_idx, n), sessions_idx) - _tmp) / _tmp - # raged_increment[n] = (table_hh1[:, sessions_idx][n].sum()-_tmp)/_tmp total = _sum_table_index(table_hh1, sessions_idx) - # total = table_hh1[:, sessions_idx].sum() - return {'ratio': list( - zip(_table_slice(table_hh1, names_idx), map(lambda k: k / total, _table_slice(table_hh1, sessions_idx)))), - 'increase': sorted(raged_increment.items(), key=lambda k: k[1], reverse=True), - 'newEvents': new_names, - } + names, ratio = _table_slice(table_hh1, names_idx), _table_slice(table_hh1, sessions_idx) + ratio = sorted(zip(names, ratio), key=lambda k: k[1], reverse=True) + increase = sorted(raged_increment.items(), key=lambda k: k[1], reverse=True) + names_ = set([k[0] for k in increase[:3] + ratio[:3]] + new_names[:3]) + + results = list() + for n in names_: + data_ = {'category': 'rage', 'name': n, 'value': None, 'ratio': None, 'increase': None, 'isNew': True} + for n_, v in ratio: + if n == n_: + data_['value'] = v + data_['ratio'] = v/total + break + for n_, v in increase: + if n == n_: + data_['increase'] = v + data_['isNew'] = False + break + results.append(data_) + return results def fetch_selected(project_id, data: schemas_ee.GetInsightsSchema): - output = {} + output = list() with ch_client.ClickHouseClient() as conn: if schemas_ee.InsightCategories.errors in data.categories: - output[schemas_ee.InsightCategories.errors] = query_most_errors_by_period(project_id=project_id, - start_time=data.startTimestamp, - end_time=data.endTimestamp, - conn=conn) + output += query_most_errors_by_period(project_id=project_id, + start_time=data.startTimestamp, + end_time=data.endTimestamp, + conn=conn) if schemas_ee.InsightCategories.network in data.categories: - output[schemas_ee.InsightCategories.network] = query_requests_by_period(project_id=project_id, - start_time=data.startTimestamp, - end_time=data.endTimestamp, - conn=conn) + output += query_requests_by_period(project_id=project_id, + start_time=data.startTimestamp, + end_time=data.endTimestamp, + conn=conn) if schemas_ee.InsightCategories.rage in data.categories: - output[schemas_ee.InsightCategories.rage] = query_click_rage_by_period(project_id=project_id, - start_time=data.startTimestamp, - end_time=data.endTimestamp, - conn=conn) + output += query_click_rage_by_period(project_id=project_id, + start_time=data.startTimestamp, + end_time=data.endTimestamp, + conn=conn) if schemas_ee.InsightCategories.resources in data.categories: - output[schemas_ee.InsightCategories.resources] = query_cpu_memory_by_period(project_id=project_id, - start_time=data.startTimestamp, - end_time=data.endTimestamp, - conn=conn) + output += query_cpu_memory_by_period(project_id=project_id, + start_time=data.startTimestamp, + end_time=data.endTimestamp, + conn=conn) return output - -# if __name__ == '__main__': -# # configs -# start = '2022-04-19' -# end = '2022-04-21' -# projectId = 1307 -# time_step = 'hour' -# -# # Errors widget -# print('Errors example') -# res = query_most_errors_by_period(projectId, start_time=start, end_time=end, time_step=time_step) -# print(res) -# -# # Resources widgets -# print('resources example') -# res = query_cpu_memory_by_period(projectId, start_time=start, end_time=end, time_step=time_step) -# -# # Network widgets -# print('Network example') -# res = query_requests_by_period(projectId, start_time=start, end_time=end, time_step=time_step) -# print(res)