diff --git a/package-lock.json b/package-lock.json index 9993f986..a53afd05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "element-plus": "^2.0.2", "lodash": "^4.17.21", "pinia": "^2.0.5", - "vis-timeline": "^7.5.1", "vue": "^3.0.0", "vue-grid-layout": "^3.0.0-beta1", "vue-i18n": "^9.1.9", @@ -1812,18 +1811,6 @@ "ms": "^2.1.1" } }, - "node_modules/@egjs/hammerjs": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", - "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==", - "peer": true, - "dependencies": { - "@types/hammerjs": "^2.0.36" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/@element-plus/icons-vue": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.7.tgz", @@ -3313,12 +3300,6 @@ "@types/node": "*" } }, - "node_modules/@types/hammerjs": { - "version": "2.0.41", - "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz", - "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==", - "peer": true - }, "node_modules/@types/http-proxy": { "version": "1.17.8", "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz", @@ -7901,7 +7882,8 @@ "node_modules/component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "node_modules/compressible": { "version": "2.0.18", @@ -8713,12 +8695,6 @@ "node": ">=4" } }, - "node_modules/cssfilter": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", - "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=", - "peer": true - }, "node_modules/cssnano": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", @@ -16462,12 +16438,6 @@ "node": ">=0.6.0" } }, - "node_modules/keycharm": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz", - "integrity": "sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ==", - "peer": true - }, "node_modules/killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -18259,6 +18229,7 @@ "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", + "dev": true, "engines": { "node": "*" } @@ -21727,15 +21698,6 @@ "node": ">= 6" } }, - "node_modules/propagating-hammerjs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-2.0.1.tgz", - "integrity": "sha512-PH3zG5whbSxMocphXJzVtvKr+vWAgfkqVvtuwjSJ/apmEACUoiw6auBAT5HYXpZOR0eGcTAfYG5Yl8h91O5Elg==", - "peer": true, - "peerDependencies": { - "@egjs/hammerjs": "^2.0.17" - } - }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -26875,6 +26837,7 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, "bin": { "uuid": "dist/bin/uuid" } @@ -26934,59 +26897,6 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, - "node_modules/vis-data": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.4.tgz", - "integrity": "sha512-usy+ePX1XnArNvJ5BavQod7YRuGQE1pjFl+pu7IS6rCom2EBoG0o1ZzCqf3l5US6MW51kYkLR+efxRbnjxNl7w==", - "hasInstallScript": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/visjs" - }, - "peerDependencies": { - "uuid": "^7.0.0 || ^8.0.0", - "vis-util": "^4.0.0 || ^5.0.0" - } - }, - "node_modules/vis-timeline": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/vis-timeline/-/vis-timeline-7.5.1.tgz", - "integrity": "sha512-XZMHHbA8xm9/Y/iu3mE9MT7J5tfWgbdsW+PmqrgINU2QRX24AiqifNHZHV4YYzeJstiTSOg9Gs5qRkxQ0BvZJw==", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/visjs" - }, - "peerDependencies": { - "@egjs/hammerjs": "^2.0.0", - "component-emitter": "^1.3.0", - "keycharm": "^0.3.0 || ^0.4.0", - "moment": "^2.24.0", - "propagating-hammerjs": "^1.4.0 || ^2.0.0", - "uuid": "^3.4.0 || ^7.0.0 || ^8.0.0", - "vis-data": "^6.3.0 || ^7.0.0", - "vis-util": "^3.0.0 || ^4.0.0 || ^5.0.0", - "xss": "^1.0.0" - } - }, - "node_modules/vis-util": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.3.tgz", - "integrity": "sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==", - "peer": true, - "engines": { - "node": ">=8" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/visjs" - }, - "peerDependencies": { - "@egjs/hammerjs": "^2.0.0", - "component-emitter": "^1.3.0" - } - }, "node_modules/vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -28835,28 +28745,6 @@ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, - "node_modules/xss": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz", - "integrity": "sha512-EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==", - "peer": true, - "dependencies": { - "commander": "^2.20.3", - "cssfilter": "0.0.10" - }, - "bin": { - "xss": "bin/xss" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/xss/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "peer": true - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -30311,15 +30199,6 @@ } } }, - "@egjs/hammerjs": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", - "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==", - "peer": true, - "requires": { - "@types/hammerjs": "^2.0.36" - } - }, "@element-plus/icons-vue": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.7.tgz", @@ -31583,12 +31462,6 @@ "@types/node": "*" } }, - "@types/hammerjs": { - "version": "2.0.41", - "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz", - "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==", - "peer": true - }, "@types/http-proxy": { "version": "1.17.8", "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz", @@ -35280,7 +35153,8 @@ "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "compressible": { "version": "2.0.18", @@ -35921,12 +35795,6 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, - "cssfilter": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", - "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=", - "peer": true - }, "cssnano": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", @@ -42014,12 +41882,6 @@ "verror": "1.10.0" } }, - "keycharm": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz", - "integrity": "sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ==", - "peer": true - }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -43406,7 +43268,8 @@ "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", + "dev": true }, "move-concurrently": { "version": "1.0.1", @@ -46071,13 +45934,6 @@ "sisteransi": "^1.0.5" } }, - "propagating-hammerjs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-2.0.1.tgz", - "integrity": "sha512-PH3zG5whbSxMocphXJzVtvKr+vWAgfkqVvtuwjSJ/apmEACUoiw6auBAT5HYXpZOR0eGcTAfYG5Yl8h91O5Elg==", - "peer": true, - "requires": {} - }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -50179,7 +50035,8 @@ "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true }, "v8-compile-cache": { "version": "2.3.0", @@ -50228,26 +50085,6 @@ } } }, - "vis-data": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.1.4.tgz", - "integrity": "sha512-usy+ePX1XnArNvJ5BavQod7YRuGQE1pjFl+pu7IS6rCom2EBoG0o1ZzCqf3l5US6MW51kYkLR+efxRbnjxNl7w==", - "peer": true, - "requires": {} - }, - "vis-timeline": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/vis-timeline/-/vis-timeline-7.5.1.tgz", - "integrity": "sha512-XZMHHbA8xm9/Y/iu3mE9MT7J5tfWgbdsW+PmqrgINU2QRX24AiqifNHZHV4YYzeJstiTSOg9Gs5qRkxQ0BvZJw==", - "requires": {} - }, - "vis-util": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/vis-util/-/vis-util-5.0.3.tgz", - "integrity": "sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==", - "peer": true, - "requires": {} - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -51759,24 +51596,6 @@ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, - "xss": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz", - "integrity": "sha512-EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==", - "peer": true, - "requires": { - "commander": "^2.20.3", - "cssfilter": "0.0.10" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "peer": true - } - } - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 66a6188d..ece16b3a 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "element-plus": "^2.0.2", "lodash": "^4.17.21", "pinia": "^2.0.5", - "vis-timeline": "^7.5.1", "vue": "^3.0.0", "vue-grid-layout": "^3.0.0-beta1", "vue-i18n": "^9.1.9", diff --git a/src/graphql/fragments/log.ts b/src/graphql/fragments/log.ts index 78738d8e..18e814ec 100644 --- a/src/graphql/fragments/log.ts +++ b/src/graphql/fragments/log.ts @@ -54,7 +54,6 @@ export const QueryServiceLogs = { value } } - total }`, }; diff --git a/src/graphql/fragments/trace.ts b/src/graphql/fragments/trace.ts index 04f718e0..e1e0af9b 100644 --- a/src/graphql/fragments/trace.ts +++ b/src/graphql/fragments/trace.ts @@ -27,7 +27,6 @@ export const Traces = { isError traceIds } - total }`, }; diff --git a/src/store/modules/log.ts b/src/store/modules/log.ts index a92981cc..ce1674d1 100644 --- a/src/store/modules/log.ts +++ b/src/store/modules/log.ts @@ -31,7 +31,6 @@ interface LogState { selectorStore: any; supportQueryLogsByKeywords: boolean; logs: any[]; - logsTotal: number; loadLogs: boolean; } @@ -43,12 +42,11 @@ export const logStore = defineStore({ endpoints: [{ value: "0", label: "All" }], conditions: { queryDuration: useAppStoreWithOut().durationTime, - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 15 }, }, supportQueryLogsByKeywords: true, selectorStore: useSelectorStore(), logs: [], - logsTotal: 0, loadLogs: false, }), actions: { @@ -131,7 +129,6 @@ export const logStore = defineStore({ } this.logs = res.data.data.queryLogs.logs; - this.logsTotal = res.data.data.queryLogs.total; return res.data; }, async getBrowserLogs() { @@ -145,7 +142,6 @@ export const logStore = defineStore({ return res.data; } this.logs = res.data.data.queryBrowserErrorLogs.logs; - this.logsTotal = res.data.data.queryBrowserErrorLogs.total; return res.data; }, async getLogTagKeys() { diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 25eacc6d..4e337351 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -28,12 +28,10 @@ interface TraceState { instances: Instance[]; endpoints: Endpoint[]; traceList: Trace[]; - traceTotal: number; traceSpans: Span[]; currentTrace: Trace | any; conditions: any; traceSpanLogs: any[]; - traceSpanLogsTotal: number; selectorStore: any; } @@ -45,16 +43,14 @@ export const traceStore = defineStore({ endpoints: [{ value: "0", label: "All" }], traceList: [], traceSpans: [], - traceTotal: 0, currentTrace: {}, conditions: { queryDuration: useAppStoreWithOut().durationTime, traceState: "ALL", queryOrder: "BY_START_TIME", - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 20 }, }, traceSpanLogs: [], - traceSpanLogsTotal: 0, selectorStore: useSelectorStore(), }), actions: { @@ -115,7 +111,6 @@ export const traceStore = defineStore({ return res.data; } if (!res.data.data.data.traces.length) { - this.traceTotal = 0; this.traceList = []; this.setCurrentTrace({}); this.setTraceSpans([]); @@ -128,7 +123,6 @@ export const traceStore = defineStore({ }); return d; }); - this.traceTotal = res.data.data.data.total; this.setCurrentTrace(res.data.data.data.traces[0] || {}); return res.data; }, @@ -148,11 +142,9 @@ export const traceStore = defineStore({ .params(params); if (res.data.errors) { this.traceSpanLogs = []; - this.traceSpanLogsTotal = 0; return res.data; } this.traceSpanLogs = res.data.data.queryLogs.logs || []; - this.traceSpanLogsTotal = res.data.data.queryLogs.total; return res.data; }, async getTagKeys() { diff --git a/src/types/ebpf.d.ts b/src/types/ebpf.d.ts index b40597ef..4598528e 100644 --- a/src/types/ebpf.d.ts +++ b/src/types/ebpf.d.ts @@ -52,7 +52,7 @@ export type Process = { instanceName: string; agentId: string; detectType: string; - attributes: { name: string; value: string }; + attributes: { name: string; value: string }[]; labels: string[]; }; export type StackElement = { diff --git a/src/views/dashboard/related/components/LogTable/Index.vue b/src/views/dashboard/related/components/LogTable/Index.vue index b507b0be..4d4f75e7 100644 --- a/src/views/dashboard/related/components/LogTable/Index.vue +++ b/src/views/dashboard/related/components/LogTable/Index.vue @@ -94,6 +94,8 @@ function setCurrentLog(log: any) { font-size: 12px; height: 100%; border-bottom: 1px solid #eee; + width: 100%; + overflow: auto; } .log-header { diff --git a/src/views/dashboard/related/ebpf/Content.vue b/src/views/dashboard/related/ebpf/Content.vue index e4b0653b..91abfd26 100644 --- a/src/views/dashboard/related/ebpf/Content.vue +++ b/src/views/dashboard/related/ebpf/Content.vue @@ -16,7 +16,7 @@ limitations under the License. -->
-
+
@@ -39,12 +39,18 @@ import EBPFStack from "./components/EBPFStack.vue"; .vis-graph { height: 100%; width: calc(100% - 300px); + min-width: 700px; + overflow: auto; } .item { width: 100%; overflow: auto; - height: calc(50% - 10px); + height: calc(100% - 70px); padding-bottom: 10px; } + +.schedules { + height: 60px; +} diff --git a/src/views/dashboard/related/ebpf/components/EBPFSchedules.vue b/src/views/dashboard/related/ebpf/components/EBPFSchedules.vue index a584e40f..3caaff0b 100644 --- a/src/views/dashboard/related/ebpf/components/EBPFSchedules.vue +++ b/src/views/dashboard/related/ebpf/components/EBPFSchedules.vue @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->