icecheng/freeleaps-authentication
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#9) from dev into main

Browse Source 
Reviewed-on: https://gitea.freeleaps.mathmast.com/products/freeleaps-authentication/pulls/9
This commit is contained in:
icecheng 2025-11-10 07:56:17 +00:00
commit 5abb2a16ec
7 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.freeleaps/devops/helm-pkg/templates/authentication-config.yaml
View File

@ -18,4 +18,6 @@ data:
MONGODB_PORT: {{ .Values.authentication.configs.mongodbPort | toString | b64enc }}
METRICS_ENABLED: {{ .Values.authentication.configs.metricsEnabled | default false | toString | b64enc }}
PROBES_ENABLED: {{ .Values.authentication.configs.probesEnabled | default false | toString | b64enc }}
FREELEAPS_PRODUCT_ID: { { .Values.authentication.configs.freeleapsProductId | b64enc | quote } }
ENVIRONMENT: { { .Values.authentication.configs.environment | b64enc | quote } }

2
.freeleaps/devops/helm-pkg/values.alpha.yaml
View File

@ -89,6 +89,8 @@ authentication:
mongodbPort: 27017
metricsEnabled: 'false'
probesEnabled: 'true'
freeleapsProductId: 6901bcf4ed3725f39f11343d
environment: alpha
secrets:
secretStoreRef:
kind: FreeleapsSecretStore

2
.freeleaps/devops/helm-pkg/values.prod.yaml
View File

@ -97,6 +97,8 @@ authentication:
mongodbPort: 27017
metricsEnabled: 'true'
probesEnabled: 'true'
freeleapsProductId: 6901bcf4ed3725f39f11343d
environment: prod
secrets:
secretStoreRef:
kind: FreeleapsSecretStore

2
.freeleaps/devops/helm-pkg/values.yaml
View File

@ -82,6 +82,8 @@ authentication:
metricsEnabled: "false"
# PROBES_ENABLED
probesEnabled: "false"
freeleapsProductId: ""
environment: alpha
# AKV secrets configuration
secrets:
secretStoreRef:

3
Dockerfile
View File

@ -25,6 +25,9 @@ ENV LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME
ENV BACKEND_LOG_FILE_NAME=$APP_NAME
ENV APPLICATION_ACTIVITY_LOG=$APP_NAME-activity
ENV FREELEAPS_PRODUCT_ID="6901bcf4ed3725f39f11343d"
ENV ENVIRONMENT="alpha"
WORKDIR ${CONTAINER_APP_ROOT}
COPY requirements.txt .

3
common/config/app_settings.py
View File

@ -30,6 +30,9 @@ class AppSettings(BaseSettings):
BACKEND_LOG_FILE_NAME: str = APP_NAME
APPLICATION_ACTIVITY_LOG: str = APP_NAME + "-application-activity"
FREELEAPS_PRODUCT_ID: str = ""
ENVIRONMENT: str = ""
class Config:
env_file = ".myapp.env"
env_file_encoding = "utf-8"

18
webapi/providers/metrics.py
View File

@ -2,12 +2,14 @@ import logging
from prometheus_fastapi_instrumentator import Instrumentator
from common.config.app_settings import app_settings
def register(app):
instrumentator = Instrumentator().instrument(app,
metric_namespace="freeleaps",
metric_subsystem=app_settings.APP_NAME)
@app.on_event("startup")
async def startup():
instrumentator.expose(app, endpoint="/api/_/metrics", should_gzip=True)
logging.info("Metrics endpoint exposed at /api/_/metrics")
def register(app):
instrumentator = Instrumentator().instrument(
app,
metric_namespace="freeleaps_{}".format(app_settings.FREELEAPS_PRODUCT_ID),
metric_subsystem=app_settings.ENVIRONMENT)
@app.on_event("startup")
async def startup():
instrumentator.expose(app, endpoint="/api/_/metrics", should_gzip=True)
logging.info("Metrics endpoint exposed at /api/_/metrics")