maxjhandsome
/
sysom1
mirror of https://gitee.com/anolis/sysom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(diagnosis): Fix diagnostic microservice health check failure

This commit is contained in:
SunnyQjm 2023-05-11 16:16:01 +08:00
parent e0435aca2a
commit 3892c86525
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysom_server/sysom_diagnosis/apps/task/urls.py
View File

@ -16,7 +16,6 @@ router.register('tasks', views.TaskAPIView)
urlpatterns = [ urlpatterns = [
path('api/v1/tasks/offline_import/', views.TaskAPIView.as_view({'post': 'offline_import'})), path('api/v1/tasks/offline_import/', views.TaskAPIView.as_view({'post': 'offline_import'})),
path('api/v1/tasks/host/', views.TaskAPIView.as_view({'get': 'get_host'})), path('api/v1/tasks/host/', views.TaskAPIView.as_view({'get': 'get_host'})),
path('api/v1/', include(router.urls)),
path('api/v2/tasks/', views.TaskAPIView.as_view({'post': 'create_task_v2'})), path('api/v2/tasks/', views.TaskAPIView.as_view({'post': 'create_task_v2'})),
path('api/v1/tasks/health_check/', views.TaskAPIView.as_view({'get': 'health_check'})), path('api/v1/tasks/health_check/', views.TaskAPIView.as_view({'get': 'health_check'})),
path('api/v1/', include(router.urls)), path('api/v1/', include(router.urls)),

42
sysom_web/src/app.jsx
View File

@ -154,28 +154,30 @@ export function patchRoutes({ routes }) {
let diagnose = routes.find((item) => item.path == "/") let diagnose = routes.find((item) => item.path == "/")
.routes.find(item => item.name == "diagnose") .routes.find(item => item.name == "diagnose")
// Add forder if (!!diagnose) {
extraDiagnoseRoute.map(item => { // Add forder
if (!_.keyBy(diagnose.routes, 'path')[item.path]) { extraDiagnoseRoute.map(item => {
// Add forder if not exist if (!_.keyBy(diagnose.routes, 'path')[item.path]) {
diagnose.routes = diagnose.routes.concat({ // Add forder if not exist
...item, diagnose.routes = diagnose.routes.concat({
routes: [] ...item,
}) routes: []
} })
}) }
})
//Add The extraDiagnoseRoute in it. //Add The extraDiagnoseRoute in it.
diagnose.routes.map(item => { diagnose.routes.map(item => {
const new_routes = _.keyBy(extraDiagnoseRoute, 'path')[item.path]?.routes const new_routes = _.keyBy(extraDiagnoseRoute, 'path')[item.path]?.routes
if (item.routes && new_routes) { if (item.routes && new_routes) {
item.routes = item.routes.concat(new_routes); item.routes = item.routes.concat(new_routes);
} }
if (!item.routes && new_routes) { if (!item.routes && new_routes) {
item.routes = new_routes item.routes = new_routes
} }
}) })
}
} }
import grafanaDash from './pages/Monitor/grafana' import grafanaDash from './pages/Monitor/grafana'