From 81628407df34c13aba36025f30036717c0ea3f0e Mon Sep 17 00:00:00 2001 From: weicao Date: Fri, 19 Sep 2025 16:03:29 +0800 Subject: [PATCH] fixed: code standard and env file --- apps/metrics/Dockerfile | 2 -- apps/metrics/common/config/app_settings.py | 2 +- apps/metrics/local.env | 19 +++++++++++++++++++ apps/metrics/webapi/main.py | 7 ------- 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 apps/metrics/local.env diff --git a/apps/metrics/Dockerfile b/apps/metrics/Dockerfile index b27cb4e..2bac1b0 100644 --- a/apps/metrics/Dockerfile +++ b/apps/metrics/Dockerfile @@ -10,8 +10,6 @@ COPY requirements.txt . # Install dependencies RUN pip install --no-cache-dir -r requirements.txt -# Copy environment file -COPY local.env . # Copy application code COPY . . diff --git a/apps/metrics/common/config/app_settings.py b/apps/metrics/common/config/app_settings.py index 4877ca6..927ea09 100644 --- a/apps/metrics/common/config/app_settings.py +++ b/apps/metrics/common/config/app_settings.py @@ -29,7 +29,7 @@ class AppSettings(BaseSettings): class Config: - env_file = "local.env" + env_file = ".env" app_settings = AppSettings() diff --git a/apps/metrics/local.env b/apps/metrics/local.env new file mode 100644 index 0000000..4b601db --- /dev/null +++ b/apps/metrics/local.env @@ -0,0 +1,19 @@ +# Local environment configuration for Metrics service +SERVER_HOST=0.0.0.0 +SERVER_PORT=8009 +SERVICE_API_ACCESS_PORT=8009 +SERVICE_API_ACCESS_HOST=0.0.0.0 + +# starrocks settings +STARROCKS_HOST=freeleaps-starrocks-cluster-fe-service.freeleaps-data-platform.svc +STARROCKS_PORT=9030 +STARROCKS_USER=root +STARROCKS_PASSWORD="" +STARROCKS_DATABASE=freeleaps + +# log settings +LOG_BASE_PATH=./logs +BACKEND_LOG_FILE_NAME=metrics +APPLICATION_ACTIVITY_LOG=metrics-activity + +PROMETHEUS_ENDPOINT=http://localhost:9090 \ No newline at end of file diff --git a/apps/metrics/webapi/main.py b/apps/metrics/webapi/main.py index 203a244..93b3fa8 100644 --- a/apps/metrics/webapi/main.py +++ b/apps/metrics/webapi/main.py @@ -3,16 +3,9 @@ from fastapi.responses import RedirectResponse import uvicorn from webapi.bootstrap.application import create_app -from webapi.routes.starrocks_metrics import api_router as starrocks_metrics_router -from webapi.routes.prometheus_metrics import api_router as prometheus_metrics_router app = create_app() -# Include routers -app.include_router(starrocks_metrics_router, prefix="/metrics", tags=["starrocks-metrics"]) -app.include_router(prometheus_metrics_router, prefix="/metrics", tags=["prometheus-metrics"]) - - @app.get("/", status_code=301) async def root(): """