From 7c9ba2876f02c530966a97a4257a2b1ef155358d Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Thu, 1 Feb 2024 19:07:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(web):=20=E5=A2=9E=E5=8A=A0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/httpRequests/http-requests-log.http | 40 +++--- .../src/main/resources/static/common/info.js | 121 +++++++++++++++++- .../resources/static/components/cloud-tab.js | 37 +++++- .../resources/static/components/common.js | 1 - test/test.http | 2 +- 5 files changed, 170 insertions(+), 31 deletions(-) diff --git a/.idea/httpRequests/http-requests-log.http b/.idea/httpRequests/http-requests-log.http index fcfe7e3..b5e16c9 100644 --- a/.idea/httpRequests/http-requests-log.http +++ b/.idea/httpRequests/http-requests-log.http @@ -1,3 +1,23 @@ +GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.130:35690/hudi_services/queue/queue/all?name=compaction-queue-b1 +Connection: Keep-Alive +User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) +Cookie: JSESSIONID=A671FB3CA5360CA75F871BE9CBA3671E +Accept-Encoding: br,deflate,gzip,x-gzip + +<> 2024-01-31T151734.200.json + +### + +GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.130:35690/hudi_services/queue/queue/all/compaction-queue-b1 +Connection: Keep-Alive +User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) +Cookie: JSESSIONID=22E06ED40F4625C6226C2118C5675363 +Accept-Encoding: br,deflate,gzip,x-gzip + +<> 2024-01-31T151720.404.json + +### + GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.130:35690/hudi_services/service_cloud_query/cloud/targets Connection: Keep-Alive User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) @@ -442,23 +462,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip ### -GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.130:35690/hudi_services/service_scheduler/schedule/schedule_times -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) -Cookie: JSESSIONID=72C86B35CEC2C7C8EAD234351B7EF959 -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2024-01-15T145017.200.json - -### - -GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.130:35690/hudi_services/service_scheduler/schedule/schedule_times -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) -Cookie: JSESSIONID=0C3AEB91AD103B11FD674356CB0FCC2B -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2024-01-15T144904.200.json - -### - diff --git a/service-web/src/main/resources/static/common/info.js b/service-web/src/main/resources/static/common/info.js index a964407..cc9ced5 100644 --- a/service-web/src/main/resources/static/common/info.js +++ b/service-web/src/main/resources/static/common/info.js @@ -1,24 +1,131 @@ function commonInfo() { return { - // baseUrl: 'http://132.126.207.131:35690/hudi_services/service_web', - baseUrl: '/hudi_services/service_web', + baseUrl: 'http://132.126.207.131:35690/hudi_services/service_web', + // baseUrl: '/hudi_services/service_web', loki: { + grafanaUrl: 'http://132.126.207.125:35700', hudi: { - url: 'http://132.126.207.125:35700', datasource: 'f648174e-7593-45cf-8fe8-8f8d5cf0fdde', }, + service: { + datasource: 'b6fee51c-facd-4261-a0eb-8c69a975fba3', + } }, } } +/** + * Queries + * {datasource, queryMap} + */ +function generateLokiPanel(queries) { + return { + LWF: { + queries: [ + ...queries.map(item => { + let name = item['name'] + let datasource = item['datasource'] + let queryMap = item['queryMap'] + let query = Object.keys(queryMap) + .sort() + .map(key => `${key}="${queryMap[key]}"`) + let match = "\\d{4}-(?P