Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx
#	adminfront/tests/worksmobile.spec.ts

docs/external_healthcheck_monitoring_design.md

@@ -140,12 +140,12 @@ scrape_configs:
       - source_labels: ['container_name']
         regex: '(baron_.*|oathkeeper|kratos|hydra|keto)'
         action: keep
-      # 컨테이너 명에서 앞의 접두사를 떼어 서비스 및 잡 라벨 부여 (예: baron_backend -> backend)
+      # 컨테이너 명에서 앞의 접두사를 떼어 서비스 및 잡 라벨 부여 (예: baron_backend -> backend, kratos -> kratos)
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'service'
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'job'
       # 동적 라벨 추가
       - target_label: 'app_env'