Compare commits
6 Commits
1.19.1
...
developmen
Author | SHA1 | Date | |
---|---|---|---|
c1aa0cd52d | |||
e9df8c1b76 | |||
04ccf542c1 | |||
75c4bbc6d4 | |||
1bd4e6d48d | |||
f3db5f3640 |
2
.cz.yaml
2
.cz.yaml
@ -17,5 +17,5 @@ commitizen:
|
||||
prerelease_offset: 1
|
||||
tag_format: $version
|
||||
update_changelog_on_bump: false
|
||||
version: 1.19.1
|
||||
version: 1.19.3
|
||||
version_scheme: semver
|
||||
|
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@ -92,7 +92,7 @@
|
||||
"console": "integratedTerminal",
|
||||
"args": [
|
||||
"-A",
|
||||
"app",
|
||||
"centurion",
|
||||
"worker",
|
||||
"-l",
|
||||
"INFO",
|
||||
|
14
CHANGELOG.md
14
CHANGELOG.md
@ -1,3 +1,17 @@
|
||||
## 1.19.3 (2025-08-17)
|
||||
|
||||
### Fixes
|
||||
|
||||
- **api**: ensure human_resources is behind its feature flag
|
||||
- **human_resources**: correct index route name
|
||||
- **access**: correct access route name
|
||||
|
||||
## 1.19.2 (2025-08-16)
|
||||
|
||||
### Fixes
|
||||
|
||||
- **base**: before setting up metrics if enabled, create data dir
|
||||
|
||||
## 1.19.1 (2025-08-15)
|
||||
|
||||
### Fixes
|
||||
|
@ -17,7 +17,7 @@ class AccessViewset(
|
||||
|
||||
viewset = Index
|
||||
|
||||
route_name = 'API:_api_v2_access_home'
|
||||
route_name = 'API:_api_access_home'
|
||||
|
||||
|
||||
@classmethod
|
||||
|
@ -31,7 +31,7 @@ entity_type_names = str(entity_type_names)[:-1]
|
||||
|
||||
router = DefaultRouter(trailing_slash=False)
|
||||
|
||||
router.register('', access_v2.Index, basename = '_api_v2_access_home')
|
||||
router.register('', access_v2.Index, basename = '_api_access_home')
|
||||
|
||||
router.register(
|
||||
prefix = '/(?P<model_name>[company]+)', viewset = entity.ViewSet,
|
||||
|
@ -23,19 +23,24 @@ class Index(IndexViewset):
|
||||
|
||||
def list(self, request, *args, **kwargs):
|
||||
|
||||
return Response(
|
||||
{
|
||||
"access": reverse('v2:_api_v2_access_home-list', request=request),
|
||||
"assistance": reverse('v2:_api_v2_assistance_home-list', request=request),
|
||||
"devops": reverse('v2:devops:api-root', request=request),
|
||||
"docs": reverse('v2:_api_v2_docs', request=request),
|
||||
"base": reverse('v2:_api_v2_base_home-list', request=request),
|
||||
"hr": reverse('v2:hr:_api_v2_access_home-list', request=request),
|
||||
"itam": reverse('v2:_api_v2_itam_home-list', request=request),
|
||||
"itim": reverse('v2:_api_v2_itim_home-list', request=request),
|
||||
"config_management": reverse('v2:_api_v2_config_management_home-list', request=request),
|
||||
"project_management": reverse('v2:_api_v2_project_management_home-list', request=request),
|
||||
"public": reverse('v2:public:_public_api_v2-list', request=request),
|
||||
"settings": reverse('v2:_api_v2_settings_home-list', request=request)
|
||||
}
|
||||
)
|
||||
links = {
|
||||
"access": reverse('v2:_api_access_home-list', request=request),
|
||||
"assistance": reverse('v2:_api_v2_assistance_home-list', request=request),
|
||||
"devops": reverse('v2:devops:api-root', request=request),
|
||||
"docs": reverse('v2:_api_v2_docs', request=request),
|
||||
"base": reverse('v2:_api_v2_base_home-list', request=request),
|
||||
"itam": reverse('v2:_api_v2_itam_home-list', request=request),
|
||||
"itim": reverse('v2:_api_v2_itim_home-list', request=request),
|
||||
"config_management": reverse('v2:_api_v2_config_management_home-list', request=request),
|
||||
"project_management": reverse('v2:_api_v2_project_management_home-list', request=request),
|
||||
"public": reverse('v2:public:_public_api_v2-list', request=request),
|
||||
"settings": reverse('v2:_api_v2_settings_home-list', request=request)
|
||||
}
|
||||
|
||||
if request.feature_flag['2025-00005']:
|
||||
links.update({
|
||||
"hr": reverse('v2:hr:_api_human_resources_home-list', request=request),
|
||||
|
||||
})
|
||||
|
||||
return Response( links )
|
||||
|
@ -7,6 +7,6 @@ from human_resources.viewsets import index as HumanResourcesHome
|
||||
|
||||
router = DefaultRouter(trailing_slash=False)
|
||||
|
||||
router.register('', HumanResourcesHome.Index, feature_flag = '2025-00005', basename='_api_v2_access_home')
|
||||
router.register('', HumanResourcesHome.Index, feature_flag = '2025-00005', basename='_api_human_resources_home')
|
||||
|
||||
urlpatterns = router.urls
|
||||
|
@ -59,10 +59,7 @@ timeout = 180
|
||||
workers = 4
|
||||
|
||||
|
||||
def when_ready(_):
|
||||
|
||||
if not getattr(settings, 'METRICS_ENABLED', False):
|
||||
return
|
||||
if getattr(settings, 'METRICS_ENABLED', False):
|
||||
|
||||
proc_path = None
|
||||
|
||||
@ -79,6 +76,16 @@ def when_ready(_):
|
||||
proc_path = os.environ["PROMETHEUS_MULTIPROC_DIR"]
|
||||
|
||||
|
||||
prometheus_dir = Path(os.environ["PROMETHEUS_MULTIPROC_DIR"])
|
||||
prometheus_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
|
||||
def when_ready(_):
|
||||
|
||||
if not getattr(settings, 'METRICS_ENABLED', False):
|
||||
return
|
||||
|
||||
|
||||
logger.info(f'Setting up prometheus metrics HTTP server on port \
|
||||
{str(settings.METRICS_EXPORT_PORT)}.')
|
||||
|
||||
|
Reference in New Issue
Block a user