This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git


    from e37cf03e [operator] fix typo
     add 81265ee0 Merge branch 'master' of 
https://github.com/Helltab/dubbo-kubernetes into feature/ui/framework/vue3
     add 13fb45d5 feat(#150): 开放原子开源基金会 x Apache Dubbo,下一代云原生微服务挑战赛启动报名! 
五大赛题50万奖金池等你来战! 赛题:面向云原生的下一代微服务集群监测机制,涵盖Kubernetes、Nacos等
     add dc4eb2ef Merge remote-tracking branch 'origin/master' into 
feature/竞赛/可观测
     add 4bcaf92f #523 #522 feat(): [UI] Retrieve certain metrics data from the 
Prometheus server. [UI] Proxy Prometheus and Grafana in order to avoid 
cross-origin issues and make them appear as being on the same site.
     add fa46c646 doc(docs):Delete the unnecessary documents.
     add 1db0308f doc(build):build ui to dist
     add b7ba05a5 Merge branch 'master' into feature/竞赛/可观测
     new 3c140430 Merge pull request #524 from Helltab/feature/竞赛/可观测

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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 +-
 .../components.go => admin/handler/grafana.go}     | 37 ++++++----
 pkg/admin/handler/observability.go                 |  6 +-
 .../components.go => admin/handler/prometheus.go}  | 40 +++++++----
 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 ++++-
 .../base/{i18n/messages.ts => http/promQuery.ts}   | 26 ++++---
 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 +-
 .../{cypress.config.ts => src/utils/ByteUtil.ts}   | 14 ++--
 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, 482 insertions(+), 226 deletions(-)
 create mode 100644 app/dubbo-ui/dist/admin/assets/ByteUtil-YdHlSEeW.js
 rename app/dubbo-ui/dist/admin/assets/{ConfigPage-cNMNKcRs.js => 
ConfigPage-mTUr_FdD.js} (97%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/DateUtil-AeksNPuC.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/DateUtil-l2rJRPVu.js
 rename 
app/dubbo-ui/dist/admin/assets/{MonacoEditor.vue_vue_type_script_setup_true_lang-dj5JjQFL.js
 => MonacoEditor.vue_vue_type_script_setup_true_lang-PqlcXC_G.js} (99%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/SearchUtil-Dfmnbrum.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/SearchUtil-G0LJJPOO.css
 create mode 100644 app/dubbo-ui/dist/admin/assets/SearchUtil-Od3Elmwo.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/SearchUtil-pmlYZKt1.js
 rename app/dubbo-ui/dist/admin/assets/{YAMLView-llJS8ZY2.js => 
YAMLView-33iDvC10.js} (90%)
 rename app/dubbo-ui/dist/admin/assets/{YAMLView-lx1gFO5S.js => 
YAMLView-GuR7Cy-4.js} (92%)
 rename app/dubbo-ui/dist/admin/assets/{YAMLView-TqxzxiOG.js => 
YAMLView-PRbRqL82.js} (92%)
 rename app/dubbo-ui/dist/admin/assets/{YAMLView-tm1499DR.js => 
YAMLView-WVxUqAmI.js} (92%)
 rename app/dubbo-ui/dist/admin/assets/{YAMLView-oTcWIzZI.js => 
YAMLView-pREI5jH0.js} (92%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/app-ZMUzdKgx.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/app-xsf0myXG.js
 rename app/dubbo-ui/dist/admin/assets/{config-EasG-2xT.js => 
config-NpXq8SDs.js} (97%)
 rename app/dubbo-ui/dist/admin/assets/{configuration-fY5EjZbH.js => 
configuration-cgv2Wl9f.js} (90%)
 rename app/dubbo-ui/dist/admin/assets/{debug-iXkw1xdg.js => debug-4iCRRb8m.js} 
(95%)
 rename app/dubbo-ui/dist/admin/assets/{detail-aPi-yY5T.js => 
detail-KcxAPTfU.js} (93%)
 rename app/dubbo-ui/dist/admin/assets/{detail-T64pDJ5c.js => 
detail-pXGz19bV.js} (96%)
 rename app/dubbo-ui/dist/admin/assets/{distribution-lByFQRQ5.js => 
distribution-jnJzf436.js} (94%)
 rename app/dubbo-ui/dist/admin/assets/{event-gCoVPKZ9.js => event-5xaFEIVy.js} 
(97%)
 rename app/dubbo-ui/dist/admin/assets/{event-Uv2LxsU9.js => event-8ptp5nyK.js} 
(60%)
 rename app/dubbo-ui/dist/admin/assets/{event-h1zZhBoC.js => event-YRoMF_XF.js} 
(60%)
 rename app/dubbo-ui/dist/admin/assets/{event-oG26wp0I.js => event-hwwhOUDQ.js} 
(88%)
 rename app/dubbo-ui/dist/admin/assets/{formView-N1-u7jLF.js => 
formView-4Z5FJXYS.js} (95%)
 rename app/dubbo-ui/dist/admin/assets/{formView-zjDrAbv-.js => 
formView-IIpvxEox.js} (98%)
 rename app/dubbo-ui/dist/admin/assets/{formView-QU_MVC17.js => 
formView-cygRN4fq.js} (96%)
 rename app/dubbo-ui/dist/admin/assets/{formView-dJzzkp1R.js => 
formView-gL2P6_-J.js} (97%)
 rename app/dubbo-ui/dist/admin/assets/{formView-2H9GqXZI.js => 
formView-i-BmffdN.js} (97%)
 rename app/dubbo-ui/dist/admin/assets/{index-b0PNzEEf.js => index-10cNDlxN.js} 
(91%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-2FKWy9oR.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-3s8q3Q-q.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-4j5CPUfE.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-50QkT1pZ.css
 rename app/dubbo-ui/dist/admin/assets/{index-ydEeV_dL.js => index-7CzEMIL1.js} 
(98%)
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-GqupyJqK.css
 rename app/dubbo-ui/dist/admin/assets/{index-owXPHSeC.js => index-ImKR4znO.js} 
(97%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-IrRM8RlH.css
 rename app/dubbo-ui/dist/admin/assets/{index-t7UMxqTS.js => index-MzjOMbzG.js} 
(92%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-PSDcDbmg.css
 rename app/dubbo-ui/dist/admin/assets/{index-mCCcKxkK.js => index-XCC-U0tz.js} 
(99%)
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-aV15-Vzq.js
 rename app/dubbo-ui/dist/admin/assets/{index-__DKffim.js => index-akuRsiot.js} 
(88%)
 delete mode 100644 app/dubbo-ui/dist/admin/assets/index-bu4o9JGq.css
 rename app/dubbo-ui/dist/admin/assets/{index-RgyIjXwN.js => index-cHtTyrrq.js} 
(61%)
 rename app/dubbo-ui/dist/admin/assets/{index-a22csAjT.js => index-fk8Bk6Kl.js} 
(86%)
 rename app/dubbo-ui/dist/admin/assets/{index-xGt2sGB2.css => 
index-gcjAFloK.css} (77%)
 rename app/dubbo-ui/dist/admin/assets/{index-a9u65KdI.js => index-hgjKifUg.js} 
(86%)
 rename app/dubbo-ui/dist/admin/assets/{index-a6nkMKxv.js => index-jeD-YG1B.js} 
(69%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-kwxipCGo.js
 rename app/dubbo-ui/dist/admin/assets/{index-rC1gRr35.js => index-lm1oQyIK.js} 
(84%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-qEOmH_jK.css
 create mode 100644 app/dubbo-ui/dist/admin/assets/index-sKgWX35Y.js
 create mode 100644 app/dubbo-ui/dist/admin/assets/instance-A-g43pDd.js
 create mode 100644 app/dubbo-ui/dist/admin/assets/instance-D6AyE4yo.js
 create mode 100644 app/dubbo-ui/dist/admin/assets/instance-Tc0NYyN6.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/instance-XJJ0i7bU.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/instance-_3v8mRCE.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/instance-cBAGdQku.js
 rename app/dubbo-ui/dist/admin/assets/{linkTracking-tfK3eIjn.js => 
linkTracking-rTgudhdg.js} (62%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/monitor-O7PtOyo9.js
 delete mode 100644 app/dubbo-ui/dist/admin/assets/monitor-XKRfGXUN.js
 rename app/dubbo-ui/dist/admin/assets/{monitor-2v9xY0Cg.js => 
monitor-oQazVC-N.js} (86%)
 rename app/dubbo-ui/dist/admin/assets/{monitor-kdvnrIcM.js => 
monitor-pQKp5SC7.js} (69%)
 rename app/dubbo-ui/dist/admin/assets/{notFound-0OrBcUmo.js => 
notFound-t5FKlJcJ.js} (98%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/promQuery-8dWPhEaC.js
 rename app/dubbo-ui/dist/admin/assets/{request-TC7KOJ9l.js => 
request-SYZV5A5R.js} (99%)
 rename app/dubbo-ui/dist/admin/assets/{sceneConfig-OT0QuZZE.js => 
sceneConfig-_SxvxSiF.js} (99%)
 create mode 100644 app/dubbo-ui/dist/admin/assets/search-2e5F4-ni.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/search-IlSGWEwl.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/search-PY7HEN-u.js
 create mode 100644 app/dubbo-ui/dist/admin/assets/search-jAqhoJ-5.js
 rename app/dubbo-ui/dist/admin/assets/{serverInfo-SBK1Jza-.js => 
serverInfo-a2x9eF5P.js} (61%)
 rename app/dubbo-ui/dist/admin/assets/{service-k5vpSpJZ.js => 
service-2gqozivS.js} (63%)
 delete mode 100644 app/dubbo-ui/dist/admin/assets/service-CW26MsYf.css
 create mode 100644 app/dubbo-ui/dist/admin/assets/service-HELUX1xN.css
 delete mode 100644 app/dubbo-ui/dist/admin/assets/service-XUcaaGWf.js
 create mode 100644 app/dubbo-ui/dist/admin/assets/service-uPqpf4RW.js
 rename app/dubbo-ui/dist/admin/assets/{tab1-BULeo5fw.js => tab1-HPNGA1ll.js} 
(66%)
 rename app/dubbo-ui/dist/admin/assets/{tab2-lTz0fIjo.js => tab2-YulKHHOp.js} 
(66%)
 rename app/dubbo-ui/dist/admin/assets/{tracing-42ZPLaPX.js => 
tracing-E7I6twqe.js} (69%)
 rename app/dubbo-ui/dist/admin/assets/{tracing-eswLKRRq.js => 
tracing-oZ13mySz.js} (72%)
 rename app/dubbo-ui/dist/admin/assets/{traffic--y_LPGqh.js => 
traffic-srxGgibb.js} (83%)
 copy pkg/{xds/components.go => admin/handler/grafana.go} (59%)
 copy pkg/{xds/components.go => admin/handler/prometheus.go} (56%)
 copy ui-vue3/src/base/{i18n/messages.ts => http/promQuery.ts} (66%)
 copy ui-vue3/{cypress.config.ts => src/utils/ByteUtil.ts} (78%)

Reply via email to