From 1642c1ffd18ab2cbdb04e3b0119b507857713ce2 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 19 Apr 2022 19:10:56 +0200 Subject: [PATCH] feat(api): changes --- api/chalicelib/core/{dashboards2.py => dashboards.py} | 2 +- api/chalicelib/core/insights.py | 2 +- api/chalicelib/core/{dashboard.py => metrics.py} | 0 api/routers/subs/dashboard.py | 2 +- api/routers/subs/metrics.py | 2 +- ee/api/.gitignore | 2 +- ee/api/chalicelib/core/errors.py | 2 +- ee/api/chalicelib/core/insights.py | 4 ++-- ee/api/chalicelib/core/{dashboard.py => metrics.py} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename api/chalicelib/core/{dashboards2.py => dashboards.py} (99%) rename api/chalicelib/core/{dashboard.py => metrics.py} (100%) rename ee/api/chalicelib/core/{dashboard.py => metrics.py} (100%) diff --git a/api/chalicelib/core/dashboards2.py b/api/chalicelib/core/dashboards.py similarity index 99% rename from api/chalicelib/core/dashboards2.py rename to api/chalicelib/core/dashboards.py index b3ebf9783..3af8b01a0 100644 --- a/api/chalicelib/core/dashboards2.py +++ b/api/chalicelib/core/dashboards.py @@ -1,7 +1,7 @@ import json import schemas -from chalicelib.core import custom_metrics, dashboard +from chalicelib.core import custom_metrics, metrics from chalicelib.utils import helper from chalicelib.utils import pg_client from chalicelib.utils.TimeUTC import TimeUTC diff --git a/api/chalicelib/core/insights.py b/api/chalicelib/core/insights.py index d5caa3a61..e5219344b 100644 --- a/api/chalicelib/core/insights.py +++ b/api/chalicelib/core/insights.py @@ -1,5 +1,5 @@ import schemas -from chalicelib.core.dashboard import __get_constraints, __get_constraint_values +from chalicelib.core.metrics import __get_constraints, __get_constraint_values from chalicelib.utils import helper, dev from chalicelib.utils import pg_client from chalicelib.utils.TimeUTC import TimeUTC diff --git a/api/chalicelib/core/dashboard.py b/api/chalicelib/core/metrics.py similarity index 100% rename from api/chalicelib/core/dashboard.py rename to api/chalicelib/core/metrics.py diff --git a/api/routers/subs/dashboard.py b/api/routers/subs/dashboard.py index 029127cbd..3d27178cf 100644 --- a/api/routers/subs/dashboard.py +++ b/api/routers/subs/dashboard.py @@ -1,7 +1,7 @@ from fastapi import Body import schemas -from chalicelib.core import dashboard +from chalicelib.core import metrics from chalicelib.core import metadata from chalicelib.utils import helper from routers.base import get_routers diff --git a/api/routers/subs/metrics.py b/api/routers/subs/metrics.py index 0a806b146..a5a1cede5 100644 --- a/api/routers/subs/metrics.py +++ b/api/routers/subs/metrics.py @@ -1,7 +1,7 @@ from fastapi import Body, Depends import schemas -from chalicelib.core import dashboards2, custom_metrics +from chalicelib.core import dashboards, custom_metrics from or_dependencies import OR_context from routers.base import get_routers diff --git a/ee/api/.gitignore b/ee/api/.gitignore index f8ff0f789..c5a8d9ce4 100644 --- a/ee/api/.gitignore +++ b/ee/api/.gitignore @@ -260,5 +260,5 @@ Pipfile /build_alerts.sh /routers/subs/metrics.py /routers/subs/v1_api.py -/chalicelib/core/dashboards2.py +/chalicelib/core/dashboards.py entrypoint.sh \ No newline at end of file diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors.py index 8531d89a3..84beb0c30 100644 --- a/ee/api/chalicelib/core/errors.py +++ b/ee/api/chalicelib/core/errors.py @@ -1,7 +1,7 @@ import json import schemas -from chalicelib.core import dashboard +from chalicelib.core import metrics from chalicelib.core import sourcemaps, sessions from chalicelib.utils import ch_client, metrics_helper from chalicelib.utils import pg_client, helper diff --git a/ee/api/chalicelib/core/insights.py b/ee/api/chalicelib/core/insights.py index 9ac11013d..3dba723e4 100644 --- a/ee/api/chalicelib/core/insights.py +++ b/ee/api/chalicelib/core/insights.py @@ -1,6 +1,6 @@ import schemas -from chalicelib.core.dashboard import __get_basic_constraints, __get_meta_constraint -from chalicelib.core.dashboard import __get_constraint_values, __complete_missing_steps +from chalicelib.core.metrics import __get_basic_constraints, __get_meta_constraint +from chalicelib.core.metrics import __get_constraint_values, __complete_missing_steps from chalicelib.utils import ch_client from chalicelib.utils import helper, dev from chalicelib.utils.TimeUTC import TimeUTC diff --git a/ee/api/chalicelib/core/dashboard.py b/ee/api/chalicelib/core/metrics.py similarity index 100% rename from ee/api/chalicelib/core/dashboard.py rename to ee/api/chalicelib/core/metrics.py