This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
commit 3c140430b4c811ba13fc34ef64bbe4c3e1bb07b3 Merge: e37cf03e b7ba05a5 Author: Ken Liu <[email protected]> AuthorDate: Sun Dec 8 14:35:33 2024 +0800 Merge pull request #524 from Helltab/feature/竞赛/可观测 fixes #523 and #522 README.md | 5 ++ app/dubbo-cp/dubbo-cp.yaml | 28 +++++--- .../dist/admin/assets/ByteUtil-YdHlSEeW.js | 1 + ...nfigPage-cNMNKcRs.js => ConfigPage-mTUr_FdD.js} | 2 +- .../dist/admin/assets/DateUtil-AeksNPuC.js | 1 + .../dist/admin/assets/DateUtil-l2rJRPVu.js | 1 - ...ue_vue_type_script_setup_true_lang-PqlcXC_G.js} | 2 +- .../dist/admin/assets/SearchUtil-Dfmnbrum.css | 1 + .../dist/admin/assets/SearchUtil-G0LJJPOO.css | 1 - .../dist/admin/assets/SearchUtil-Od3Elmwo.js | 1 + .../dist/admin/assets/SearchUtil-pmlYZKt1.js | 1 - .../{YAMLView-llJS8ZY2.js => YAMLView-33iDvC10.js} | 2 +- .../{YAMLView-lx1gFO5S.js => YAMLView-GuR7Cy-4.js} | 2 +- .../{YAMLView-TqxzxiOG.js => YAMLView-PRbRqL82.js} | 2 +- .../{YAMLView-tm1499DR.js => YAMLView-WVxUqAmI.js} | 2 +- .../{YAMLView-oTcWIzZI.js => YAMLView-pREI5jH0.js} | 2 +- app/dubbo-ui/dist/admin/assets/app-ZMUzdKgx.js | 1 + app/dubbo-ui/dist/admin/assets/app-xsf0myXG.js | 1 - .../{config-EasG-2xT.js => config-NpXq8SDs.js} | 2 +- ...ation-fY5EjZbH.js => configuration-cgv2Wl9f.js} | 2 +- .../{debug-iXkw1xdg.js => debug-4iCRRb8m.js} | 2 +- .../{detail-aPi-yY5T.js => detail-KcxAPTfU.js} | 2 +- .../{detail-T64pDJ5c.js => detail-pXGz19bV.js} | 2 +- ...bution-lByFQRQ5.js => distribution-jnJzf436.js} | 2 +- .../{event-gCoVPKZ9.js => event-5xaFEIVy.js} | 2 +- .../{event-Uv2LxsU9.js => event-8ptp5nyK.js} | 2 +- .../{event-h1zZhBoC.js => event-YRoMF_XF.js} | 2 +- .../{event-oG26wp0I.js => event-hwwhOUDQ.js} | 2 +- .../{formView-N1-u7jLF.js => formView-4Z5FJXYS.js} | 2 +- .../{formView-zjDrAbv-.js => formView-IIpvxEox.js} | 2 +- .../{formView-QU_MVC17.js => formView-cygRN4fq.js} | 2 +- .../{formView-dJzzkp1R.js => formView-gL2P6_-J.js} | 2 +- .../{formView-2H9GqXZI.js => formView-i-BmffdN.js} | 2 +- .../{index-b0PNzEEf.js => index-10cNDlxN.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-2FKWy9oR.css | 1 + app/dubbo-ui/dist/admin/assets/index-3s8q3Q-q.js | 1 - app/dubbo-ui/dist/admin/assets/index-4j5CPUfE.css | 1 - app/dubbo-ui/dist/admin/assets/index-50QkT1pZ.css | 1 - .../{index-ydEeV_dL.js => index-7CzEMIL1.js} | 8 +-- app/dubbo-ui/dist/admin/assets/index-GqupyJqK.css | 1 - .../{index-owXPHSeC.js => index-ImKR4znO.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-IrRM8RlH.css | 1 + .../{index-t7UMxqTS.js => index-MzjOMbzG.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-PSDcDbmg.css | 1 + .../{index-mCCcKxkK.js => index-XCC-U0tz.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-aV15-Vzq.js | 1 - .../{index-__DKffim.js => index-akuRsiot.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-bu4o9JGq.css | 1 - .../{index-RgyIjXwN.js => index-cHtTyrrq.js} | 26 +++---- .../{index-a22csAjT.js => index-fk8Bk6Kl.js} | 2 +- .../{index-xGt2sGB2.css => index-gcjAFloK.css} | 2 +- .../{index-a9u65KdI.js => index-hgjKifUg.js} | 2 +- .../{index-a6nkMKxv.js => index-jeD-YG1B.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-kwxipCGo.js | 1 + .../{index-rC1gRr35.js => index-lm1oQyIK.js} | 2 +- app/dubbo-ui/dist/admin/assets/index-qEOmH_jK.css | 1 + app/dubbo-ui/dist/admin/assets/index-sKgWX35Y.js | 4 ++ .../dist/admin/assets/instance-A-g43pDd.js | 4 ++ .../dist/admin/assets/instance-D6AyE4yo.js | 1 + .../dist/admin/assets/instance-Tc0NYyN6.css | 1 + .../dist/admin/assets/instance-XJJ0i7bU.css | 1 - .../dist/admin/assets/instance-_3v8mRCE.js | 1 - .../dist/admin/assets/instance-cBAGdQku.js | 1 - ...acking-tfK3eIjn.js => linkTracking-rTgudhdg.js} | 2 +- app/dubbo-ui/dist/admin/assets/monitor-O7PtOyo9.js | 1 + app/dubbo-ui/dist/admin/assets/monitor-XKRfGXUN.js | 1 - .../{monitor-2v9xY0Cg.js => monitor-oQazVC-N.js} | 2 +- .../{monitor-kdvnrIcM.js => monitor-pQKp5SC7.js} | 2 +- .../{notFound-0OrBcUmo.js => notFound-t5FKlJcJ.js} | 2 +- .../dist/admin/assets/promQuery-8dWPhEaC.js | 1 + .../{request-TC7KOJ9l.js => request-SYZV5A5R.js} | 2 +- ...eConfig-OT0QuZZE.js => sceneConfig-_SxvxSiF.js} | 2 +- app/dubbo-ui/dist/admin/assets/search-2e5F4-ni.css | 1 + app/dubbo-ui/dist/admin/assets/search-IlSGWEwl.css | 1 - app/dubbo-ui/dist/admin/assets/search-PY7HEN-u.js | 1 - app/dubbo-ui/dist/admin/assets/search-jAqhoJ-5.js | 1 + ...rverInfo-SBK1Jza-.js => serverInfo-a2x9eF5P.js} | 2 +- .../{service-k5vpSpJZ.js => service-2gqozivS.js} | 2 +- .../dist/admin/assets/service-CW26MsYf.css | 1 - .../dist/admin/assets/service-HELUX1xN.css | 1 + app/dubbo-ui/dist/admin/assets/service-XUcaaGWf.js | 1 - app/dubbo-ui/dist/admin/assets/service-uPqpf4RW.js | 1 + .../assets/{tab1-BULeo5fw.js => tab1-HPNGA1ll.js} | 2 +- .../assets/{tab2-lTz0fIjo.js => tab2-YulKHHOp.js} | 2 +- .../{tracing-42ZPLaPX.js => tracing-E7I6twqe.js} | 2 +- .../{tracing-eswLKRRq.js => tracing-oZ13mySz.js} | 2 +- .../{traffic--y_LPGqh.js => traffic-srxGgibb.js} | 2 +- app/dubbo-ui/dist/admin/index.html | 4 +- .../metricInfo.ts => pkg/admin/handler/grafana.go | 39 ++++++++--- pkg/admin/handler/observability.go | 6 +- .../config.go => admin/handler/prometheus.go} | 53 +++++++------- pkg/admin/server/router.go | 10 +++ pkg/admin/server/server.go | 8 +++ pkg/config/admin/config.go | 1 + ui-vue3/src/App.vue | 2 +- ui-vue3/src/api/service/app.ts | 2 +- ui-vue3/src/api/service/metricInfo.ts | 18 ++++- .../metricInfo.ts => base/http/promQuery.ts} | 22 +++--- ui-vue3/src/base/http/request.ts | 5 +- ui-vue3/src/base/i18n/zh.ts | 6 +- ui-vue3/src/components/SearchTable.vue | 1 + ui-vue3/src/layout/index.vue | 2 +- .../service/metricInfo.ts => utils/ByteUtil.ts} | 18 +++-- ui-vue3/src/utils/SearchUtil.ts | 10 ++- ui-vue3/src/views/home/index.vue | 8 +-- ui-vue3/src/views/resources/applications/index.vue | 4 ++ .../views/resources/applications/tabs/instance.vue | 80 ++++++++++++++-------- .../views/resources/applications/tabs/monitor.vue | 62 +++++++++++++++-- .../views/resources/applications/tabs/service.vue | 76 +++++++++++++++----- ui-vue3/src/views/resources/instances/index.vue | 41 +++++++++-- ui-vue3/src/views/resources/services/search.vue | 36 +++++++++- ui-vue3/vite.config.ts | 8 ++- 112 files changed, 491 insertions(+), 232 deletions(-)
