From 75739ad13f2c43629380f2323fad4ecb88c0363b Mon Sep 17 00:00:00 2001 From: JayCC1 <85379453+JayCC1@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:44:06 +0800 Subject: [PATCH 01/41] =?UTF-8?q?fix:=20=E3=80=90trace=E3=80=91=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E6=A3=80=E7=B4=A2=E5=8C=BA=E5=9F=9F=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9select=E6=A1=86=E9=94=99=E4=BD=8D=20--bug=3D1?= =?UTF-8?q?37256599=20(#4837)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/webpack/src/trace/pages/main/inquire.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bkmonitor/webpack/src/trace/pages/main/inquire.tsx b/bkmonitor/webpack/src/trace/pages/main/inquire.tsx index 801e664d40..5c2879f5af 100644 --- a/bkmonitor/webpack/src/trace/pages/main/inquire.tsx +++ b/bkmonitor/webpack/src/trace/pages/main/inquire.tsx @@ -1581,7 +1581,7 @@ export default defineComponent({ {/* 这里插入 condition 组件 */} {conditionList.map((item, index) => ( Date: Fri, 17 Jan 2025 10:58:55 +0800 Subject: [PATCH 02/41] =?UTF-8?q?feat:=20Trace=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=20(#4855?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Reviewed, transaction id: 29497 --- bklog/web/.gitignore | 2 + bklog/web/babel.config.js | 7 +- bklog/web/package-lock.json | 192 ++++---- bklog/web/package.json | 15 +- bklog/web/scripts/apm-package.json | 11 + bklog/web/scripts/create-monitor.js | 150 ++++-- bklog/web/scripts/prefix-css.js | 50 ++ bklog/web/scripts/trace-package.json | 11 + bklog/web/src/api/_httpRequest.js | 2 +- bklog/web/src/api/index.js | 2 +- .../monitor-echarts/trend-chart.vue | 2 +- bklog/web/src/components/nav/head-nav.vue | 13 +- bklog/web/src/hooks/use-segment-pop.ts | 17 +- bklog/web/src/hooks/use-trend-chart.ts | 2 +- bklog/web/src/index.d.ts | 4 +- bklog/web/src/router/index.js | 37 +- bklog/web/src/scss/mixins/scroller.scss | 6 +- bklog/web/src/store/index.js | 2 +- bklog/web/src/views/extract/create/index.vue | 6 +- .../condition-comp/select-index-set.tsx | 238 +++++----- .../field-filter-comp/agg-chart.tsx | 9 +- .../components/field-select-config.vue | 2 +- .../field-filter-popover.tsx | 2 +- .../field-filter-comp/field-item.tsx | 64 +-- .../retrieve-v2/field-filter-comp/index.tsx | 10 +- .../retrieve-v2/mixins/result-table-mixin.js | 6 +- .../src/views/retrieve-v2/monitor/index.ts | 6 +- .../src/views/retrieve-v2/monitor/monitor.vue | 439 +++++++++--------- .../src/views/retrieve-v2/monitor/trace.ts | 55 +++ .../src/views/retrieve-v2/monitor/utils.ts | 4 +- .../retrieve-v2/result-comp/context-log.vue | 8 +- .../result-comp/export-history.vue | 14 +- .../retrieve-v2/result-comp/export-log.vue | 2 +- .../result-comp/fields-setting.vue | 12 +- .../views/retrieve-v2/result-comp/kv-list.vue | 2 +- .../retrieve-v2/result-comp/real-time-log.vue | 2 +- .../views/retrieve-v2/search-bar/index.vue | 4 +- .../retrieve-v2/search-bar/ip-selector.vue | 10 +- .../retrieve-v2/search-result-panel/index.vue | 9 +- .../components/finger-operate.vue | 6 +- .../quick-open-cluster-step/filter-rule.tsx | 4 +- .../quick-open-cluster.tsx | 2 +- .../components/strategy/index.tsx | 8 +- .../log-clustering/data-fingerprint.vue | 8 +- .../log-clustering/index.vue | 4 +- .../original-log/empty-view.vue | 4 +- .../original-log/index.vue | 19 +- .../original-log/original-list.vue | 5 +- .../original-log/table-list.vue | 7 +- .../original-log/table-log.vue | 10 +- .../search-result-panel/panel-util.js | 2 +- .../retrieve-v2/setting-modal/log-cluster.vue | 2 +- bklog/web/src/views/retrieve/index.vue | 20 +- bklog/web/webpack.config.js | 18 +- 54 files changed, 934 insertions(+), 614 deletions(-) create mode 100644 bklog/web/scripts/apm-package.json create mode 100644 bklog/web/scripts/prefix-css.js create mode 100644 bklog/web/scripts/trace-package.json create mode 100644 bklog/web/src/views/retrieve-v2/monitor/trace.ts diff --git a/bklog/web/.gitignore b/bklog/web/.gitignore index 6ba33a79f9..35174d43cf 100644 --- a/bklog/web/.gitignore +++ b/bklog/web/.gitignore @@ -86,3 +86,5 @@ yarn.lock .babelcache src/views/playground/* /monitor-retrieve/* +/monitor-apm-retrieve/* +/monitor-trace-retrieve/* diff --git a/bklog/web/babel.config.js b/bklog/web/babel.config.js index e7937899c1..98f7633839 100644 --- a/bklog/web/babel.config.js +++ b/bklog/web/babel.config.js @@ -23,8 +23,7 @@ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - -const isMonitorProduction = process.env.NODE_ENV === 'production' && process.env.APP === 'apm'; +const isMonitorCompiler = ['apm', 'trace'].includes(process.env.MONITOR_APP); module.exports = function (api) { api?.cache.never(); const presets = [ @@ -33,7 +32,7 @@ module.exports = function (api) { { targets: { browsers: - process.env.APP === 'apm' + isMonitorCompiler ? ['> 0.3%', 'Chrome > 90', 'last 2 versions', 'Firefox ESR', 'not dead'] : ['> 1%', 'last 2 versions', 'not ie <= 8'], node: 'current', @@ -47,7 +46,7 @@ module.exports = function (api) { ]; const plugins = [ '@babel/plugin-transform-runtime', - isMonitorProduction + process.env.NODE_ENV === 'production' && isMonitorCompiler ? undefined : [ 'babel-plugin-import-bk-magic-vue', diff --git a/bklog/web/package-lock.json b/bklog/web/package-lock.json index edf3f72149..ff9a833e5c 100644 --- a/bklog/web/package-lock.json +++ b/bklog/web/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@babel/helper-module-imports": "7.24.7", "@babel/runtime": "7.26.0", - "@blueking/bkmonitor-cli": "5.0.0-beta.17", + "@blueking/bkmonitor-cli": "6.0.0-beta.5", "@blueking/bkui-library": "0.0.0-beta.5", "@blueking/date-picker": "2.0.0-beta.33", "@blueking/fork-resize-detector": "0.0.2", @@ -55,7 +55,6 @@ "monaco-editor": "0.33.0", "monaco-editor-webpack-plugin": "7.0.1", "monaco-yaml": "4.0.0-alpha.3", - "pixi.js": "^8.6.6", "postcss-loader": "8.1.1", "qs": "6.11.2", "resize-detector": "0.3.0", @@ -89,6 +88,7 @@ "@types/echarts": "4.9.22", "@typescript-eslint/eslint-plugin": "7.8.0", "@typescript-eslint/parser": "7.8.0", + "cross-env": "^7.0.3", "eslint": "9.2.0", "eslint-config-prettier": "9.1.0", "eslint-config-tencent": "1.0.4", @@ -1607,70 +1607,70 @@ } }, "node_modules/@blueking/bkmonitor-cli": { - "version": "5.0.0-beta.17", - "resolved": "https://registry.npmjs.org/@blueking/bkmonitor-cli/-/bkmonitor-cli-5.0.0-beta.17.tgz", - "integrity": "sha512-bj02J3G4M2GidQgsepvahN1UGSiIypuQ2RDLjCXc+gPT5JxWqMeO84UAJeVd/Kbg9LraG31QzSAGC26X2chT6g==", - "dependencies": { - "@babel/core": "^7.25.2", - "@babel/node": "^7.25.0", - "@babel/plugin-transform-runtime": "^7.24.7", - "@babel/preset-env": "^7.25.3", - "@babel/runtime": "^7.25.0", + "version": "6.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@blueking/bkmonitor-cli/-/bkmonitor-cli-6.0.0-beta.5.tgz", + "integrity": "sha512-to9rgOPq1HIqtbL7hZPZqQCJEelP8mgZFnNK1zLBXzhSp0edHGNV2ioAwOjUWE14sFGh7nfwbeJbUS/Mz9PLLA==", + "dependencies": { + "@babel/core": "^7.26.0", + "@babel/node": "^7.26.0", + "@babel/plugin-transform-runtime": "^7.25.9", + "@babel/preset-env": "^7.26.0", + "@babel/runtime": "^7.26.0", "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0", - "@vue/babel-plugin-jsx": "^1.2.2", + "@vue/babel-plugin-jsx": "^1.2.5", "@vue/babel-plugin-transform-vue-jsx": "^1.4.0", "@vue/babel-preset-jsx": "^1.4.0", "autoprefixer": "^10.4.20", - "babel-loader": "^9.1.3", + "babel-loader": "^9.2.1", "babel-plugin-component": "^1.1.1", "babel-plugin-import": "^1.13.8", "babel-plugin-syntax-jsx": "6.18.0", "babel-plugin-transform-vue-jsx": "^3.7.0", - "browserslist": "^4.23.3", - "caniuse-lite": "^1.0.30001651", + "browserslist": "^4.24.2", + "caniuse-lite": "^1.0.30001678", "chalk": "^4.1.2", "clean-webpack-plugin": "^4.0.0", "commander": "^12.1.0", "copy-webpack-plugin": "^12.0.2", - "core-js": "^3.38.0", + "core-js": "^3.39.0", "css-loader": "^7.1.2", "css-minimizer-webpack-plugin": "^7.0.0", "file-loader": "^6.2.0", - "html-webpack-plugin": "^5.6.0", + "html-webpack-plugin": "^5.6.3", "ifdef-loader": "^2.3.2", "less": "^4.2.0", "less-loader": "^12.2.0", - "mini-css-extract-plugin": "^2.9.0", + "mini-css-extract-plugin": "^2.9.2", "monaco-editor-webpack-plugin": "^7.1.0", - "ora": "^8.0.1", + "ora": "^8.1.1", "path-browserify": "^1.0.1", - "postcss": "^8.4.41", + "postcss": "^8.4.47", "postcss-loader": "^8.1.1", - "postcss-preset-env": "^10.0.1", + "postcss-preset-env": "^10.0.9", "sass": "^1.77.8", "sass-loader": "^14.2.1", "style-loader": "^4.0.0", "svg-sprite-loader": "^6.0.11", "svg-transform-loader": "^2.0.13", "svgo-loader": "^4.0.0", - "tailwindcss": "^3.4.10", + "tailwindcss": "^3.4.14", "terser-webpack-plugin": "^5.3.10", - "thread-loader": "^4.0.2", + "thread-loader": "^4.0.4", "ts-import-plugin": "^3.0.0", "ts-loader": "^9.5.1", "ts-node": "^10.9.2", - "tslib": "^2.6.3", - "typescript": "^5.5.4", + "tslib": "^2.8.1", + "typescript": "^5.6.3", "url-loader": "^4.1.1", "vue-loader": "^15.11.1", "vue-style-loader": "^4.1.3", - "webpack": "^5.93.0", + "webpack": "^5.96.1", "webpack-bundle-analyzer": "^4.10.2", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.4", + "webpack-dev-server": "^5.1.0", "webpack-log": "^3.0.2", "webpack-merge": "^6.0.1", - "webpackbar": "^6.0.1" + "webpackbar": "^7.0.0" }, "bin": { "bkmonitor-cli": "dist/index.js" @@ -1679,6 +1679,16 @@ "node": ">= 18" } }, + "node_modules/@blueking/bkmonitor-cli/node_modules/core-js": { + "version": "3.39.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz", + "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/@blueking/bkmonitor-cli/node_modules/monaco-editor-webpack-plugin": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-7.1.0.tgz", @@ -1703,6 +1713,32 @@ "node": ">=14.17" } }, + "node_modules/@blueking/bkmonitor-cli/node_modules/webpackbar": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-7.0.0.tgz", + "integrity": "sha512-aS9soqSO2iCHgqHoCrj4LbfGQUboDCYJPSFOAchEK+9psIjNrfSWW4Y0YEz67MKURNvMmfo0ycOg9d/+OOf9/Q==", + "dependencies": { + "ansis": "^3.2.0", + "consola": "^3.2.3", + "pretty-time": "^1.1.0", + "std-env": "^3.7.0" + }, + "engines": { + "node": ">=14.21.3" + }, + "peerDependencies": { + "@rspack/core": "*", + "webpack": "3 || 4 || 5" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } + } + }, "node_modules/@blueking/bkui-library": { "version": "0.0.0-beta.5", "resolved": "https://registry.npmjs.org/@blueking/bkui-library/-/bkui-library-0.0.0-beta.5.tgz", @@ -4430,11 +4466,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@pixi/colord": { - "version": "2.9.6", - "resolved": "https://mirrors.tencent.com/npm/@pixi/colord/-/colord-2.9.6.tgz", - "integrity": "sha512-nezytU2pw587fQstUu1AsJZDVEynjskwOL+kibwcdxsMBFqPsFFNA7xl0ii/gXuDi6M0xj3mfRJj8pBSc2jCfA==" - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -4572,16 +4603,6 @@ "@types/node": "*" } }, - "node_modules/@types/css-font-loading-module": { - "version": "0.0.12", - "resolved": "https://mirrors.tencent.com/npm/@types/css-font-loading-module/-/css-font-loading-module-0.0.12.tgz", - "integrity": "sha512-x2tZZYkSxXqWvTDgveSynfjq/T2HyiZHXb00j/+gy19yp70PHCizM48XFdjBCWH7eHBD0R5i/pw9yMBP/BH5uA==" - }, - "node_modules/@types/earcut": { - "version": "2.1.4", - "resolved": "https://mirrors.tencent.com/npm/@types/earcut/-/earcut-2.1.4.tgz", - "integrity": "sha512-qp3m9PPz4gULB9MhjGID7wpo3gJ4bTGXm7ltNDsmOvsPduTeHp8wSW9YckBj3mljeOh4F0m2z/0JKAALRKbmLQ==" - }, "node_modules/@types/echarts": { "version": "4.9.22", "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.22.tgz", @@ -5446,11 +5467,6 @@ "@xtuc/long": "4.2.2" } }, - "node_modules/@webgpu/types": { - "version": "0.1.52", - "resolved": "https://mirrors.tencent.com/npm/@webgpu/types/-/types-0.1.52.tgz", - "integrity": "sha512-eI883Nlag2hGIkhXxAnq8s4APpqXWuPL3Gbn2ghiU12UjLvfCbVqHK4XfXl3eLRTatqcMmeK7jws7IwWsGfbzw==" - }, "node_modules/@webpack-cli/configtest": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", @@ -5492,14 +5508,6 @@ } } }, - "node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://mirrors.tencent.com/npm/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -5716,6 +5724,14 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/ansis": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/ansis/-/ansis-3.4.0.tgz", + "integrity": "sha512-zVESKSQhWaPhGaWiKj1k+UqvpC7vPBBgG3hjQEeIx2YGzylWt8qA3ziAzRuUtm0OnaGsZKjIvfl8D/sJTt/I0w==", + "engines": { + "node": ">=16" + } + }, "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -7307,6 +7323,24 @@ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -8277,11 +8311,6 @@ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" }, - "node_modules/earcut": { - "version": "2.2.4", - "resolved": "https://mirrors.tencent.com/npm/earcut/-/earcut-2.2.4.tgz", - "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==" - }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -9195,7 +9224,8 @@ "node_modules/eventemitter3": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true }, "node_modules/events": { "version": "3.3.0", @@ -9478,6 +9508,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -9492,6 +9523,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, "engines": { "node": ">=0.8.0" } @@ -11564,11 +11596,6 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, - "node_modules/ismobilejs": { - "version": "1.1.1", - "resolved": "https://mirrors.tencent.com/npm/ismobilejs/-/ismobilejs-1.1.1.tgz", - "integrity": "sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw==" - }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", @@ -12368,6 +12395,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "dev": true, "dependencies": { "repeat-string": "^1.0.0" }, @@ -13661,11 +13689,6 @@ "node": ">=0.10.0" } }, - "node_modules/parse-svg-path": { - "version": "0.1.2", - "resolved": "https://mirrors.tencent.com/npm/parse-svg-path/-/parse-svg-path-0.1.2.tgz", - "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==" - }, "node_modules/parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -13833,22 +13856,6 @@ "node": ">= 6" } }, - "node_modules/pixi.js": { - "version": "8.6.6", - "resolved": "https://mirrors.tencent.com/npm/pixi.js/-/pixi.js-8.6.6.tgz", - "integrity": "sha512-o5pw7G2yuIrnBx0G4npBlmFp+XGNcapI/Ufs62rRj/4XKxc1Zo74YJr/BtEXcXTraTKd+pQvYOLvnfxRjxBMvQ==", - "dependencies": { - "@pixi/colord": "^2.9.6", - "@types/css-font-loading-module": "^0.0.12", - "@types/earcut": "^2.1.4", - "@webgpu/types": "^0.1.40", - "@xmldom/xmldom": "^0.8.10", - "earcut": "^2.2.4", - "eventemitter3": "^5.0.1", - "ismobilejs": "^1.1.1", - "parse-svg-path": "^0.1.2" - } - }, "node_modules/pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", @@ -20749,6 +20756,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-6.0.1.tgz", "integrity": "sha512-TnErZpmuKdwWBdMoexjio3KKX6ZtoKHRVvLIU0A47R0VVBDtx3ZyOJDktgYixhoJokZTYTt1Z37OkO9pnGJa9Q==", + "dev": true, "dependencies": { "ansi-escapes": "^4.3.2", "chalk": "^4.1.2", @@ -20770,6 +20778,7 @@ "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, "dependencies": { "type-fest": "^0.21.3" }, @@ -20783,12 +20792,14 @@ "node_modules/webpackbar/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/webpackbar/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, "engines": { "node": ">=8" } @@ -20797,6 +20808,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -20810,6 +20822,7 @@ "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, "engines": { "node": ">=10" }, @@ -20821,6 +20834,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", diff --git a/bklog/web/package.json b/bklog/web/package.json index 586f34711f..0554e532e7 100644 --- a/bklog/web/package.json +++ b/bklog/web/package.json @@ -6,11 +6,13 @@ "keywords": [], "license": "ISC", "scripts": { - "dev": "nodemon --exec \"bkmonitor-cli dev\"", - "dev:monitor": "nodemon --exec \"bkmonitor-cli dev --apm\"", - "build": "bkmonitor-cli build", - "build:monitor": "bkmonitor-cli build --apm", - "analyze:monitor": "bkmonitor-cli build --apm -a", + "dev": "nodemon --exec \"cross-env MONITOR_APP=log bkmonitor-cli dev --log\"", + "dev:apm": "nodemon --exec \"cross-env MONITOR_APP=apm bkmonitor-cli dev --log\"", + "dev:trace": "nodemon --exec \"cross-env MONITOR_APP=trace bkmonitor-cli dev --log\"", + "build": "cross-env MONITOR_APP=log bkmonitor-cli build --log", + "build:apm": "cross-env MONITOR_APP=apm bkmonitor-cli build --log", + "build:trace": "cross-env MONITOR_APP=trace bkmonitor-cli build --log && node ./scripts/prefix-css.js", + "analyze:apm": "bkmonitor-cli build --log -a", "clean": "rimraf ../static/dist/*", "analyze": "npm run clean && bkmonitor-cli build -a", "lint": "eslint \"**/*.{js,ts,tsx}\" --fix", @@ -20,7 +22,7 @@ "dependencies": { "@babel/helper-module-imports": "7.24.7", "@babel/runtime": "7.26.0", - "@blueking/bkmonitor-cli": "5.0.0-beta.17", + "@blueking/bkmonitor-cli": "6.0.0-beta.5", "@blueking/bkui-library": "0.0.0-beta.5", "@blueking/date-picker": "2.0.0-beta.33", "@blueking/fork-resize-detector": "0.0.2", @@ -97,6 +99,7 @@ "@types/echarts": "4.9.22", "@typescript-eslint/eslint-plugin": "7.8.0", "@typescript-eslint/parser": "7.8.0", + "cross-env": "^7.0.3", "eslint": "9.2.0", "eslint-config-prettier": "9.1.0", "eslint-config-tencent": "1.0.4", diff --git a/bklog/web/scripts/apm-package.json b/bklog/web/scripts/apm-package.json new file mode 100644 index 0000000000..28e26c5be4 --- /dev/null +++ b/bklog/web/scripts/apm-package.json @@ -0,0 +1,11 @@ +{ + "name": "@blueking/monitor-apm-log", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT" +} diff --git a/bklog/web/scripts/create-monitor.js b/bklog/web/scripts/create-monitor.js index 725faa6212..e2e6c3418a 100644 --- a/bklog/web/scripts/create-monitor.js +++ b/bklog/web/scripts/create-monitor.js @@ -26,25 +26,51 @@ const webpack = require('webpack'); const WebpackBar = require('webpackbar'); const CopyWebpackPlugin = require('copy-webpack-plugin'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const { resolve } = require('node:path'); -const outputUrl = resolve(__dirname, '../monitor-retrieve'); +const outputUrl = resolve(__dirname, `../monitor-${process.env.MONITOR_APP}-retrieve`); const createMonitorConfig = config => { const production = process.env.NODE_ENV === 'production'; - delete config.plugins[0]; + const isTrace = process.env.MONITOR_APP === 'trace'; config.plugins.push( new CopyWebpackPlugin({ patterns: [ { - from: resolve(__dirname, './link-package.json'), + from: resolve(__dirname, `./${process.env.MONITOR_APP}-package.json`), to: resolve(outputUrl, './package.json'), }, - ], + isTrace + ? { + from: resolve(__dirname, '../node_modules/bk-magic-vue/dist/fonts/iconcool.*'), + to: resolve(outputUrl, './fonts/[name][ext]'), + } + : undefined, + isTrace + ? { + from: resolve(__dirname, '../node_modules/bk-magic-vue/dist/images/*.(png|svg)'), + to: resolve(outputUrl, './images/[name][ext]'), + } + : undefined, + ].filter(Boolean), }), ); + config.plugins.push( + new webpack.DefinePlugin({ + NODE_ENV: JSON.stringify('production'), + APP: JSON.stringify(process.env.MONITOR_APP), + MONITOR_APP: JSON.stringify(process.env.MONITOR_APP), + }), + ); + const fileLoaders = config.module.rules[1].oneOf.find(item => item.test.test('.ttf')); + const imgLoaders = config.module.rules[1].oneOf.find(item => item.test.test('.png')); + const urlLoaderOptions = fileLoaders.use.find(item => item.loader === 'url-loader').options; + imgLoaders.options.publicPath = '../img'; + urlLoaderOptions.publicPath = '../fonts'; return { ...config, entry: { - main: './src/views/retrieve-v2/monitor/index.ts', + main: isTrace ? './src/views/retrieve-v2/monitor/trace.ts' : './src/views/retrieve-v2/monitor/index.ts', }, output: { filename: '[name].js', @@ -58,6 +84,7 @@ const createMonitorConfig = config => { chunkFormat: 'module', module: true, clean: true, + publicPath: '', }, resolve: { ...config.resolve, @@ -74,44 +101,83 @@ const createMonitorConfig = config => { mangleExports: false, }, externalsType: 'module', - externals: [ - /@blueking\/date-picker/, - /@blueking\/ip-selector/, - /@blueking\/user-selector/, - /@blueking\/bkui-library/, - /bk-magic-vue/, - /vue-i18n/, - 'vue', - 'axios', - 'vuex', - 'vue-property-decorator', - 'vuedraggable', - 'sortablejs', - 'clipboard', - 'vue-tsx-support', - 'qs', - /dayjs\//, - 'dayjs', - /lodash/, - /vue-json-pretty/, - ({ request, context }, cb) => { - if (request === 'echarts') { - return cb(undefined, request.replace(request, request)); + externals: isTrace + ? [ + /@blueking\/date-picker/, + // /@blueking\/ip-selector/, + // /@blueking\/user-selector/, + /@blueking\/bkui-library/, + // /bk-magic-vue/, + // /vue-i18n/, + // 'vue', + 'axios', + // 'vuex', + // 'vue-property-decorator', + 'vuedraggable', + 'sortablejs', + // 'clipboard', + // 'vue-tsx-support', + 'qs', + /dayjs\//, + 'dayjs', + /lodash/, + // /vue-json-pretty/, + ({ request }, cb) => { + // if (request === 'echarts') { + // return cb(undefined, request.replace(request, request)); + // } + if (request === 'resize-detector') { + return cb(undefined, '@blueking/fork-resize-detector'); + } + cb(); + }, + ] + : [ + /@blueking\/date-picker/, + /@blueking\/ip-selector/, + /@blueking\/user-selector/, + /@blueking\/bkui-library/, + /bk-magic-vue/, + /vue-i18n/, + 'vue', + 'axios', + 'vuex', + 'vue-property-decorator', + 'vuedraggable', + 'sortablejs', + 'clipboard', + 'vue-tsx-support', + 'qs', + /dayjs\//, + 'dayjs', + /lodash/, + /vue-json-pretty/, + ({ request }, cb) => { + if (request === 'echarts') { + return cb(undefined, request.replace(request, request)); + } + if (request === 'resize-detector') { + return cb(undefined, '@blueking/fork-resize-detector'); + } + cb(); + }, + ], + plugins: config.plugins + .filter(plugin => !(plugin instanceof HtmlWebpackPlugin)) + .map(plugin => { + if (plugin instanceof MiniCssExtractPlugin) { + return new MiniCssExtractPlugin({ + filename: 'css/main.css', + ignoreOrder: true, + }); } - if (request === 'resize-detector') { - return cb(undefined, '@blueking/fork-resize-detector'); - } - cb(); - }, - ], - plugins: config.plugins.filter(Boolean).map(plugin => { - return plugin instanceof webpack.ProgressPlugin - ? new WebpackBar({ - profile: true, - name: `监控日志 ${production ? 'Production模式' : 'Development模式'} 构建`, - }) - : plugin; - }), + return plugin instanceof webpack.ProgressPlugin + ? new WebpackBar({ + profile: true, + name: `监控日志检索组件 ${production ? 'Production模式' : 'Development模式'} 构建`, + }) + : plugin; + }), cache: production ? false : config.cache, }; }; diff --git a/bklog/web/scripts/prefix-css.js b/bklog/web/scripts/prefix-css.js new file mode 100644 index 0000000000..b57814724b --- /dev/null +++ b/bklog/web/scripts/prefix-css.js @@ -0,0 +1,50 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +const fs = require('node:fs'); +const postcss = require('postcss'); +const { resolve } = require('node:path'); + +const input = fs.readFileSync(resolve(__dirname, '../node_modules/bk-magic-vue/dist/bk-magic-vue.min.css'), 'utf-8'); // 需要添加前缀的输入文件 +postcss([ + postcss.plugin('postcss-add-monitor-class', () => { + return root => { + root.walkRules(rule => { + // 对于每个规则，更新它的选择器 + rule.selectors = rule.selectors.map(selector => { + if (/^\.(tippy-|bk-tooltip-|bk-option-|bk-select-search-input|bk-select-dropdown-)/.test(selector)) { + return selector; + } + return `.monitor-trace-log ${selector}`; + }); + }); + }; + }), +]) + .process(input, { from: undefined }) + .then(result => { + const cssText = result.css.replace(/url\((fonts|images)([^)]+)(\))/gim, 'url(../$1$2$3'); + fs.appendFileSync(resolve(__dirname, '../monitor-trace-retrieve/css/main.css'), cssText); // 最终生成的文件 + }); diff --git a/bklog/web/scripts/trace-package.json b/bklog/web/scripts/trace-package.json new file mode 100644 index 0000000000..74fec186bb --- /dev/null +++ b/bklog/web/scripts/trace-package.json @@ -0,0 +1,11 @@ +{ + "name": "@blueking/monitor-trace-log", + "version": "1.0.0-beta.3", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT" +} diff --git a/bklog/web/src/api/_httpRequest.js b/bklog/web/src/api/_httpRequest.js index f97086d503..651c1646ff 100644 --- a/bklog/web/src/api/_httpRequest.js +++ b/bklog/web/src/api/_httpRequest.js @@ -194,7 +194,7 @@ class HttpRequst { ext || {}, config, ); - if (window.__IS_MONITOR_APM__) { + if (window.__IS_MONITOR_COMPONENT__) { // 兼容监控逻辑 this.__initParams(param); } diff --git a/bklog/web/src/api/index.js b/bklog/web/src/api/index.js index 2f2b7587e8..c4bb226e89 100644 --- a/bklog/web/src/api/index.js +++ b/bklog/web/src/api/index.js @@ -70,7 +70,7 @@ axiosInstance.interceptors.request.use( if (window.IS_EXTERNAL && JSON.parse(window.IS_EXTERNAL) && store.state.spaceUid) { config.headers['X-Bk-Space-Uid'] = store.state.spaceUid; } - if (window.__IS_MONITOR_APM__) { + if (window.__IS_MONITOR_COMPONENT__) { // 监控上层并没有使用 OT 这里直接自己生成traceparent id const traceparent = `00-${random(32, 'abcdef0123456789')}-${random(16, 'abcdef0123456789')}-01`; config.headers.Traceparent = traceparent; diff --git a/bklog/web/src/components/monitor-echarts/trend-chart.vue b/bklog/web/src/components/monitor-echarts/trend-chart.vue index 1461c03529..f346ae5fe5 100644 --- a/bklog/web/src/components/monitor-echarts/trend-chart.vue +++ b/bklog/web/src/components/monitor-echarts/trend-chart.vue @@ -91,7 +91,7 @@ return; } - const indexId = window.__IS_MONITOR_APM__ ? route.query.indexId : route.params.indexId; + const indexId = window.__IS_MONITOR_COMPONENT__ ? route.query.indexId : route.params.indexId; if ((!isUnionSearch.value && !!indexId) || (isUnionSearch.value && unionIndexList.value?.length)) { // 从检索切到其他页面时 表格初始化的时候路由中indexID可能拿不到 拿不到 则不请求图表 const urlStr = isUnionSearch.value ? 'unionSearch/unionDateHistogram' : 'retrieve/getLogChartList'; diff --git a/bklog/web/src/components/nav/head-nav.vue b/bklog/web/src/components/nav/head-nav.vue index 41579a32de..80146751a5 100644 --- a/bklog/web/src/components/nav/head-nav.vue +++ b/bklog/web/src/components/nav/head-nav.vue @@ -338,12 +338,17 @@ const list = this.topMenu.filter(menu => { return menu.feature === 'on' && (this.isExternal ? this.externalMenu.includes(menu.id) : true); }); - // #if APP === 'apm' - if (process.env.NODE_ENV === 'development' && process.env.APP === 'apm' && list?.length) { - return [...list, { id: 'monitor-retrieve', name: '监控检索' }]; + // #if MONITOR_APP === 'apm' + if (process.env.NODE_ENV === 'development' && process.env.MONITOR_APP === 'apm' && list?.length) { + return [...list, { id: 'monitor-apm-log', name: 'APM Log检索' }]; } - // #endif + // #elif MONITOR_APP === 'trace' + if (process.env.NODE_ENV === 'development' && process.env.MONITOR_APP === 'trace' && list?.length) { + return [...list, { id: 'monitor-trace-log', name: 'Trace Log检索' }]; + } + // #else return list; + // #endif }, isShowGlobalSetIcon() { return !this.welcomeData && !this.isExternal; diff --git a/bklog/web/src/hooks/use-segment-pop.ts b/bklog/web/src/hooks/use-segment-pop.ts index ad9106b896..ad99bc0b26 100644 --- a/bklog/web/src/hooks/use-segment-pop.ts +++ b/bklog/web/src/hooks/use-segment-pop.ts @@ -121,7 +121,22 @@ class UseSegmentProp { iconName: 'bklog-icon bklog-jump', }, }, - ]; + ] + .filter(item => { + if (window?.__IS_MONITOR_TRACE__) { + return item.text !== this.$t('新建检索'); + } + return true; + }) + .map(item => { + if (window?.__IS_MONITOR_TRACE__) { + return { + ...item, + link: undefined, + }; + } + return item; + }); return h('div', { class: 'segment-event-icons event-tippy-content', ref: refName }, [ eventBoxList.map(item => diff --git a/bklog/web/src/hooks/use-trend-chart.ts b/bklog/web/src/hooks/use-trend-chart.ts index 07604c62b1..6e07bc3fc8 100644 --- a/bklog/web/src/hooks/use-trend-chart.ts +++ b/bklog/web/src/hooks/use-trend-chart.ts @@ -264,7 +264,7 @@ export default ({ target, handleChartDataZoom }: TrandChartOption) => { type: 'restore', }); - if (window.__IS_MONITOR_APM__) { + if (window.__IS_MONITOR_COMPONENT__) { handleChartDataZoom([timeFrom, timeTo]); } else { // 更新Store中的时间范围 diff --git a/bklog/web/src/index.d.ts b/bklog/web/src/index.d.ts index 0f18503646..fbfd828a09 100644 --- a/bklog/web/src/index.d.ts +++ b/bklog/web/src/index.d.ts @@ -32,7 +32,9 @@ declare global { MONITOR_URL: string; BK_SHARED_RES_URL: string; VERSION: string; - __IS_MONITOR_APM__?: boolean; + __IS_MONITOR_COMPONENT__?: boolean; // 是否是监控组件 + __IS_MONITOR_TRACE__?: boolean; // 是否是监控Trace组件 + __IS_MONITOR_APM__?: boolean; // 是否是监控APM组件 } } diff --git a/bklog/web/src/router/index.js b/bklog/web/src/router/index.js index ac197b3115..95235f0ffa 100644 --- a/bklog/web/src/router/index.js +++ b/bklog/web/src/router/index.js @@ -278,14 +278,20 @@ const MaskingList = () => '@/views/manage/log-clean/clean-masking/list' ); -// #if APP === 'apm' -const MonitorRetrieve = () => +// #if MONITOR_APP === 'apm' +const MonitorApmLog = () => import( - /* webpackChunkName: 'monitor-retrieve' */ + /* webpackChunkName: 'monitor-apm-log' */ + '@/views/retrieve-v2/monitor/monitor.vue' + ); +// #endif +// #if MONITOR_APP === 'trace' +const MonitorTraceLog = () => + import( + /* webpackChunkName: 'monitor-trace-log' */ '@/views/retrieve-v2/monitor/monitor.vue' ); // #endif - const routes = [ { path: '', @@ -1044,14 +1050,25 @@ const routes = [ name: 'playground', component: playground, }, - // #if APP === 'apm' + // #if MONITOR_APP === 'apm' + { + path: '/monitor-apm-log/:indexId?', + name: 'monitor-apm-log', + component: MonitorApmLog, + meta: { + title: 'APM检索-日志', + navId: 'monitor-apm-log', + }, + }, + // #endif + // #if MONITOR_APP === 'trace' { - path: '/monitor-retrieve/:indexId?', - name: 'monitor-retrieve', - component: MonitorRetrieve, + path: '/monitor-trace-log/:indexId?', + name: 'monitor-trace-log', + component: MonitorTraceLog, meta: { - title: '监控检索', - navId: 'monitor-retrieve', + title: 'Trace检索-日志', + navId: 'monitor-trace-log', }, }, // #endif diff --git a/bklog/web/src/scss/mixins/scroller.scss b/bklog/web/src/scss/mixins/scroller.scss index a8d9b822cd..9252eb3d28 100644 --- a/bklog/web/src/scss/mixins/scroller.scss +++ b/bklog/web/src/scss/mixins/scroller.scss @@ -1,8 +1,10 @@ -@mixin scroller($backgroundColor: #ddd, $width: 8px) { +@use 'sass:color'; + +@mixin scroller($backgroundColor: #ddd, $width: 4px) { &::-webkit-scrollbar { width: $width; height: 8px; - background-color: lighten($backgroundColor, 80%); + background-color: color.adjust($backgroundColor, $lightness: 80%); } &::-webkit-scrollbar-thumb { diff --git a/bklog/web/src/store/index.js b/bklog/web/src/store/index.js index 293dd63ccc..30317529d7 100644 --- a/bklog/web/src/store/index.js +++ b/bklog/web/src/store/index.js @@ -938,7 +938,7 @@ const store = new Vuex.Store({ ids.push(...result?.unionList); commit('updateUnionIndexList', ids); } else { - const indexId = window.__IS_MONITOR_APM__ ? route.query.indexId : route.params.indexId; + const indexId = window.__IS_MONITOR_COMPONENT__ ? route.query.indexId : route.params.indexId; if (indexId) { ids.push(indexId); } diff --git a/bklog/web/src/views/extract/create/index.vue b/bklog/web/src/views/extract/create/index.vue index 8f90e8a65f..f200ce398f 100644 --- a/bklog/web/src/views/extract/create/index.vue +++ b/bklog/web/src/views/extract/create/index.vue @@ -165,8 +165,12 @@ diff --git a/bklog/web/src/views/retrieve-v2/monitor/trace.ts b/bklog/web/src/views/retrieve-v2/monitor/trace.ts new file mode 100644 index 0000000000..564a5718f1 --- /dev/null +++ b/bklog/web/src/views/retrieve-v2/monitor/trace.ts @@ -0,0 +1,55 @@ +/* +* Tencent is pleased to support the open source community by making +* 蓝鲸智云PaaS平台 (BlueKing PaaS) available. +* +* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. +* +* 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. +* +* License for 蓝鲸智云PaaS平台 (BlueKing PaaS): +* +* --------------------------------------------------- +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +* documentation files (the "Software"), to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and +* to permit persons to whom the Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all copies or substantial portions of +* the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +* THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ +window.__IS_MONITOR_COMPONENT__ = true; +window.__IS_MONITOR_TRACE__ = true; +window.__IS_MONITOR_APM__ = process.env.MONITOR_APP === 'apm'; +import Vue from 'vue'; + +import LogButton from '@/components/log-button'; +import JsonFormatWrapper from '@/global/json-format-wrapper.vue'; +import useStore from '@/hooks/use-store'; +import i18n from '@/language/i18n'; + +import MonitorRetrieve from './monitor.vue'; + +import '../../../static/style.css'; +const logStore = useStore(); +const initMonitorState = (payload) => { + logStore.commit('initMonitorState', payload); +}; +const initGlobalComponents = () => { + Vue.component('JsonFormatWrapper', JsonFormatWrapper); + Vue.component('LogButton', LogButton); +} +const Vue2 = Vue; +export { + MonitorRetrieve, + logStore, + i18n, + initMonitorState, + initGlobalComponents, + Vue2, +} diff --git a/bklog/web/src/views/retrieve-v2/monitor/utils.ts b/bklog/web/src/views/retrieve-v2/monitor/utils.ts index 47d60f9f7c..9061ee22b3 100644 --- a/bklog/web/src/views/retrieve-v2/monitor/utils.ts +++ b/bklog/web/src/views/retrieve-v2/monitor/utils.ts @@ -34,8 +34,8 @@ export function monitorLink(routeParams: IRouterParams) { ...window.mainComponent.$router.query, ...window.mainComponent.$router.params, ...routeParams, - name: 'apm-others', - path: '/apm/service' + name: window.__IS_MONITOR_TRACE__ ? 'trace-retrieval' : 'apm-others', + path: window.__IS_MONITOR_TRACE__ ? '/trace/home' : '/apm/service' }; const url = window.mainComponent.$router.resolve(params).href; return url; diff --git a/bklog/web/src/views/retrieve-v2/result-comp/context-log.vue b/bklog/web/src/views/retrieve-v2/result-comp/context-log.vue index f4fdd735d1..c4126253b3 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/context-log.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/context-log.vue @@ -272,7 +272,7 @@ this.isConfigLoading = true; const res = await this.$http.request('retrieve/getLogTableHead', { params: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }, query: { scope: 'search_context', @@ -315,7 +315,7 @@ this.logLoading = true; const res = await this.$http.request('retrieve/getContentLog', { params: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }, data, }); @@ -387,7 +387,7 @@ try { const configRes = await this.$http.request('retrieve/getFieldsConfigByContextLog', { params: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, config_id: this.currentConfigID, }, }); @@ -395,7 +395,7 @@ sort_list: configRes.data.sort_list, name: configRes.data.name, config_id: this.currentConfigID, - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }); await this.$http.request('retrieve/updateFieldsConfig', { data, diff --git a/bklog/web/src/views/retrieve-v2/result-comp/export-history.vue b/bklog/web/src/views/retrieve-v2/result-comp/export-history.vue index 1173036e68..5f2ec66948 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/export-history.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/export-history.vue @@ -416,7 +416,7 @@ this.$http .request('retrieve/exportAsync', { params: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }, data, }) @@ -486,10 +486,12 @@ break; } } - const params = Object.keys(queryParamsStr).reduce((output, key) => { - output.push(`${key}=${encodeURIComponent(queryParamsStr[key])}`); - return output; - }, []).join('&') ; + const params = Object.keys(queryParamsStr) + .reduce((output, key) => { + output.push(`${key}=${encodeURIComponent(queryParamsStr[key])}`); + return output; + }, []) + .join('&'); const jumpUrl = `${window.SITE_URL}#/retrieve/${indexSetID}?spaceUid=${spaceUid}&bizId=${dict.bk_biz_id}&${params}`; window.open(jumpUrl, '_blank'); }, @@ -535,7 +537,7 @@ const { limit, current } = this.pagination; const queryUrl = this.isUnionSearch ? 'unionSearch/unionExportHistory' : 'retrieve/getExportHistoryList'; const params = { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, bk_biz_id: this.bkBizId, page: current, pagesize: limit, diff --git a/bklog/web/src/views/retrieve-v2/result-comp/export-log.vue b/bklog/web/src/views/retrieve-v2/result-comp/export-log.vue index 71342035a4..8e6e222f6d 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/export-log.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/export-log.vue @@ -310,7 +310,7 @@ return []; }, routerIndexSet() { - return window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId; + return window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId; }, }, beforeUnmount() { diff --git a/bklog/web/src/views/retrieve-v2/result-comp/fields-setting.vue b/bklog/web/src/views/retrieve-v2/result-comp/fields-setting.vue index 28a3713086..2036d6648f 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/fields-setting.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/fields-setting.vue @@ -407,7 +407,7 @@ await this.$http .request('retrieve/postFieldsConfig', { data: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, index_set_ids: this.unionIndexList, index_set_type: this.isUnionSearch ? 'union' : 'single', display_fields: this.shadowVisible, @@ -584,7 +584,7 @@ sort_list: updateItem.sort_list, display_fields: updateItem.display_fields, config_id: undefined, - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, index_set_ids: this.unionIndexList, index_set_type: this.isUnionSearch ? 'union' : 'single', }; @@ -614,7 +614,7 @@ await this.$http.request('retrieve/deleteFieldsConfig', { data: { config_id: configID, - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, index_set_ids: this.unionIndexList, index_set_type: this.isUnionSearch ? 'union' : 'single', }, @@ -664,7 +664,11 @@ data: { ...(this.isUnionSearch ? { index_set_ids: this.unionIndexList } - : { index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId }), + : { + index_set_id: window.__IS_MONITOR_COMPONENT__ + ? this.$route.query.indexId + : this.$route.params.indexId, + }), scope: 'default', index_set_type: this.isUnionSearch ? 'union' : 'single', }, diff --git a/bklog/web/src/views/retrieve-v2/result-comp/kv-list.vue b/bklog/web/src/views/retrieve-v2/result-comp/kv-list.vue index e6ae17b96e..2f3667581e 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/kv-list.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/kv-list.vue @@ -279,7 +279,7 @@ } if (path) { - const url = `${window.__IS_MONITOR_APM__ ? location.origin : window.MONITOR_URL}${path}`; + const url = `${window.__IS_MONITOR_COMPONENT__ ? location.origin : window.MONITOR_URL}${path}`; window.open(url, '_blank'); } }, diff --git a/bklog/web/src/views/retrieve-v2/result-comp/real-time-log.vue b/bklog/web/src/views/retrieve-v2/result-comp/real-time-log.vue index e8d0f1cbbc..a80467bfeb 100644 --- a/bklog/web/src/views/retrieve-v2/result-comp/real-time-log.vue +++ b/bklog/web/src/views/retrieve-v2/result-comp/real-time-log.vue @@ -235,7 +235,7 @@ this.loading = true; this.$http .request('retrieve/getRealTimeLog', { - params: { index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId }, + params: { index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId }, data: Object.assign({ order: '-', size: 50, zero: this.zero }, this.params), }) .then(res => { diff --git a/bklog/web/src/views/retrieve-v2/search-bar/index.vue b/bklog/web/src/views/retrieve-v2/search-bar/index.vue index e0845443ab..26c5059028 100644 --- a/bklog/web/src/views/retrieve-v2/search-bar/index.vue +++ b/bklog/web/src/views/retrieve-v2/search-bar/index.vue @@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router/composables'; import { RetrieveUrlResolver } from '@/store/url-resolver'; - // #if APP !== 'apm' + // #if MONITOR_APP !== 'apm' && MONITOR_APP !== 'trace' import BookmarkPop from './bookmark-pop'; // #else // #code const BookmarkPop = () => null; @@ -193,7 +193,7 @@ }; const handleRefresh = isRefresh => { - // #if APP !== 'apm' + // #if MONITOR_APP !== 'apm' && MONITOR_APP !== 'trace' emit('refresh', isRefresh); // #endif }; diff --git a/bklog/web/src/views/retrieve-v2/search-bar/ip-selector.vue b/bklog/web/src/views/retrieve-v2/search-bar/ip-selector.vue index 8b79941a98..6fb5055722 100644 --- a/bklog/web/src/views/retrieve-v2/search-bar/ip-selector.vue +++ b/bklog/web/src/views/retrieve-v2/search-bar/ip-selector.vue @@ -1,8 +1,14 @@ + diff --git a/bklog/web/src/views/retrieve-v2/search-result-panel/original-log/table-log.vue b/bklog/web/src/views/retrieve-v2/search-result-panel/original-log/table-log.vue index 12da9da64c..1d6f2bbe59 100644 --- a/bklog/web/src/views/retrieve-v2/search-result-panel/original-log/table-log.vue +++ b/bklog/web/src/views/retrieve-v2/search-result-panel/original-log/table-log.vue @@ -130,8 +130,13 @@ import { mapState } from 'vuex'; import { bigNumberToString } from '../../../../common/util'; + // #if MONITOR_APP !== 'trace' import ContextLog from '../../result-comp/context-log'; import RealTimeLog from '../../result-comp/real-time-log'; + // #else + // #code const ContextLog = () => null; + // #code const RealTimeLog = () => null; + // #endif import OriginalList from './original-list'; import TableList from './table-list'; @@ -277,7 +282,7 @@ this.$http .request('retrieve/getWebConsoleUrl', { params: { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }, query: queryData, }) @@ -347,7 +352,8 @@ height: calc(100% - 42px); .bklog-skeleton-loading { - position: absolute; + /* stylelint-disable-next-line declaration-no-important */ + position: absolute !important; top: 0; z-index: 10; } diff --git a/bklog/web/src/views/retrieve-v2/search-result-panel/panel-util.js b/bklog/web/src/views/retrieve-v2/search-result-panel/panel-util.js index 28182f7675..7a87f8ba39 100644 --- a/bklog/web/src/views/retrieve-v2/search-result-panel/panel-util.js +++ b/bklog/web/src/views/retrieve-v2/search-result-panel/panel-util.js @@ -76,7 +76,7 @@ export function getConditionRouterParams(searchList, searchMode, isNewLink) { params, query: filterQuery, }; - if (window.__IS_MONITOR_APM__) { + if (window.__IS_MONITOR_COMPONENT__) { return monitorLink(routeData); } return window.mainComponent.$router.resolve(routeData).href; diff --git a/bklog/web/src/views/retrieve-v2/setting-modal/log-cluster.vue b/bklog/web/src/views/retrieve-v2/setting-modal/log-cluster.vue index 99f50bae7e..8518be3b2d 100644 --- a/bklog/web/src/views/retrieve-v2/setting-modal/log-cluster.vue +++ b/bklog/web/src/views/retrieve-v2/setting-modal/log-cluster.vue @@ -283,7 +283,7 @@ this.globalLoading = true; try { const params = { - index_set_id: window.__IS_MONITOR_APM__ ? this.$route.query.indexId : this.$route.params.indexId, + index_set_id: window.__IS_MONITOR_COMPONENT__ ? this.$route.query.indexId : this.$route.params.indexId, }; const data = { collector_config_id: this.configID }; const baseUrl = '/logClustering'; diff --git a/bklog/web/src/views/retrieve/index.vue b/bklog/web/src/views/retrieve/index.vue index b48351d94e..d0c7b1944f 100644 --- a/bklog/web/src/views/retrieve/index.vue +++ b/bklog/web/src/views/retrieve/index.vue @@ -30,6 +30,7 @@
@@ -296,7 +296,11 @@ getStorageIndexItem, } from '@/common/util'; import AuthContainerPage from '@/components/common/auth-container-page'; + // #if MONITOR_APP !== 'apm' && MONITOR_APP !== 'trace' import LogIpSelector from '@/components/log-ip-selector/log-ip-selector'; + // #else + // #code const LogIpSelector = () => null; + // #endif import indexSetSearchMixin from '@/mixins/indexSet-search-mixin'; import tableRowDeepViewMixin from '@/mixins/table-row-deep-view-mixin'; import axios from 'axios'; @@ -310,12 +314,12 @@ import AddCollectDialog from './collect/add-collect-dialog'; import CollectIndex from './collect/collect-index'; import SelectIndexSet from './condition-comp/select-index-set.tsx'; + import FieldFilter from './field-filter-comp'; import NoIndexSet from './result-comp/no-index-set'; import ResultHeader from './result-comp/result-header'; import ResultMain from './result-comp/result-main'; import SearchComp from './search-comp'; import SettingModal from './setting-modal/index.vue'; - import FieldFilter from './field-filter-comp'; const CancelToken = axios.CancelToken; const currentTime = Math.floor(new Date().getTime() / 1000); @@ -1738,7 +1742,7 @@ // 更新联合查询的begin const unionConfigs = this.unionIndexList.map(item => ({ begin: this.isTablePagination - ? (this.catchUnionBeginList.find(cItem => String(cItem?.index_set_id) === item)?.begin ?? 0) + ? this.catchUnionBeginList.find(cItem => String(cItem?.index_set_id) === item)?.begin ?? 0 : 0, index_set_id: item, })); diff --git a/bklog/web/webpack.config.js b/bklog/web/webpack.config.js index 4151c99045..092622f276 100644 --- a/bklog/web/webpack.config.js +++ b/bklog/web/webpack.config.js @@ -92,8 +92,8 @@ if (fs.existsSync(path.resolve(__dirname, './local.settings.js'))) { const localConfig = require('./local.settings'); devConfig = Object.assign({}, devConfig, localConfig); } -module.exports = (baseConfig, { app, mobile, production, fta, email = false }) => { - const isMonitorRetrieveBuild = app === 'apm' && production; // 判断是否监控检索构建 +module.exports = (baseConfig, { app, mobile, production, fta, log, email = false }) => { + const isMonitorRetrieveBuild = ['apm', 'trace'].includes(process.env.MONITOR_APP) && production; // 判断是否监控检索构建 const config = baseConfig; const distUrl = path.resolve('../static/dist'); if (!production) { @@ -117,7 +117,8 @@ module.exports = (baseConfig, { app, mobile, production, fta, email = false }) = devHost: JSON.stringify(`${devConfig.host}`), loginHost: JSON.stringify(devConfig.loginHost), loginUrl: JSON.stringify(`${devConfig.loginHost}/login/`), - APP: JSON.stringify(`${app}`), + APP: JSON.stringify(`${process.env.MONITOR_APP}`), + MONITOR_APP: JSON.stringify(`${process.env.MONITOR_APP}`), }, }, }), @@ -191,6 +192,15 @@ module.exports = (baseConfig, { app, mobile, production, fta, email = false }) = }) : plugin; }), - cache: typeof devConfig.cache === 'boolean' ? devConfig.cache : config.cache, + cache: production + ? false + : { + buildDependencies: { + config: [__filename], + }, + cacheDirectory: path.resolve(__dirname, '.cache'), + name: `${process.env.MONITOR_APP || config.app}-cache`, + type: 'filesystem', + }, }; }; From 76942728fd2bcff41b690a5abe676975c560bf02 Mon Sep 17 00:00:00 2001 From: chenguo Date: Fri, 17 Jan 2025 11:08:14 +0800 Subject: [PATCH 03/41] =?UTF-8?q?minor:=20workload=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8Blimit/request=E4=BD=BF=E7=94=A8=E7=8E=87?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/packages/monitor_web/k8s/core/meta.py | 4 ++-- bkmonitor/packages/monitor_web/k8s/resources.py | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/bkmonitor/packages/monitor_web/k8s/core/meta.py b/bkmonitor/packages/monitor_web/k8s/core/meta.py index cbc9ab4eea..f9aface5b5 100644 --- a/bkmonitor/packages/monitor_web/k8s/core/meta.py +++ b/bkmonitor/packages/monitor_web/k8s/core/meta.py @@ -659,7 +659,7 @@ def meta_prom_with_kube_pod_memory_limits_ratio(self): def distinct(cls, queryset): query_set = ( queryset.values('type', "name") - .order_by() + .order_by("name") .annotate( distinct_name=Max("id"), workload=Concat(F("type"), Value(":"), F("name")), @@ -683,7 +683,7 @@ def resource_field_list(self): def distinct(cls, queryset): query_set = ( queryset.values('name') - .order_by() + .order_by('name') .annotate(distinct_name=Max("id")) .annotate(container=F("name")) .values("container") diff --git a/bkmonitor/packages/monitor_web/k8s/resources.py b/bkmonitor/packages/monitor_web/k8s/resources.py index c66862c213..8c5b170d85 100644 --- a/bkmonitor/packages/monitor_web/k8s/resources.py +++ b/bkmonitor/packages/monitor_web/k8s/resources.py @@ -422,10 +422,18 @@ def perform_request(self, validated_request_data): # workload 单独处理 promql_list = [] for wl in resource_list: - filter_obj = load_resource_filter(resource_type, [wl]) - resource_meta.filter.add(filter_obj) + # workload 资源，需要带上namespace 信息: blueking|Deployment:bk-monitor-web + try: + ns, wl = wl.split("|") + except ValueError: + # 不符合预期的数据， ns置空 + ns = "" + tmp_filter_chain = [] + tmp_filter_chain.append(load_resource_filter(resource_type, [wl])) + tmp_filter_chain.append(load_resource_filter("namespace", [ns])) + [resource_meta.filter.add(filter_obj) for filter_obj in tmp_filter_chain] promql_list.append(getattr(resource_meta, f"meta_prom_with_{column}")) - resource_meta.filter.remove(filter_obj) + [resource_meta.filter.remove(filter_obj) for filter_obj in tmp_filter_chain] workload_name = wl.split(":")[-1] # 初始化series_map series_map[workload_name] = {"datapoints": [], "unit": unit} @@ -467,6 +475,9 @@ def perform_request(self, validated_request_data): for line in series: resource_name = resource_meta.get_resource_name(line) + if resource_type == "workload": + # workload 补充namespace + resource_name = f"{line['dimensions']['namespace']}|{resource_name}" if line["datapoints"][-1][1] == max_data_point: datapoints = line["datapoints"][-1:] else: From a7e38ab939005b46545113855b8a1a27c730507a Mon Sep 17 00:00:00 2001 From: unique0lai <11598235+unique0lai@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:41:25 +0800 Subject: [PATCH 04/41] =?UTF-8?q?tests:=20=E5=91=8A=E8=AD=A6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=BC=98=E5=85=88=E7=BA=A7=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/service/access/data/test_priority.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bkmonitor/alarm_backends/tests/service/access/data/test_priority.py b/bkmonitor/alarm_backends/tests/service/access/data/test_priority.py index e3bc10cc42..7c005d54c8 100644 --- a/bkmonitor/alarm_backends/tests/service/access/data/test_priority.py +++ b/bkmonitor/alarm_backends/tests/service/access/data/test_priority.py @@ -15,8 +15,15 @@ from alarm_backends.service.access.priority import PriorityChecker -# 使用nametuple来模拟Strategy和Item，Strategy只需要priority字段，Item只需要strategy字段 -Strategy = namedtuple("Strategy", ["priority"]) + +class Strategy: + def __init__(self, priority): + self.priority = priority + + def get_interval(self): + return 60 + + Item = namedtuple("Item", ["id", "strategy"]) # 使用nametuple来模拟DataRecord和EventRecord，只需要record_id和items字段 From 5e74cff4b477a47358194c67385d5b63474e0c7b Mon Sep 17 00:00:00 2001 From: ctenetlau <74183504+EASYGOING45@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:18:54 +0800 Subject: [PATCH 05/41] =?UTF-8?q?feat:=20Metadata:=20ES=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A1=A8=E8=AF=A6=E6=83=85=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=96=B0=E5=A2=9Edata=5Flabel,query=5Fspace=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20--story=3D121705061=20(#4853)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/metadata/management/commands/query_space.py | 2 +- bkmonitor/metadata/models/space/space_table_id_redis.py | 8 ++++++++ .../tests/space/test_ongoing_es_storage_management.py | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/bkmonitor/metadata/management/commands/query_space.py b/bkmonitor/metadata/management/commands/query_space.py index 6020828ca4..2bedb32d0a 100644 --- a/bkmonitor/metadata/management/commands/query_space.py +++ b/bkmonitor/metadata/management/commands/query_space.py @@ -84,7 +84,7 @@ def handle(self, *args, **options): data_sources["platform_data_id_list"] = space_type_data_ids.get(key[0]) or [] val["data_sources"] = data_sources - self.stdout.write(json.dumps(space_dict.values())) + self.stdout.write(json.dumps(list(space_dict.values()))) def _refine_space(self, options) -> List[Dict]: space_uids = options.get("space_uid") diff --git a/bkmonitor/metadata/models/space/space_table_id_redis.py b/bkmonitor/metadata/models/space/space_table_id_redis.py index 851875b98a..029cbfd446 100644 --- a/bkmonitor/metadata/models/space/space_table_id_redis.py +++ b/bkmonitor/metadata/models/space/space_table_id_redis.py @@ -298,13 +298,19 @@ def _compose_es_table_id_detail(self, table_id_list: Optional[List[str]] = None) tid_options = models.ResultTableOption.objects.filter(table_id__in=table_id_list).values( "table_id", "name", "value", "value_type" ) + data_label_map = models.ResultTable.objects.filter(table_id__in=table_id_list).values( + "table_id", "data_label" + ) else: table_ids = models.ESStorage.objects.values("table_id", "storage_cluster_id", "source_type", "index_set") tids = [obj["table_id"] for obj in table_ids] tid_options = models.ResultTableOption.objects.filter(table_id__in=tids).values( "table_id", "name", "value", "value_type" ) + data_label_map = models.ResultTable.objects.filter(table_id__in=tids).values("table_id", "data_label") + # data_label字典 {table_id:data_label} + data_label_map_dict = {item["table_id"]: item["data_label"] for item in data_label_map} tid_options_map = {} for option in tid_options: try: @@ -328,6 +334,7 @@ def _compose_es_table_id_detail(self, table_id_list: Optional[List[str]] = None) tid = record["table_id"] storage_id = record.get("storage_cluster_id", 0) table_id_db = index_set + try: storage_record = models.StorageClusterRecord.compose_table_id_storage_cluster_records(tid) except Exception as e: # pylint: disable=broad-except @@ -344,6 +351,7 @@ def _compose_es_table_id_detail(self, table_id_list: Optional[List[str]] = None) "options": tid_options_map.get(tid) or {}, 'storage_type': models.ESStorage.STORAGE_TYPE, 'storage_cluster_records': storage_record, + 'data_label': data_label_map_dict.get(tid, ""), } ) return data diff --git a/bkmonitor/metadata/tests/space/test_ongoing_es_storage_management.py b/bkmonitor/metadata/tests/space/test_ongoing_es_storage_management.py index 2fd1930259..cf31d16602 100644 --- a/bkmonitor/metadata/tests/space/test_ongoing_es_storage_management.py +++ b/bkmonitor/metadata/tests/space/test_ongoing_es_storage_management.py @@ -36,6 +36,12 @@ def create_or_delete_records(mocker): is_default_cluster=True, version="5.x", ) + models.ResultTable.objects.create( + table_id='1001_bklog.stdout', + table_name_zh="stdout", + data_label='bklog_index_set_1001', + is_custom_table=False, + ) models.ClusterInfo.objects.create( cluster_id=12, cluster_name="test_es_2", @@ -101,6 +107,7 @@ def test_compose_es_table_id_detail_v2(create_or_delete_records): {"storage_id": 12, "enable_time": enable_timestamp_12}, {"storage_id": 11, "enable_time": enable_timestamp}, ], + 'data_label': 'bklog_index_set_1001', } expected = {'1001_bklog.stdout': json.dumps(expected_json)} assert data == expected @@ -114,6 +121,7 @@ def test_compose_es_table_id_detail_v2(create_or_delete_records): "options": {}, "storage_type": "elasticsearch", "storage_cluster_records": [], + 'data_label': '', } expected = {'test_system_event': json.dumps(expected_json)} assert event_detail == expected From bf7b1cb376ff301ca7ae783be81c23991217b808 Mon Sep 17 00:00:00 2001 From: liang ling Date: Fri, 17 Jan 2025 14:44:41 +0800 Subject: [PATCH 06/41] =?UTF-8?q?feat:=20=E5=AE=B9=E5=99=A8=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E8=A1=A8=E6=A0=BCworkload=E6=9F=A5=E8=AF=A2=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=20--Story=3D121709588=20(#4857)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Reviewed, transaction id: 29523 --- .../monitor-k8s/components/k8s-table-new/k8s-table-new.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/k8s-table-new/k8s-table-new.tsx b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/k8s-table-new/k8s-table-new.tsx index e46f7caa5d..14aa0a9d29 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/k8s-table-new/k8s-table-new.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/k8s-table-new/k8s-table-new.tsx @@ -533,6 +533,9 @@ export default class K8sTableNew extends tsc if (key === K8sTableColumnKeysEnum.CONTAINER) { return `${data[K8sTableColumnKeysEnum.POD]}:${data[K8sTableColumnKeysEnum.CONTAINER]}`; } + if (key === K8sTableColumnKeysEnum.WORKLOAD) { + return `${data[K8sTableColumnKeysEnum.NAMESPACE]}|${data[key]}`; + } return data[key]; } From 0e7d55e085aa84c9b35600afbb671e9a25cbc3d0 Mon Sep 17 00:00:00 2001 From: q15971095971 <764419406@qq.com> Date: Fri, 17 Jan 2025 15:21:32 +0800 Subject: [PATCH 07/41] =?UTF-8?q?feat:=20=E4=B8=9A=E5=8A=A1=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E4=BA=A4=E4=BA=92=E9=9C=80=E6=B1=82=20(#4848)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webpack/src/monitor-common/shim.d.ts | 1 + .../webpack/src/monitor-common/utils/index.ts | 13 +- .../components/biz-select/list.scss | 101 ++++++++++++++ .../monitor-pc/components/biz-select/list.tsx | 131 +++++++++++++++++- bkmonitor/webpack/src/monitor-pc/index.ts | 1 + .../webpack/src/monitor-pc/lang/button.ts | 2 + .../webpack/src/monitor-pc/lang/message.ts | 7 + .../src/monitor-pc/mixins/userStoreConfig.ts | 4 +- bkmonitor/webpack/src/monitor-pc/shims.d.ts | 1 + .../webpack/src/monitor-pc/store/getters.js | 2 + .../src/monitor-pc/store/modules/app.js | 2 + 11 files changed, 257 insertions(+), 8 deletions(-) diff --git a/bkmonitor/webpack/src/monitor-common/shim.d.ts b/bkmonitor/webpack/src/monitor-common/shim.d.ts index daef0174d7..d3111662e8 100644 --- a/bkmonitor/webpack/src/monitor-common/shim.d.ts +++ b/bkmonitor/webpack/src/monitor-common/shim.d.ts @@ -27,6 +27,7 @@ import type { ISpaceItem } from './typings'; declare global { interface Window { + default_biz_id: number | number; space_list: ISpaceItem[]; cc_biz_id: number; bk_biz_id: number; diff --git a/bkmonitor/webpack/src/monitor-common/utils/index.ts b/bkmonitor/webpack/src/monitor-common/utils/index.ts index f06b23c63d..aa219a0061 100644 --- a/bkmonitor/webpack/src/monitor-common/utils/index.ts +++ b/bkmonitor/webpack/src/monitor-common/utils/index.ts @@ -51,7 +51,10 @@ export const setGlobalBizId = () => { const isEmailSubscriptions = location.hash.indexOf('email-subscriptions') > -1; const isSpicialEvent = !!getUrlParam('specEvent'); const isNoBusiness = location.hash.indexOf('no-business') > -1; + const localBizId = localStorage.getItem(LOCAL_BIZ_STORE_KEY); + const defaultBizId = Number(window.default_biz_id) || ''; + const bizList = window.space_list || []; const authList = bizList.filter(item => !item.is_demo); const hasAuth = id => authList.some(item => +id === +item.bk_biz_id); @@ -81,9 +84,10 @@ export const setGlobalBizId = () => { return false; }; if (bizId !== window.bk_biz_id && !isInSpaceList(bizId) && hasAuth(window.bk_biz_id)) { - if (hasAuth(localBizId)) { - window.bk_biz_id = +localBizId; - window.cc_biz_id = +localBizId; + const newBizId = defaultBizId || localBizId; + if (hasAuth(newBizId)) { + window.bk_biz_id = +newBizId; + window.cc_biz_id = +newBizId; } const url = new URL(window.location.href); const { searchParams } = url; @@ -101,7 +105,8 @@ export const setGlobalBizId = () => { if (isNoBusiness && !bizList.length) { return true; } - const newBizId = spaceItem?.bk_biz_id || window.cc_biz_id; + // 设置过默认id时，优先取defaultBizId + const newBizId = defaultBizId || spaceItem?.bk_biz_id || window.cc_biz_id; // search with space_uid if (spaceUid) { window.space_uid = spaceUid; diff --git a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss index f13398ea99..3d0487e0c8 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss +++ b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss @@ -59,6 +59,7 @@ } .list-item { + position: relative; display: flex; align-items: center; height: 32px; @@ -70,6 +71,10 @@ &:hover { background-color: #e1ecff; + + .set-default-button { + display: block; + } } &.checked { @@ -97,6 +102,7 @@ display: inline-flex; flex: 1; flex-wrap: nowrap; + align-items: center; margin-right: 8px; @include ellipsis(); @@ -115,6 +121,25 @@ color: #66768e; } } + + .item-default-icon { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 28px; + height: 16px; + margin-left: 4px; + background-color: #4D4F56; + border-radius: 2px; + } + + .item-default-text { + font-size: 16px; + color: #fff; + vertical-align: middle; + transform: scale(0.625); + } } .list-item-right { @@ -132,4 +157,80 @@ } } } + + .set-default-button { + position: absolute; + top: 0; + right: 0; + bottom: 0; + z-index: 1; + display: none; + + .btn-style-dark { + padding: 0 12px; + font-size: 12px; + color: #fff; + background-color: #3A84FF; + border: none; + border-radius: 0; + } + + .remove { + color: #fff; + background-color: #5E6678; + } + } +} + +// 设置默认弹窗 +.confirm-dialog__set-default { + .bk-dialog-body { + padding: 18px 32px 0; + } + + .bk-dialog-footer { + padding: 24px 32px; + background-color: #fff; + border: none; + + .btn-confirm + .btn-cancel { + margin-left: 9px; + } + + .btn-confirm, .btn-cancel { + min-width: 88px; + } + } + + .confirm-dialog__hd { + font-size: 20px; + line-height: 32px; + color: #313238; + text-align: center; + letter-spacing: 0; + } + + .confirm-dialog__bd { + margin-top: 16px; + font-size: 14px; + line-height: 22px; + color: #4D4F56; + letter-spacing: 0; + } + + .confirm-dialog__bd-name { + color: #313238; + } + + .confirm-dialog__ft { + padding: 12px 16px; + margin-top: 16px; + font-size: 14px; + line-height: 22px; + color: #4D4F56; + word-break: break-all; + word-wrap: break-word; + background: #F5F6FA; + border-radius: 2px; + } } \ No newline at end of file diff --git a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx index 4a68add3dd..3d93556d68 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx +++ b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx @@ -23,10 +23,13 @@ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -import { Component, Emit, Prop } from 'vue-property-decorator'; +import { Component, Emit, Prop, Mixins } from 'vue-property-decorator'; import { Component as tsc } from 'vue-tsx-support'; +import store from '../../store/store'; + import { SPACE_TYPE_MAP } from '../../common/constant'; +import UserConfigMixin from '../../mixins/userStoreConfig'; import type { ThemeType } from './biz-select'; @@ -55,6 +58,7 @@ interface ITagsItem { name: string; type: ETagsType; } + export enum ETagsType { BCS = 'bcs' /** 容器项目 */, BKCC = 'bkcc' /** 业务 */, @@ -62,8 +66,10 @@ export enum ETagsType { BKSAAS = 'bksaas' /** 蓝鲸应用 */, MONITOR = 'monitor' /** 监控空间 */, } + +const DEFAULT_BIZ_ID = 'DEFAULT_BIZ_ID'; @Component -export default class List extends tsc { +export default class List extends Mixins(UserConfigMixin, tsc) { /** 选中的id */ @Prop({ type: Number }) checked: number; /** 列表数据 */ @@ -76,10 +82,66 @@ export default class List extends tsc { }) theme: ThemeType; + defaultSpace: IListItem = null; + setDefaultBizIdLoading = false; + isSetBizIdDefault = true; + + get defaultBizId() { + return store.getters.defaultBizId; + } + @Emit('selected') handleSelected(id: number | string) { return id; } + + created() { + !store.getters.defaultBizIdApiId && this.getUserConfigId(); + } + + // 获取当前用户的配置id + getUserConfigId() { + this.handleGetUserConfig(DEFAULT_BIZ_ID) + .then((res: number) => { + if (res) { + store.commit('app/SET_APP_STATE', { + defaultBizIdApiId: this.storeId, + }); + } + }) + .catch(e => { + console.log(e); + }); + } + + // 默认id处理 + async handleDefaultId() { + this.setDefaultBizIdLoading = true; + const defaultBizId = this.isSetBizIdDefault ? Number(this.defaultSpace.id) : 'undefined'; + this.handleSetUserConfig(DEFAULT_BIZ_ID, `${defaultBizId}`, store.getters.defaultBizIdApiId || 0) + .then(result => { + if (result) { + store.commit('app/SET_APP_STATE', { + defaultBizId, + }); + } + }) + .catch(e => { + console.log(e); + }) + .finally(() => { + this.setDefaultBizIdLoading = false; + this.defaultSpace = null; + }); + } + + // 打开弹窗 + handleDefaultBizIdDialog(e: MouseEvent, data: IListItem, isSetDefault: boolean) { + e.stopPropagation(); + this.defaultSpace = data; + this.isSetBizIdDefault = isSetDefault; + } + render() { return (
@@ -109,6 +171,11 @@ export default class List extends tsc { > ({child.space_type_id === ETagsType.BKCC ? `#${child.id}` : child.space_id || child.space_code}) + {this.defaultBizId && Number(this.defaultBizId) === child.id && ( + + {this.$tc('默认')} + + )} {!child.is_hidden_tag && ( @@ -123,6 +190,23 @@ export default class List extends tsc { ))} )} +
+ {this.defaultBizId && Number(this.defaultBizId) === child.id ? ( +
this.handleDefaultBizIdDialog(e, child, false)} + > + {this.$tc('取消默认')} +
+ ) : ( +
this.handleDefaultBizIdDialog(e, child, true)} + > + {this.$tc('设为默认')} +
+ )} +
))}
@@ -134,6 +218,49 @@ export default class List extends tsc { type='search-empty' /> )} + { + if (!val) { + this.defaultSpace = null; + } + }} + > +
+ {this.isSetBizIdDefault ? this.$tc('是否将该业务设为默认业务？') : this.$tc('是否取消默认业务？')} +
+
+ {this.$tc('业务名称')}：{this.defaultSpace?.name || ''} +
+
+ {this.isSetBizIdDefault + ? this.$tc('设为默认后，每次进入监控平台将会默认选中该业务') + : this.$tc('取消默认业务后，每次进入监控平台将会默认选中最近使用的业务而非当前默认业务')} +
+
+ + {this.$tc('确认')} + + { + this.defaultSpace = null; + }} + > + {this.$tc('取消')} + +
+ ); } diff --git a/bkmonitor/webpack/src/monitor-pc/index.ts b/bkmonitor/webpack/src/monitor-pc/index.ts index 2eb277b2ce..3665651294 100644 --- a/bkmonitor/webpack/src/monitor-pc/index.ts +++ b/bkmonitor/webpack/src/monitor-pc/index.ts @@ -119,6 +119,7 @@ if (hasRouteHash) { bkPaasHost: window.bk_paas_host, jobUrl: window.bk_job_url, k8sV2EnableList: (!data.K8S_V2_BIZ_LIST?.length ? [] : data.K8S_V2_BIZ_LIST).slice(), + defaultBizId: window.default_biz_id || '', }); window.mainComponent = new Vue({ el: '#app', diff --git a/bkmonitor/webpack/src/monitor-pc/lang/button.ts b/bkmonitor/webpack/src/monitor-pc/lang/button.ts index e2fe2c079c..2db7516b79 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/button.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/button.ts @@ -109,6 +109,8 @@ export default { 新建组: 'New Group', 自动转换: 'Auto Conversion', 修改后重试: 'Retry after modification', + 设为默认: 'Set as default', + 取消默认: 'Remove default', // 规范：平台特性 术语 新建节点: 'New Probe', diff --git a/bkmonitor/webpack/src/monitor-pc/lang/message.ts b/bkmonitor/webpack/src/monitor-pc/lang/message.ts index 00ed924d18..a4c0fd786e 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/message.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/message.ts @@ -470,6 +470,13 @@ export default { '内容正在生成中...': 'Content is being generated...', '您可以键入“/”查看更多提问示例': 'You can type "/" to view more question examples', '监控策略如何使用？': 'How to use bkmonitor strategy?', + '是否将该业务设为默认业务？': 'Should this business be set as the default business?', + '是否取消默认业务？': 'Should the default business be cancelled?', + '设为默认后，每次进入监控平台将会默认选中该业务': + 'After setting it as default, the monitoring platform will default to this business every time you enter', + '取消默认业务后，每次进入监控平台将会默认选中最近使用的业务而非当前默认业务': + 'After canceling the default business, the monitoring platform will default to the most recently used business instead of the current default business every time you enter', + // 调用分析 '仅展示前 30 条数据': 'Only the first 30 data are displayed', 查看关联调用链: 'View related call chains', diff --git a/bkmonitor/webpack/src/monitor-pc/mixins/userStoreConfig.ts b/bkmonitor/webpack/src/monitor-pc/mixins/userStoreConfig.ts index 922b8026b6..31ab1703fc 100644 --- a/bkmonitor/webpack/src/monitor-pc/mixins/userStoreConfig.ts +++ b/bkmonitor/webpack/src/monitor-pc/mixins/userStoreConfig.ts @@ -65,9 +65,9 @@ export default class UserConfigMixin extends Vue { * @param {string} value * @return {*} */ - public async handleSetUserConfig(key: string, value: string): Promise { + public async handleSetUserConfig(key: string, value: string, configId?: string): Promise { if (!this.hasBusinessAuth) return false; - return await partialUpdateUserConfig(this.storeId, { value }, { reject403: true }) + return await partialUpdateUserConfig(this.storeId || configId, { value }, { reject403: true }) .then(() => true) .catch(() => false); } diff --git a/bkmonitor/webpack/src/monitor-pc/shims.d.ts b/bkmonitor/webpack/src/monitor-pc/shims.d.ts index f059a6a92c..30aacff237 100644 --- a/bkmonitor/webpack/src/monitor-pc/shims.d.ts +++ b/bkmonitor/webpack/src/monitor-pc/shims.d.ts @@ -79,6 +79,7 @@ declare global { csrf_cookie_name: string; cc_biz_id: number | string; bk_biz_id: number | string; + default_biz_id: number | string; space_uid: string; Vue?: any; i18n: VueI18n; diff --git a/bkmonitor/webpack/src/monitor-pc/store/getters.js b/bkmonitor/webpack/src/monitor-pc/store/getters.js index bfcffc68bf..618ac70709 100644 --- a/bkmonitor/webpack/src/monitor-pc/store/getters.js +++ b/bkmonitor/webpack/src/monitor-pc/store/getters.js @@ -65,6 +65,8 @@ const getters = { paddingRoute: state => state.app.paddingRoute, k8sV2EnableList: state => state.app.k8sV2EnableList, isEnableK8sV2: state => state.app.k8sV2EnableList.some(id => (id === 0 ? true : +id === +state.app.bizId)), + defaultBizId: state => state.app.defaultBizId, + defaultBizIdApiId: state => state.app.defaultBizIdApiId, }; export default getters; diff --git a/bkmonitor/webpack/src/monitor-pc/store/modules/app.js b/bkmonitor/webpack/src/monitor-pc/store/modules/app.js index cc383db957..10e0872c76 100644 --- a/bkmonitor/webpack/src/monitor-pc/store/modules/app.js +++ b/bkmonitor/webpack/src/monitor-pc/store/modules/app.js @@ -83,6 +83,8 @@ const state = { bizIdMap: new Map(), paddingRoute: null, k8sV2EnableList: [], + defaultBizId: '', + defaultBizIdApiId: '', }; const mutations = { From 170449096d126f252fe199991bd542036543580f Mon Sep 17 00:00:00 2001 From: liang ling Date: Fri, 17 Jan 2025 16:02:18 +0800 Subject: [PATCH 08/41] =?UTF-8?q?feat:=20=E6=96=B0=E7=89=88=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=20(#4861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: EmilyMei <447693773@qq.com> Co-authored-by: goodGai <106252008+goodGai@users.noreply.github.com> --- .../webpack/src/apm/pages/home/apm-home.tsx | 25 +- .../pages/home/components/apm-home-list.tsx | 6 + .../src/fta-solutions/pages/event/event.tsx | 14 +- .../webpack/src/monitor-pc/common/constant.ts | 22 +- .../components/ai-whale/ai-whale.tsx | 129 +--- .../components/biz-select/list.scss | 46 +- .../monitor-pc/components/time-range/utils.ts | 26 + .../webpack/src/monitor-pc/i18n/commmon.ts | 2 + .../webpack/src/monitor-pc/lang/new-home.ts | 65 ++ .../src/monitor-pc/lang/placeholder.ts | 2 +- .../webpack/src/monitor-pc/pages/app.tsx | 22 +- .../dashboard-container.tsx | 9 +- .../monitor-pc/pages/header-setting-modal.tsx | 6 +- .../components/add-alarm-chart-dialog.scss | 77 ++ .../components/add-alarm-chart-dialog.tsx | 389 ++++++++++ .../new-home/components/ai-whale-input.scss | 97 +++ .../new-home/components/ai-whale-input.tsx | 167 ++++ .../components/header-setting-modal.scss | 271 +++++++ .../components/header-setting-modal.tsx | 247 ++++++ .../new-home/components/home-alarm-chart.scss | 188 +++++ .../new-home/components/home-alarm-chart.tsx | 418 ++++++++++ .../new-home/components/home-biz-list.scss | 312 ++++++++ .../new-home/components/home-biz-list.tsx | 516 +++++++++++++ .../home/new-home/components/home-select.scss | 343 +++++++++ .../home/new-home/components/home-select.tsx | 721 ++++++++++++++++++ .../new-home/components/quick-access.scss | 207 +++++ .../home/new-home/components/quick-access.tsx | 182 +++++ .../components/recent-alarm-events.scss | 155 ++++ .../components/recent-alarm-events.tsx | 533 +++++++++++++ .../new-home/components/recent-alarm-tab.scss | 106 +++ .../new-home/components/recent-alarm-tab.tsx | 243 ++++++ .../components/recent-favorites-list.scss | 171 +++++ .../components/recent-favorites-list.tsx | 281 +++++++ .../components/recent-favorites-tab.scss | 108 +++ .../components/recent-favorites-tab.tsx | 269 +++++++ .../pages/home/new-home/new-home.scss | 36 + .../pages/home/new-home/new-home.tsx | 55 ++ .../monitor-pc/pages/home/new-home/type.ts | 93 +++ .../monitor-pc/pages/home/new-home/utils.ts | 118 +++ .../monitor-k8s/components/common-table.tsx | 3 + .../src/monitor-pc/pages/nav-tools.scss | 6 +- .../src/monitor-pc/pages/nav-tools.tsx | 22 +- .../src/monitor-pc/router/home/index.ts | 3 +- .../static/images/png/new-page/aiWhale.png | Bin 0 -> 796 bytes .../static/images/png/new-page/dashboard.png | Bin 0 -> 1573 bytes .../static/images/png/new-page/home-bg.png | Bin 0 -> 232901 bytes .../images/png/new-page/home-search.png | Bin 0 -> 18159 bytes .../images/png/new-page/loadingChart.png | Bin 0 -> 382 bytes .../static/images/png/new-page/retrieval.png | Bin 0 -> 1516 bytes .../images/png/new-page/search-icon.png | Bin 0 -> 7311 bytes .../static/images/png/new-page/service.png | Bin 0 -> 2245 bytes .../src/monitor-pc/store/modules/ai-whale.ts | 216 ++++++ .../caller-bar-chart/caller-bar-chart.tsx | 4 +- .../trend-chart/trend-chart.tsx | 4 +- .../trace/pages/alarm-shield/alarm-shield.tsx | 7 +- 55 files changed, 6771 insertions(+), 171 deletions(-) create mode 100644 bkmonitor/webpack/src/monitor-pc/lang/new-home.ts create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.scss create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.tsx create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/type.ts create mode 100644 bkmonitor/webpack/src/monitor-pc/pages/home/new-home/utils.ts create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/aiWhale.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/dashboard.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/home-bg.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/home-search.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/loadingChart.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/retrieval.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/search-icon.png create mode 100644 bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/service.png create mode 100644 bkmonitor/webpack/src/monitor-pc/store/modules/ai-whale.ts diff --git a/bkmonitor/webpack/src/apm/pages/home/apm-home.tsx b/bkmonitor/webpack/src/apm/pages/home/apm-home.tsx index bfdebd3ed7..18f7c84923 100644 --- a/bkmonitor/webpack/src/apm/pages/home/apm-home.tsx +++ b/bkmonitor/webpack/src/apm/pages/home/apm-home.tsx @@ -53,6 +53,7 @@ import type { INavItem } from 'monitor-pc/pages/monitor-k8s/typings'; import './apm-home.scss'; import '@blueking/search-select-v3/vue2/vue2.css'; +import { addAccessRecord } from 'monitor-api/modules/overview'; @Component({}) export default class AppList extends Mixins(authorityMixinCreate(authorityMap)) { @@ -205,7 +206,7 @@ export default class AppList extends Mixins(authorityMixinCreate(authorityMap)) : String(appSearchParams.is_enabled_profiling), }, }; - this.$router.replace(routerParams).catch(() => {}); + this.$router.replace(routerParams).catch(() => { }); } /** * @description 时间范围 @@ -224,6 +225,27 @@ export default class AppList extends Mixins(authorityMixinCreate(authorityMap)) this.refreshKey++; } + /** + * apm 服务埋点 + * @param item 调整的服务相关参数 + */ + handleGotoService(item) { + try { + const queryString = item.url.split('?')[1]; + const params = new URLSearchParams(queryString); + // 获取 filter-app_name 的值 + const appName = params.get('filter-app_name'); + const app = this.appList.find(app => app.app_name === appName); + // 新版首页最近使用埋点 + addAccessRecord({ + function: 'apm_service', + config: { application_id: app.application_id, service_name: item.value }, + }); + } catch (error) { + console.log('error', error); + } + } + /** * @description 自动刷新 * @param val @@ -504,6 +526,7 @@ export default class AppList extends Mixins(authorityMixinCreate(authorityMap)) authority={this.appData?.permission[authorityMap.VIEW_AUTH]} authorityDetail={authorityMap.VIEW_AUTH} timeRange={this.timeRange} + onGoToServiceByLink={val => this.handleGotoService(val)} onRouteUrlChange={this.handleReplaceRouteUrl} /> diff --git a/bkmonitor/webpack/src/apm/pages/home/components/apm-home-list.tsx b/bkmonitor/webpack/src/apm/pages/home/components/apm-home-list.tsx index 4a124d4a35..90010b96c4 100644 --- a/bkmonitor/webpack/src/apm/pages/home/components/apm-home-list.tsx +++ b/bkmonitor/webpack/src/apm/pages/home/components/apm-home-list.tsx @@ -62,6 +62,7 @@ export default class ApmServiceList extends tsc< IProps, { onRouteUrlChange: (params: Record) => void; + onGoToServiceByLink?: () => void; } > { @Prop() appData: Partial; @@ -510,6 +511,10 @@ export default class ApmServiceList extends tsc< }); } + handleGotoService(item) { + this.$emit('goToServiceByLink', item); + } + /** * @description 清空搜索条件 * @param value @@ -690,6 +695,7 @@ export default class ApmServiceList extends tsc< pagination={this.pagination} scrollLoading={false} onCollect={val => this.handleCollect(val)} + onGoToServiceByLink={val => this.handleGotoService(val)} onLimitChange={this.handlePageLimitChange} onPageChange={this.handlePageChange} onSortChange={val => this.handleSortChange(val as any)} diff --git a/bkmonitor/webpack/src/fta-solutions/pages/event/event.tsx b/bkmonitor/webpack/src/fta-solutions/pages/event/event.tsx index 04a984f1b1..da7e02ee28 100644 --- a/bkmonitor/webpack/src/fta-solutions/pages/event/event.tsx +++ b/bkmonitor/webpack/src/fta-solutions/pages/event/event.tsx @@ -607,8 +607,10 @@ class Event extends Mixins(authorityMixinCreate(eventAuth)) { }); vm.handleBatchAlert(params.batchAction); } else { - // 正常进入告警页情况下不打开详情，只有通过告警通知进入的才展开详情 - const needShowDetail = !!vm.$route.query.collectId && location.search.includes('specEvent'); + // 正常进入告警页情况下不打开详情，只有通过告警通知进入的才展开详情（带collectId） + // 新版首页搜索跳转过来打开详情(带alertId) + const needShowDetail = + (!!vm.$route.query.collectId || !!vm.$route.query.alertId) && location.search.includes('specEvent'); if (needShowDetail) { vm.handleFirstShowDetail(); } @@ -736,6 +738,14 @@ class Event extends Mixins(authorityMixinCreate(eventAuth)) { /* 带collectId是事件范围设为近15天 */ defaultData.timeRange = ['now-30d', 'now']; } + + /** 新版首页带alertId跳转事件中心 */ + if (defaultData.alertId) { + defaultData.queryString = defaultData.queryString + ? `${defaultData.queryString} AND id : ${defaultData.alertId}` + : `id : ${defaultData.alertId}`; + } + /** 处理指标参数 */ if (defaultData.metricId?.length) { const metricStr = `metric : (${defaultData.metricId.map(item => `"${item}"`).join(' OR ')})`; diff --git a/bkmonitor/webpack/src/monitor-pc/common/constant.ts b/bkmonitor/webpack/src/monitor-pc/common/constant.ts index 5ba891dee1..84fffa3a8d 100644 --- a/bkmonitor/webpack/src/monitor-pc/common/constant.ts +++ b/bkmonitor/webpack/src/monitor-pc/common/constant.ts @@ -36,8 +36,8 @@ export const SPACE_TYPE_MAP = { backgroundColor: '#2B354D', }, light: { - color: '#63656E', - backgroundColor: '#CDE8FB', + color: '#3A84FF', + backgroundColor: '#EDF4FF', }, }, default: { @@ -48,7 +48,7 @@ export const SPACE_TYPE_MAP = { }, light: { color: '#63656E', - backgroundColor: '#DEDEDE', + backgroundColor: '#F0F1F5', }, }, bkci: { @@ -58,8 +58,8 @@ export const SPACE_TYPE_MAP = { backgroundColor: '#4C3232', }, light: { - color: '#63656E', - backgroundColor: '#F8D8D4', + color: '#E71818', + backgroundColor: '#FFEBEB', }, }, bcs: { @@ -69,8 +69,8 @@ export const SPACE_TYPE_MAP = { backgroundColor: '#453921', }, light: { - color: '#63656E', - backgroundColor: '#FFF2C9', + color: '#E38B02', + backgroundColor: '#FDEED8', }, }, paas: { @@ -80,8 +80,8 @@ export const SPACE_TYPE_MAP = { backgroundColor: '#223B2B', }, light: { - color: '#63656E', - backgroundColor: '#D8EDD9', + color: '#14A568', + backgroundColor: '#E4FAF0', }, }, bksaas: { @@ -91,8 +91,8 @@ export const SPACE_TYPE_MAP = { backgroundColor: '#223B2B', }, light: { - color: '#63656E', - backgroundColor: '#D8EDD9', + color: '#14A568', + backgroundColor: '#E4FAF0', }, }, }; diff --git a/bkmonitor/webpack/src/monitor-pc/components/ai-whale/ai-whale.tsx b/bkmonitor/webpack/src/monitor-pc/components/ai-whale/ai-whale.tsx index b4898e4aa3..b8bd2b570a 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/ai-whale/ai-whale.tsx +++ b/bkmonitor/webpack/src/monitor-pc/components/ai-whale/ai-whale.tsx @@ -27,17 +27,12 @@ import { Component, Prop, Ref, Watch } from 'vue-property-decorator'; import { Component as tsc } from 'vue-tsx-support'; -import AiBlueking, { - RoleType, - type IMessage, - ChatHelper, - MessageStatus, - type ISendData, -} from '@blueking/ai-blueking/vue2'; +import AiBlueking, { RoleType, type ChatHelper } from '@blueking/ai-blueking/vue2'; import { fetchRobotInfo } from 'monitor-api/modules/commons'; -import { copyText, getCookie, random } from 'monitor-common/utils/utils'; +import { copyText, random } from 'monitor-common/utils/utils'; import { throttle } from 'throttle-debounce'; +import aiWhaleStore from '../../store/modules/ai-whale'; import { getEventPaths } from '../../utils'; import './ai-whale.scss'; @@ -149,9 +144,7 @@ export default class AiWhale extends tsc<{ lastRecordTime = 0; /* AI Blueking */ - messages: IMessage[] = []; prompts = questions.map((v, index) => ({ id: index + 1, content: window.i18n.tc(v) })); - loading = false; background = '#f5f7fa'; headBackground = 'linear-gradient(267deg, #2dd1f4 0%, #1482ff 95%)'; positionLimit = { @@ -166,24 +159,34 @@ export default class AiWhale extends tsc<{ bottom: 20, top: window.innerHeight - 600 - 20, }; - showAIBlueking = false; chatHelper: ChatHelper = null; chartId = random(10); mousemoveFn: (event: MouseEvent) => void; resizeFn = () => {}; + get showAIBlueking() { + return aiWhaleStore.showAIBlueking; + } + + get messages() { + return aiWhaleStore.messages; + } + + get loading() { + return aiWhaleStore.loading; + } get space() { const { bizId } = this.$store.getters; return this.$store.getters.bizList.find(item => item.id === bizId) || { name: '', type_name: '' }; } @Watch('enableAiAssistant', { immediate: true }) enableAiAssistantChange() { - this.enableAiAssistant && this.initStreamChatHelper(); + this.enableAiAssistant && aiWhaleStore.initStreamChatHelper(); } created() { this.mousemoveFn = throttle(50, this.handleMousemove); this.resizeFn = throttle(50, this.handleWindowResize); - this.messages = this.getDefaultMessage(); + aiWhaleStore.setDefaultMessage(); window.addEventListener('resize', this.resizeFn); } @@ -442,114 +445,26 @@ export default class AiWhale extends tsc<{ }#/strategy-config/add`; window.open(url); } - initStreamChatHelper() { - // 聊天开始 - const handleStart = () => { - this.loading = true; - this.messages.push({ - role: RoleType.Assistant, - content: this.$tc('内容正在生成中...'), - status: MessageStatus.Loading, - }); - }; - // 接收消息 - const handleReceiveMessage = (message: string) => { - const currentMessage = this.messages.at(-1); - if (currentMessage.content === this.$tc('内容正在生成中...')) { - // 如果是loading状态，直接覆盖 - currentMessage.content = message; - } else if (currentMessage.status === 'loading') { - // 如果是后续消息，就追加消息 - currentMessage.content += message; - } - }; - // 聊天结束 - const handleEnd = () => { - this.loading = false; - const currentMessage = this.messages.at(-1); - // loading 情况下终止 - if (currentMessage.content === this.$tc('内容正在生成中...')) { - currentMessage.content = '聊天内容已中断'; - currentMessage.status = MessageStatus.Error; - return; - } - currentMessage.status = MessageStatus.Success; - }; - // 错误处理 - const handleError = (message: string) => { - if (message.includes('user authentication failed')) { - // 未登录，跳转登录 - const loginUrl = new URL(process.env.BK_LOGIN_URL); - loginUrl.searchParams.append('c_url', location.origin); - window.location.href = loginUrl.href; - } else { - // 处理错误消息 - const currentMessage = this.messages.at(-1); - currentMessage.status = MessageStatus.Error; - currentMessage.content = message; - this.loading = false; - } - }; - this.chatHelper = new ChatHelper( - `${window.site_url}rest/v2/ai_assistant/chat/chat_v2/`, - handleStart, - handleReceiveMessage, - handleEnd, - handleError - ); - } handleAiBluekingClear() { - this.messages = this.getDefaultMessage(); - } - handleAiBluekingSend(message: ISendData) { - // 记录当前消息记录 - // const chatHistory = [...this.messages]; - // 添加一条消息 - this.messages.push({ - role: RoleType.User, - content: message.content, - cite: message.cite, - }); - // 根据参数构造输入内容 - const input = message.prompt - ? message.prompt // 如果有 prompt，直接使用 - : message.cite - ? `${message.content}: ${message.cite}` // 如果有 cite，拼接 content 和 cite - : message.content; - // ai 消息，id是唯一标识当前流，调用 chatHelper.stop 的时候需要传入 - this.chatHelper.stream( - { - query: input, - type: 'nature', - polish: true, - stream: true, - bk_biz_id: window.bk_biz_id, - }, - this.chartId, - { - 'X-CSRFToken': window.csrf_token || getCookie(window.csrf_cookie_name), - 'X-Requested-With': 'XMLHttpRequest', - 'Source-App': window.source_app, - } - ); + aiWhaleStore.setDefaultMessage(); } handleAiBluekingStop() { this.chatHelper.stop(this.chartId); } handleAiBluekingClose() { - this.showAIBlueking = false; + aiWhaleStore.setShowAIBlueking(false); } handleAiBluekingChoosePrompt(prompt) { console.log('choose prompt', prompt); } handleToggleAiBlueking() { - this.showAIBlueking = !this.showAIBlueking; + aiWhaleStore.setShowAIBlueking(!this.showAIBlueking); // this.startPosition.left = this.whalePosition.left +; } handleAiBluekingClick(v: string) { const data = JSON.parse(v); if (data?.type !== 'send') return; - this.handleAiBluekingSend(data); + aiWhaleStore.handleAiBluekingSend(data); } createAIContent() { const countSpan = count => { @@ -802,9 +717,9 @@ export default class AiWhale extends tsc<{ onChoose-prompt={this.handleAiBluekingChoosePrompt} onClear={this.handleAiBluekingClear} onClose={this.handleAiBluekingClose} - onSend={this.handleAiBluekingSend} + onSend={aiWhaleStore.handleAiBluekingSend} onShowDialog={(v: boolean) => { - this.showAIBlueking = v; + aiWhaleStore.setShowAIBlueking(v); }} onStop={this.handleAiBluekingStop} /> diff --git a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss index 3d0487e0c8..e3116ee3f6 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss +++ b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.scss @@ -1,11 +1,11 @@ @import '../../theme//index.scss'; .biz-list-wrap { - // $bg-dark: #39455f; + // $bg-dark: #39455f;$bg-dark $bg-dark: #192133; - // $color-dark:#c3d0e7; - $color-dark:#c3d0e7; - // $border-dark: #434e68; + // $color-dark:#c3d0e7;$color-dark + $color-dark: #c3d0e7; + // $border-dark: #434e68;$border-dark $border-dark: #2c354d; cursor: initial; @@ -28,7 +28,7 @@ &::before { display: initial; } - } + } .list-group-name { height: 32px; @@ -53,7 +53,7 @@ } .list-group-name { - color: #66768e;; + color: #66768e; } } } @@ -67,7 +67,7 @@ line-height: 32px; color: #63656e; cursor: pointer; - transition: background-color .1s ease-in-out; + transition: background-color 0.1s ease-in-out; &:hover { background-color: #e1ecff; @@ -86,16 +86,22 @@ color: $color-dark; &:hover { - // background-color: #323c53; + // background-color: #323c53;background-color background: #272f45; } &.checked { color: #fff; - // background-color: #272f45; + // background-color: #272f45;background-color background: #234071; } } + + &.light { + &:hover { + color: #3a84ff; + } + } } .list-item-left { @@ -109,11 +115,12 @@ .list-item-name { @include ellipsis(); - // white-space: nowrap; + // white-space: nowrap;white-space } .list-item-id { margin-left: 8px; + color: #c4c6cc; @include ellipsis(); @@ -130,7 +137,7 @@ width: 28px; height: 16px; margin-left: 4px; - background-color: #4D4F56; + background-color: #4d4f56; border-radius: 2px; } @@ -170,16 +177,16 @@ padding: 0 12px; font-size: 12px; color: #fff; - background-color: #3A84FF; + background-color: #3a84ff; border: none; border-radius: 0; } .remove { color: #fff; - background-color: #5E6678; + background-color: #5e6678; } - } + } } // 设置默认弹窗 @@ -197,7 +204,8 @@ margin-left: 9px; } - .btn-confirm, .btn-cancel { + .btn-confirm, + .btn-cancel { min-width: 88px; } } @@ -214,7 +222,7 @@ margin-top: 16px; font-size: 14px; line-height: 22px; - color: #4D4F56; + color: #4d4f56; letter-spacing: 0; } @@ -227,10 +235,10 @@ margin-top: 16px; font-size: 14px; line-height: 22px; - color: #4D4F56; + color: #4d4f56; word-break: break-all; word-wrap: break-word; - background: #F5F6FA; + background: #f5f6fa; border-radius: 2px; } -} \ No newline at end of file +} diff --git a/bkmonitor/webpack/src/monitor-pc/components/time-range/utils.ts b/bkmonitor/webpack/src/monitor-pc/components/time-range/utils.ts index 9c5e03bd6a..7099d64ba9 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/time-range/utils.ts +++ b/bkmonitor/webpack/src/monitor-pc/components/time-range/utils.ts @@ -150,6 +150,32 @@ export const shortcuts = [ }, ]; +// 生成 formatterFunc 函数 +export const generateFormatterFunc = value => { + const [start, end] = handleTransformToTimestamp(value); + return timestamp => { + const duration = end - start; + const time = dayjs(timestamp); + + if (duration < 60) { + return time.format('mm:ss'); + } + if (duration < 60 * 60) { + return time.format('HH:mm:ss'); + } + if (duration <= 60 * 60 * 24) { + return time.format('HH:mm'); + } + if (duration < 60 * 60 * 24 * 7) { + return time.format('MM-DD HH:mm'); + } + if (duration < 60 * 60 * 24 * 30) { + return time.format('MM-DD'); + } + return time.format('MM-DD'); + }; +}; + /** 默认的时间范围：近一小时 */ export const DEFAULT_TIME_RANGE: TimeRangeType = ['now-1h', 'now']; diff --git a/bkmonitor/webpack/src/monitor-pc/i18n/commmon.ts b/bkmonitor/webpack/src/monitor-pc/i18n/commmon.ts index 7d516379ee..70be4e2614 100644 --- a/bkmonitor/webpack/src/monitor-pc/i18n/commmon.ts +++ b/bkmonitor/webpack/src/monitor-pc/i18n/commmon.ts @@ -30,6 +30,7 @@ import dropdown from '../lang/dropdown'; import formContent from '../lang/form-content'; import formLabel from '../lang/form-label'; import message from '../lang/message'; +import newHome from '../lang/new-home'; import placeholder from '../lang/placeholder'; import route from '../lang/route'; import strategy from '../lang/strategy'; @@ -58,6 +59,7 @@ const MonitorLangData = { tooltips, title, strategy, + newHome, }; // 比较两个翻译文件是否多出来的词条 diff --git a/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts b/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts new file mode 100644 index 0000000000..1031c0ddc8 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts @@ -0,0 +1,65 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +export default { + // Messages : Success | Warning | Error | Info + // 规范： 动词-主体-结果 如 新建应用成功 New application successful + // 规范： 仅首字母大写 + 容器服务: 'Container service', + 日志检索: 'Log retrieval', + 关联的告警: 'Related Alarms', + 关联的屏蔽策略: 'Associated blocking policy', + '有问题就问 AI 小鲸': 'If you have any questions, ask Xiaojing', + 最近使用: 'Recently Used', + 展示模块: 'Display module', + 快捷入口: 'Quick access', + 暂无快捷入口: 'No quick entry', + 快捷入口管理: 'Quick entry management', + 最近告警事件: 'Recent warning events', + '业务：{0}': 'Business: {0}', + '删除后，该tab下的视图也会一起删除': 'After deletion, the views under the tab will also be deleted.', + '确定删除该视图？': 'Are you sure you want to delete this view?', + '确定删除该业务视图？': 'Are you sure you want to delete this business view?', + 新增图表: 'New charts', + 修改图表: 'Modify chart', + 图表名称: 'Chart name', + 清空历史: 'Clear History', + 暂无相关记录: 'No relevant records', + 请选择策略: 'Please select a strategy', + '请输入图表名称，默认为策略名称': 'Please enter a chart name, the default is the strategy name', + '当前还未配置业务，快点击添加业务按钮新增图表': + 'There is no service configured yet. Click the Add Service button to add a new chart.', + 删除该业务: 'Delete this business', + 添加业务: 'Add a service', + '请输入 IP / Trace ID / 容器集群 / 告警ID / 策略名 进行搜索': + 'Please enter IP / Trace ID / container cluster / alarm ID / policy name to search', + 清空搜索: 'Clear search', + '当前正在加载 采集任务': 'Currently loading the collection task', + 相关功能: 'Related functions', + '当前输入条件无匹配结果，请清空后重新输入': + 'There is no matching result for the current input conditions, please clear and re-enter', + '当前业务还未配置视图，快点击下方按钮新增图表': + 'The current business has not configured a view. Click the button below to add a new chart.', +}; diff --git a/bkmonitor/webpack/src/monitor-pc/lang/placeholder.ts b/bkmonitor/webpack/src/monitor-pc/lang/placeholder.ts index 7bde13fe2b..c6c389bc82 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/placeholder.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/placeholder.ts @@ -88,7 +88,7 @@ export default { 'Enter the plugin name, which only starts with a letter, only supports letters, underscores and numbers, and the length cannot exceed 30 characters', '输入请求 URL': 'Enter Request URL', '输入指标名/ID': 'Enter Metric Name/ID', - '输入屏蔽内容、ID': 'Enter the content and ID to be blocked', + '输入屏蔽内容、ID、策略ID': 'Enter the intensity content, ID, strategy ID to be blocked', '输入关键字，模糊搜索': 'Enter keywords for fuzzy search', '输入空间ID、空间名': 'Space ID / Name', 输入规则组名: 'Enter rule group name', diff --git a/bkmonitor/webpack/src/monitor-pc/pages/app.tsx b/bkmonitor/webpack/src/monitor-pc/pages/app.tsx index 942f851d38..8b64403a40 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/app.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/app.tsx @@ -62,6 +62,7 @@ import './app.scss'; // import NoticeComponent from '@blueking/notice-component-vue2'; import '@blueking/notice-component-vue2/dist/style.css'; import GlobalConfigMixin from '../mixins/globalConfig'; +import aiwhaleStore from '../store/modules/ai-whale'; const changeNoticeRouteList = [ 'strategy-config-add', 'strategy-config-edit', @@ -80,7 +81,6 @@ const userConfigModal = new UserConfigMixin(); const globalConfigModal = new GlobalConfigMixin(); const NEW_UER_GUDE_KEY = 'NEW_UER_GUDE_KEY'; const OVERSEAS_SITES_MENU = 'OVERSEAS_SITES_MENU'; -const AI_USER_LIST = 'AI_USER_LIST'; const STORE_USER_MENU_KEY = 'USER_STORE_MENU_KEY'; const ERROR_PAGE_ROUTE_NAME = 'error-exception'; export const WATCH_SPACE_STICKY_LIST = 'WATCH_SPACE_STICKY_LIST'; /** 监听空间置顶列表数据事件key */ @@ -114,7 +114,6 @@ export default class App extends tsc { headerNav = 'home'; headerNavChange = true; overseaGlobalList: IOverseasConfig[] = []; - enableAiAssistant = false; // 是否显示AI智能助手 menuStore = ''; hideNavCount = 0; spacestickyList: string[] = []; /** 置顶的空间列表 */ @@ -126,6 +125,10 @@ export default class App extends tsc { @ProvideReactive('toggleSet') toggleSet: boolean = localStorage.getItem('navigationToogle') === 'true'; @ProvideReactive('readonly') readonly: boolean = !!window.__BK_WEWEB_DATA__?.readonly || !!getUrlParam('readonly'); routeViewKey = random(10); + // 是否显示AI智能助手 + get enableAiAssistant() { + return aiwhaleStore.enableAiAssistant; + } get bizId() { return this.$store.getters.bizId; } @@ -270,7 +273,9 @@ export default class App extends tsc { // 一级导航宽度变化时触发自动计算收缩 handleNavHeaderResize() { if (!(this.$refs.NavTools as any)?.$el) return; - const minWidth = 772 + (this.$refs.NavTools as any).$el.clientWidth + 2; + /** 新版首页无需展示右侧的全站搜索框 */ + const BASE_MIM_WIDTH = this.$route.name && this.$route.name === 'home' ? 672 : 772; + const minWidth = BASE_MIM_WIDTH + (this.$refs.NavTools as any).$el.clientWidth + 2; if (this.navHeaderRef?.clientWidth >= minWidth + SPACE_WIDTH) { this.hideNavCount = 0; return; @@ -698,12 +703,7 @@ export default class App extends tsc { this.overseaGlobalList = await globalConfigModal.handleGetGlobalConfig(OVERSEAS_SITES_MENU); } async getAiUserConfig() { - if (!window.enable_ai_assistant) { - this.enableAiAssistant = false; - return; - } - const list: string[] = await globalConfigModal.handleGetGlobalConfig(AI_USER_LIST); - this.enableAiAssistant = list.includes(window.username); + aiwhaleStore.setEnableAiAssistantAction(); } render() { @@ -731,7 +731,7 @@ export default class App extends tsc { class='page-wrapper' name='noCache' /> - {this.$route.name === 'home' ? ( + {this.$route.name === 'home' || this.$route.name === 'newHome' ? (
{ slot='header' >
- {process.env.APP !== 'external' && this.commonHeader()} + {process.env.APP !== 'external' && this.$route.name !== 'home' && this.commonHeader()} {this.routeList.map( ({ id, route, name }, index) => this.routeList.length - index > this.hideNavCount && ( diff --git a/bkmonitor/webpack/src/monitor-pc/pages/grafana/dashboard-container/dashboard-container.tsx b/bkmonitor/webpack/src/monitor-pc/pages/grafana/dashboard-container/dashboard-container.tsx index d54517b77a..43d0c461f6 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/grafana/dashboard-container/dashboard-container.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/grafana/dashboard-container/dashboard-container.tsx @@ -26,6 +26,8 @@ import { Component, Emit, Mixins, Prop, Provide, ProvideReactive, Ref } from 'vue-property-decorator'; import { ofType } from 'vue-tsx-support'; +import { addAccessRecord } from 'monitor-api/modules/overview'; + import authorityMixinCreate from '../../../mixins/authorityMixin'; import * as grafanaAuth from '../authority-map'; import DashboardAside, { GRAFANA_HOME_ID } from './dashboard-aside'; @@ -67,13 +69,18 @@ class DashboardContainer extends Mixins(authorityMixinCreate(grafanaAuth, 'creat this.handleGotoFavaritate(item as any); } } - handleGotoFavaritate(item: IFavListItem) { + async handleGotoFavaritate(item: IFavListItem) { if (item.uid === GRAFANA_HOME_ID) { this.$router.push({ name: 'grafana-home', }); } else { // console.info(item.url, '+++++++++++++++++'); + // 新版首页最近使用埋点 + await addAccessRecord({ + function: 'dashboard', + config: { dashboard_uid: item.uid }, + }); this.$router.push({ path: item.url?.startsWith?.('/grafana') ? item.url : `/grafana/d/${item.uid}`, params: { diff --git a/bkmonitor/webpack/src/monitor-pc/pages/header-setting-modal.tsx b/bkmonitor/webpack/src/monitor-pc/pages/header-setting-modal.tsx index 00dac6e2f7..6a49319e93 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/header-setting-modal.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/header-setting-modal.tsx @@ -85,7 +85,10 @@ class HeaderSettingModal extends Mixins(UserConfigMixin) { } } getStoreRoutes() { - const configList = !this.storeUserConfigList?.length ? DEFAULT_ROUTE_LIST : this.storeUserConfigList; + const configList = + !Array.isArray(this.storeUserConfigList) || this.storeUserConfigList.length === 0 + ? DEFAULT_ROUTE_LIST + : this.storeUserConfigList; return this.getStoreRoutesByIdList(configList); } getStoreRoutesByIdList(routeIds: string[]) { @@ -177,6 +180,7 @@ class HeaderSettingModal extends Mixins(UserConfigMixin) {
    {item.children?.map(child => (
  • this.handleStoreRoute(child)} > diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.scss new file mode 100644 index 0000000000..00ceae2ef8 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.scss @@ -0,0 +1,77 @@ +@import '../../../../theme/index.scss'; + +.add-task-select-ext { + padding: 3px 0; + background: #fff !important; + .bk-option-content { + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 6px; + .strategy-name { + width: 75%; + font-family: MicrosoftYaHei; + font-size: 12px; + line-height: 22px; + color: #4d4f56; + @include ellipsis(); + + &.selected { + color: #3a84ff; + } + &.has-tag { + color: #c4c6cc; + .icon-monitor { + color: #c4c6cc; + } + } + } + + .strategy-status { + .strategy-tag { + display: inline-block; + padding: 0 12px; + font-size: 12px; + line-height: 22px; + color: #4d4f56; + text-align: center; + background: #f0f1f5; + border-radius: 2px; + } + + .icon-monitor { + font-size: 28px; + color: #3a84ff; + vertical-align: middle; + } + } + &:hover { + background: #f5f7fa; + } + } + &.is-deleted { + .bk-option-content { + .strategy-tag { + color: #e71818; + background-color: #ffebeb; + } + .strategy-name { + color: #c4c6cc; + text-decoration: line-through; + } + .icon-monitor { + color: #c4c6cc; + } + } + } +} + +.add-chart-strategy { + margin-bottom: 18px; +} + +.task-add-dialog-footer { + button { + margin-left: 8px; + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx new file mode 100644 index 0000000000..b5a7513e60 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx @@ -0,0 +1,389 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import Component from 'vue-class-component'; +import { Emit, Prop, Ref, Watch } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import { getStrategyListV2 } from 'monitor-api/modules/strategies'; + +import { EStatusType } from '../utils'; + +import './add-alarm-chart-dialog.scss'; + +interface IAddAlarmChartDialogProps { + showAddTaskDialog: boolean; + handleMenuMode: string; + currentBizId: number; + editStrategyConfig?: IStrategyConfig; +} + +interface IStrategyConfig { + name: string; + strategy_ids: number[]; + status: { + name: string; + strategy_id: number; + }[]; +} + +type IAddAlarmChartDialogEvent = { + onConfirm: (strategyIds: number[], name: string, delStrategyIdSet: Set) => void; + onCancel: () => void; + onAfterDialogLeave: () => void; +}; + +@Component({ + name: 'AddAlarmChartDialog', +}) +export default class AddAlarmChartDialog extends tsc { + @Prop({ default: false, type: Boolean }) showAddTaskDialog: boolean; + @Prop({ default: '', type: String }) handleMenuMode: string; + @Prop({ default: null, type: Number }) currentBizId: number; + @Prop({ default: {}, type: Object }) editStrategyConfig: IStrategyConfig; + + @Ref() taskFormRef; // 新增图表表单ref + + strategyList = []; // 策略列表 + + filterStrategyIdSet = new Set(); // 修改时回显的策略id列表 + + delStrategyIdSet: Set = new Set(); // 已删除的策略id列表 + + /** 表单规则 */ + rules = { + name: [{ required: true, message: window.i18n.tc('必填项'), trigger: 'blur' }], + strategy_ids: [ + { + validator: val => val.length, + message: window.i18n.tc('必填项'), + trigger: 'blur', + }, + ], + }; + + // 策略配置 + strategyConfig: IStrategyConfig = { + strategy_ids: [], + name: '', + status: [], + }; + + // select 底部加载配置 + bottomLoadingOptions = { + isLoading: false, + size: 'mini', + }; + + // 数据分页 + pagination = { + currentPage: 1, + limit: 10, + isLastPage: false, + }; + + loadingStrategyList = false; // 加载策略列表Loading + + @Watch('showAddTaskDialog') + showDialog(v) { + if (!v) return; + if (this.handleMenuMode === 'edit') { + this.strategyConfig.strategy_ids = this.editStrategyConfig.strategy_ids; + this.strategyConfig.name = this.editStrategyConfig.name; + this.strategyConfig.status = this.editStrategyConfig.status; + this.getStrategyListById(); + return; + } + this.getStrategyListByPage(); + } + + @Emit('cancel') + handleCancel() { } + + /** 表单校验 */ + handleValidate(): Promise { + return this.taskFormRef + .validate() + .then(() => true) + .catch(() => false); + } + + async getStrategyListByPage() { + if (!this.currentBizId) return; + this.loadingStrategyList = true; + try { + const { currentPage: page, limit } = this.pagination; + const data = await getStrategyListV2({ + page, + limit, + bk_biz_id: this.currentBizId, + }); + this.pagination.isLastPage = data.total <= page * limit; + this.pagination.currentPage++; + if (this.handleMenuMode === 'edit') { + this.strategyList.push( + ...(data.strategy_config_list.filter(item => { + if (!this.filterStrategyIdSet.has(item.id)) { + return true; // 保留在 filter 结果中 + } + this.filterStrategyIdSet.delete(item.id); // 从集合中移除已处理的 ID + }) || []) + ); + return; + } + this.strategyList.push(...(data.strategy_config_list || [])); + this.strategyList.sort((a, b) => { + // 根据优先级字段排序，优先级 is_shielded < is_enabled + // 将 true 视为 0，false 视为 1 进行比较 + if (a.is_enabled !== b.is_enabled) { + return (b.is_enabled ? 1 : 0) - (a.is_enabled ? 1 : 0); + } + if (a.shield_info?.is_shielded !== b.shield_info?.is_shielded) { + return (a.shield_info?.is_shielded ? 1 : 0) - (b.shield_info?.is_shielded ? 1 : 0); + } + return 0; + }); + } catch (error) { + console.log('getStrategyListByPage error', error); + } finally { + this.loadingStrategyList = false; + } + } + + // 根据策略 Id 获取数据 + async getStrategyListById() { + if (!this.currentBizId) return; + this.loadingStrategyList = true; + + try { + const data = await getStrategyListV2({ + limit: 20, + bk_biz_id: this.currentBizId, + conditions: [{ key: 'strategy_id', value: this.strategyConfig.strategy_ids }], + }); + this.filterStrategyIdSet = new Set(data.strategy_config_list.map(({ id }) => id)); + this.strategyList.unshift( + ...(this.strategyConfig.status.map(item => { + const strategy = data.strategy_config_list.find(strategy => strategy.id === item.strategy_id); + if (strategy) return strategy; + this.delStrategyIdSet.add(item.strategy_id); + return { + is_deleted: true, + name: item.name, + id: item.strategy_id, + }; + }) || []) + ); + // 如果回显值过少，手动触发触底事件 + if (this.strategyList.length < 10) { + this.handleScrollToBottom(); + } + } catch (error) { + console.log('getStrategyListById error', error); + } finally { + this.loadingStrategyList = false; + } + } + + async handleScrollToBottom() { + try { + // 判断是否为最后一页 + if (this.pagination.isLastPage) return; + this.bottomLoadingOptions.isLoading = true; + await this.getStrategyListByPage(); + this.bottomLoadingOptions.isLoading = false; + } catch (error) { + console.log('error', error); + } + } + + isSelected(id) { + return this.strategyConfig.strategy_ids.includes(id); + } + + getStrategyStatus(isDeleted = false, isShielded = false, isEnabled = true) { + let status = ''; // 默认状态 + + // 优先级 已删除 > 已屏蔽 > 已停用 + if (isDeleted) { + status = 'deleted'; + } else if (isShielded) { + status = 'shielded'; + } else if (!isEnabled) { + status = 'disabled'; + } + return EStatusType[status]; + } + + // 确定新增图表 + async handleConfirm() { + const isPass = await this.handleValidate(); + if (!isPass) return; + this.$emit('confirm', this.strategyConfig.strategy_ids, this.strategyConfig.name, this.delStrategyIdSet); + } + + // 清除相关数据 + clearConfig() { + this.taskFormRef?.clearError?.(); + this.strategyConfig.strategy_ids = []; + this.strategyConfig.name = ''; + this.pagination = { + currentPage: 1, + limit: 10, + isLastPage: false, + }; + this.filterStrategyIdSet = new Set(); + this.delStrategyIdSet = new Set(); + this.strategyList = []; + } + + render() { + return ( + { + // 重置编辑索引，关闭对话框，清除策略配置 + this.clearConfig(); + this.$emit('afterDialogLeave'); + }} + onCancel={this.handleCancel} + > + + { + + + {this.strategyList.map(item => ( + +
    + {item.name} +
    +
    + + {this.getStrategyStatus(item.is_deleted, item.shield_info?.is_shielded, item.is_enabled)} + + {this.isSelected(item.id) && } +
    +     + ))} +     +     + } + { + + + + } +     +
    + + {this.$t('确认')} + + + {this.$t('取消')} + +
    +     + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.scss new file mode 100644 index 0000000000..703fc00c51 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.scss @@ -0,0 +1,97 @@ +.ai-whale-input { + position: absolute; + top: calc(100% - 43px); + width: 100%; + + &.max-height { + top: calc(100% - 108px); + } + + .editable-div-wrapper { + position: relative; + width: 90%; + margin: 0 auto; + margin-bottom: 12px; + background: #FFFFFF; + border-radius: 2px; + + .editable-div { + position: relative; + box-sizing: border-box; + min-height: 96px; + max-height: 96px; + padding: 6px 8px; + padding-right: 30px; // 为图标腾出空间 + line-height: 18px; + text-overflow: ellipsis; + background-image: linear-gradient(#fff, #fff), linear-gradient(#74B9FF, #64DCD7); + background-clip: padding-box, border-box; + border: 1px solid transparent; + border-radius: 2px; + + .placeholder { + font-size: 12px; + color: #C4C6CC; + } + + &.animated { + min-height: 32px; + max-height: 32px; + animation: shrink 0.3s forwards; + + &:focus { + overflow-y: auto; + white-space: normal; + outline: none; + animation: expand 0.3s ease forwards; // 聚焦时运行扩展动画 + } + } + + &::-webkit-scrollbar { + width: 3px; + } + + &::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 10px; + } + + &::-webkit-scrollbar-thumb { + background: #dbdbdb; + border-radius: 10px; + + &:hover { + background: #555; + } + } + } + + .icon { + position: absolute; + top: 8px; + right: 8px; + width: 20px; + height: 17px; + pointer-events: none; + + /* 防止图标干扰文本输入 */ + } + } + + + .clear-icon { + position: absolute; + top: 40px; + right: 10px; + display: none; + width: 20px; + height: 20px; + + /* 图标下方 */ + cursor: pointer; + } + + .editable-div-wrapper:hover .clear-icon { + display: block; + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.tsx new file mode 100644 index 0000000000..6d20242346 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/ai-whale-input.tsx @@ -0,0 +1,167 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +import { Component, Emit, Prop } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import aiWhaleSrc from '../../../../static/images/png/new-page/aiWhale.png'; + +import './ai-whale-input.scss'; + +interface IAiWhaleInputProps { + categoriesHasTwoRows: boolean; +} + +interface IAiWhaleInputEvent { + onKeyDown: KeyboardEvent; +} + +@Component +export default class AiWhaleInput extends tsc { + /* 是否为两列布局 */ + @Prop({ default: false, type: Boolean }) categoriesHasTwoRows: boolean; + // @Prop({ default: false, type: Boolean }) showPlaceholder: boolean; + + /* 展示Placeholder */ + showPlaceholder = true; + /* AI小鲸 placeHolder 内容 */ + placeholderText = window.i18n.tc('有问题就问 AI 小鲸'); + /* AI小鲸 输入框的值 */ + inputValue = ''; + + // 插入回车符 + insertLineBreakAndMoveCursor() { + const selection = window.getSelection(); + if (!selection.rangeCount) return; + + const range = selection.getRangeAt(0); + range.deleteContents(); + + // 创建一个换行元素 + const br = document.createElement('br'); + + // 插入换行符 + range.insertNode(br); + + // 移动光标到换行符之后 + range.setStartAfter(br); + range.setEndAfter(br); + selection.removeAllRanges(); + selection.addRange(range); + + this.ensureCursorVisible(br); + } + + // 光标切换至可视区域 + ensureCursorVisible(node) { + // 使用 scrollIntoView 方法确保节点可见 + if (node && typeof node.scrollIntoView === 'function') { + node.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + } + } + + // 点击placeholder + focusDiv() { + // 使用 this.$refs 访问可编辑的 div + const editableDiv = this.$refs.editableDiv; + editableDiv.focus(); + + // 确保光标在内容的末尾 + const range = document.createRange(); + range.selectNodeContents(editableDiv); + range.collapse(false); + const sel = window.getSelection(); + sel.removeAllRanges(); + sel.addRange(range); + } + + // 展开文本域操作 + expandTextarea(event) { + this.showPlaceholder = false; + event.target.style.maxHeight = '96px'; + event.target.style.overflowY = 'auto'; + event.target.style.whiteSpace = 'normal'; + this.focusDiv(); + } + + // 收起文本域操作 + shrinkTextarea(event) { + if (this.categoriesHasTwoRows) return; + const content = event.target.innerText.trim(); + this.showPlaceholder = content === '' || content === this.placeholderText; + if (content === '') { + event.target.innerText = this.inputValue; + } + event.target.style.maxHeight = '32px'; + event.target.style.overflow = 'hidden'; + event.target.style.whiteSpace = 'nowrap'; + } + + // 输入事件 + handleInput(event) { + const content = event.target.innerText.trim(); + this.showPlaceholder = content === ''; + if (content === this.inputValue) { + event.target.innerText = ''; + } + } + + @Emit('keyDown') + handleKeyDown(event: KeyboardEvent) { + return event; + } + + render() { + return ( +
    +
    +
    + {this.inputValue} + {this.showPlaceholder && {this.placeholderText}} +
    + icon +
    +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss new file mode 100644 index 0000000000..d6518bf718 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss @@ -0,0 +1,271 @@ +/* stylelint-disable order/order */ + +/* stylelint-disable declaration-no-important */ +@mixin common-route-icon { + display: flex; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + margin-right: 4px; + overflow: hidden; + font-size: 12px; + color: #979BA5; +} + +.quick-access-modal { + .monitor-dialog { + bottom: inherit !important; + height: inherit !important; + min-height: inherit !important; + padding: 0; + + } + + .monitor-dialog-footer { + margin: 0; + } + + .route-setting { + display: flex; + width: 100%; + height: 100%; + + &-right { + position: relative; + flex: 0 0 246px; + flex: 0 0 200px; + width: 400px; + background: #FAFBFD; + + .right-route { + position: absolute; + top: 24px; + right: 16px; + bottom: 15px; + display: flex; + flex-direction: column; + width: 170px; + + &-title { + display: flex; + align-items: center; + width: 100%; + margin-bottom: 16px; + margin-left: 18px; + font-size: 16px; + font-weight: bold; + line-height: 24px; + color: #313238; + + .route-count { + display: flex; + align-items: center; + justify-content: center; + min-width: 24px; + height: 16px; + padding: 4px 8px; + margin-left: 8px; + font-size: 12px; + font-weight: normal; + color: #979ba5; + background-color: #eaebf0; + border-radius: 2px; + } + } + + .route-list { + display: flex; + flex-direction: column; + min-height: 280px; + overflow-x: visible; + overflow-y: auto; + + &-item { + position: relative; + flex: 0 0 32px; + width: 100%; + padding-left: 18px; + margin-bottom: 4px; + border: 1px solid transparent; + + &-main { + display: flex; + align-items: center; + padding: 6px 0; + font-size: 12px; + color: #4D4F56; + border-radius: 2px; + + &.is-dragover { + background-color: #e1ecff; + } + + .item-icon { + @include common-route-icon; + } + + .item-close { + display: flex; + display: none; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + margin-right: 10px; + margin-left: auto; + overflow: hidden; + font-size: 20px; + color: #979ba5; + + &:hover { + color: #3a84ff; + cursor: pointer; + } + } + + &:hover { + background-color: #eaebf0; + border-color: transparent; + } + + } + + &:hover { + .item-drag { + cursor: move; + visibility: inherit; + } + + .item-close { + display: flex; + } + } + + .item-drag { + @include common-route-icon; + position: absolute; + top: 8px; + left: 0; + visibility: hidden; + } + } + } + } + } + + &-left { + display: flex; + flex: 1; + flex-direction: column; + min-width: 420px; + padding: 16px 0 0 24px; + background-color: white; + + .content-header { + width: 120px; + height: 28px; + font-family: MicrosoftYaHei; + font-size: 20px; + line-height: 28px; + color: #313238; + letter-spacing: 0; + + .latest-list { + display: flex; + height: 22px; + margin-left: 16px; + font-size: 12px; + font-weight: normal; + + .latest-item { + display: flex; + align-items: center; + justify-content: center; + padding: 0 10px; + margin-right: 8px; + background-color: #f0f1f5; + border-radius: 2px; + } + } + } + + .content-routes { + display: flex; + flex-wrap: wrap; + width: 100%; + padding-top: 18px; + + .route-content { + display: flex; + flex: 0 0 160px; + flex-direction: column; + margin-right: 40px; + margin-bottom: 40px; + font-size: 12px; + + .route-title { + padding-bottom: 8px; + padding-left: 12px; + font-weight: bold; + line-height: 20px; + border-bottom: 1px solid #dcdee5; + } + + .route-list { + display: flex; + flex-direction: column; + margin-top: 6px; + font-weight: normal; + + .route-item { + display: flex; + flex: 0 0 32px; + align-items: center; + height: 32px; + padding-left: 12px; + color: #313238; + + &:hover { + cursor: pointer; + + &:not(.is-stored) { + background-color: #f0f1f5; + border-radius: 2px; + + .route-check { + visibility: visible; + } + } + } + + &.is-stored { + color: #3a84ff; + background-color: #e1ecff; + + .route-check { + color: #3a84ff; + visibility: visible !important; + } + } + + .route-check { + display: flex; + align-items: center; + justify-content: center; + width: 14px; + height: 14px; + margin-right: 12px; + margin-left: auto; + overflow: hidden; + font-size: 14px; + color: #979ba5; + visibility: hidden; + } + } + } + } + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.tsx new file mode 100644 index 0000000000..08b56de026 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.tsx @@ -0,0 +1,247 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'; +import * as tsx from 'vue-tsx-support'; + +import { deepClone } from 'monitor-common/utils'; +import MonitorDialog from 'monitor-ui/monitor-dialog'; + +import UserConfigMixin from '../../../../mixins/userStoreConfig'; +import { COMMON_ROUTE_LIST, type IRouteConfigItem } from '../../../../router/router-config'; + +import './header-setting-modal.scss'; + +// 定义组件属性接口 +interface IHeaderSettingModalProps { + show: boolean; + quickAccessList: IRouteConfigItem[]; +} + +// 定义组件事件接口 +interface IHeaderSettingModalEvent { + onChange: boolean; + onConfirm: IRouteConfigItem[]; + onStoreRoutesChange: IRouteConfigItem[]; +} + +@Component +class HeaderSettingModal extends Mixins(UserConfigMixin) { + // 接收父组件传递的属性，控制模态框显示 + @Prop({ required: true, type: Boolean }) readonly show: boolean; + @Prop({ default: () => [], type: Array }) readonly quickAccessList: IRouteConfigItem[]; + + // 定义组件内部状态 + flatRoutes: IRouteConfigItem[] = []; + dragoverId = ''; // 当前拖拽经过的路由ID + dragId = ''; // 当前拖拽的路由ID + storeRoutes: IRouteConfigItem[] = []; // 当前存储的路由配置 + + // 组件创建时调用，初始化用户配置和路由数据 + async created() { + // 初始化平面路由列表 + this.flatRoutes = COMMON_ROUTE_LIST; + } + + // 监听 show 属性的变化，控制键盘事件的监听 + @Watch('show') + handleShowChange(v: boolean) { + if (v) { + this.storeRoutes = deepClone(this.quickAccessList); + window.addEventListener('keyup', this.handleDocumentKeydown); + } else { + window.removeEventListener('keyup', this.handleDocumentKeydown); + } + } + + // 发出 change 事件，用于通知父组件模态框显示或隐藏状态的变化 + @Emit('change') + async handleShow(v: boolean) { + return v; + } + + @Emit('confirm') + handleConfirm() { + return this.storeRoutes; + } + + // 处理键盘事件，按下 Esc 键时关闭模态框 + handleDocumentKeydown(e: KeyboardEvent) { + if (e.code === 'Escape') { + this.handleShow(false); + } + } + + // 处理拖拽开始事件，记录当前拖拽的路由ID + handleDragstart(item: IRouteConfigItem) { + this.dragId = item.id; + } + + // 处理拖拽经过事件，设置当前拖拽经过的路由ID + handleDragover(item: IRouteConfigItem, e: MouseEvent) { + this.dragoverId = item.id; + e.preventDefault(); + } + + // 处理拖拽离开事件，清除当前拖拽经过的路由ID + handleDragleave() { + this.dragoverId = ''; + } + + // 处理拖拽放置事件，交换拖拽和拖拽经过的路由位置 + handleDrop(e: MouseEvent) { + if (this.dragoverId && this.dragId && this.dragId !== this.dragoverId) { + e.preventDefault(); + const dragItem = this.storeRoutes.find(item => item.id === this.dragId); + const dragoverItem = this.storeRoutes.find(item => item.id === this.dragoverId); + this.storeRoutes = this.storeRoutes.map(item => { + if (item.id === this.dragId) { + return dragoverItem; + } + if (item.id === this.dragoverId) { + return dragItem; + } + return item; + }); + this.dragoverId = ''; + this.dragId = ''; + } + } + + // 处理删除存储路由的操作 + handleDeleteStoreRoute(index: number) { + this.storeRoutes.splice(index, 1); + } + + // 处理存储路由的切换操作 + handleStoreRoute(item: IRouteConfigItem) { + const index = this.storeRoutes.findIndex(set => item.id === set.id); + if (index > -1) { + this.storeRoutes.splice(index, 1); + } else this.storeRoutes.push({ ...item }); + } + + // 判断某个路由是否已存储 + isStoredRoute(id: string) { + return this.storeRoutes.some(item => item.id === id); + } + + // 渲染所有可用路由部分 + contentRoutes() { + return ( +
    + {this.flatRoutes.map(item => ( +
    + + {this.$t(item.name.startsWith('route-') ? item.name : `route-${item.name}`)} + +
      + {item.children?.map(child => ( +
    • this.handleStoreRoute(child)} + > + {this.$t(child.name.startsWith('route-') ? child.name : `route-${child.name}`)} + +
      • + ))} +
    +
    + ))} +
    + ); + } + + // 渲染常用导航的路由部分 + leftRoutes() { + return ( +
    +
    + {this.$t('结果预览')} + {this.storeRoutes.length} +
    +
      + {this.storeRoutes.map((item, index) => ( +
    • this.handleDragover(item, e)} + onDragstart={() => this.handleDragstart(item)} + onDrop={this.handleDrop} + > + +
      + + {this.$t(item.name.startsWith('route-') ? item.name : `route-${item.name}`)} + this.handleDeleteStoreRoute(index)} + /> +
      +
      • + ))} +
    +
    + ); + } + + // 渲染函数，定义模态框的结构和内容 + render() { + return ( + +
    +
    +
    {this.$t('快捷入口管理')}
    + {this.contentRoutes()} +
    +
    {this.leftRoutes()}
    +
    +     + ); + } +} + +export default tsx.ofType().convert(HeaderSettingModal); diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.scss new file mode 100644 index 0000000000..379a132c13 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.scss @@ -0,0 +1,188 @@ +.home-alarm-chart { + z-index: 7; + display: flex; + flex: 1; + flex-direction: column; + width: 100%; + height: 100%; + background-color: white; + box-shadow: 0 2px 4px 0 #1919290d; + border-radius: 2px; + padding: 2px; + .home-alarm-content { + display: flex; + flex: 1; + flex-direction: column; + width: 100%; + height: calc(100% - 46px); + padding-bottom: 6px; + .chart-instance { + display: flex; + flex: 1; + flex-grow: 2; + .loading-chart { + width: 100%; + // height: 100px; + text-align: center; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #979BA5; + .loading-img { + width: 28px; + height: 28px; + margin-bottom: 10px; + img { + width: 100%; + height: 100%; + } + } + .loading-text { + font-size: 12px; + } + } + } + } + .empty-chart { + width: 100%; + height: calc(100% - 46px); + display: flex; + align-items: center; + justify-content: center; + } + .alarm-chart-header { + width: 100%; + height: 45px; + font-size: 14px; + color: #313238; + display: flex; + align-items: center; + padding: 0 16px; + position: relative; + &:hover { + .more-operation { + display: block; + } + } + .header-title { + max-width: 54%; + display: inline-block; + height: 45px; + line-height: 45px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .chart-header-select { + width: 115px; + height: 30px; + display: inline-block; + margin-left: 5px; + margin-top: -5px; + .bk-select-name { + padding: 0 26px 0 5px; + } + } + } + .chart-legend { + height: 26px; + margin: 0 auto; + } +} +.home-chart-tips-popover { + .chart-tips { + color: #ea3636; + margin-right: 4px; + cursor: pointer; + font-size: 16px; + } +} +.home-chart-more-popover { + display: inline-block; + position: absolute; + right: 12px; + // display: none; + .more-operation { + display: inline-block; + width: 24px; + height: 24px; + line-height: 24px; + font-size: 16px; + font-weight: 600; + border-radius: 50%; + text-align: center; + color: #63656e; + cursor: pointer; + &:hover { + background: #e1ecff; + } + } +} +.new-home-popover { + .tippy-tooltip { + padding: 0; + } + .home-chart-more-list { + background: #fff; + padding: 5px 0; + .more-list-item { + padding: 0 12px; + display: block; + height: 32px; + line-height: 32px; + cursor: pointer; + &:hover { + background: #f5f7fa; + } + &.delete { + color: #e71818; + } + } + } +} +.new-home-tips { + .home-chart-tips-list { + .tips-item { + margin-bottom: 5px; + color: #4d4f56; + } + .tips-item-tag { + display: inline-block; + width: 38px; + height: 16px; + line-height: 16px; + text-align: center; + font-size: 10px; + background: #f0f1f5; + border-radius: 2px; + color: #4d4f56; + margin-right: 4px; + } + .deleted { + .tips-item-tag { + background: #ffebeb; + color: #e71818; + } + .txt { + color: #c4c6cc; + text-decoration: line-through; + } + } + } +} +.new-home-chart-tooltips { + background-color: rgba(0, 0, 0, 0.8) !important; + border: none !important; + .tooltips-content-item { + font-size: 12px; + font-weight: normal; + .item-name { + min-width: 20px; + } + .item-value { + background: none; + margin-left: 0; + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.tsx new file mode 100644 index 0000000000..5f12652f86 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-alarm-chart.tsx @@ -0,0 +1,418 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component, Emit, Prop, Ref, Mixins, Watch } from 'vue-property-decorator'; +import { ofType } from 'vue-tsx-support'; + +import dayjs from 'dayjs'; +import deepmerge from 'deepmerge'; +import { CancelToken } from 'monitor-api/index'; +import { alertDateHistogram } from 'monitor-api/modules/alert'; +import { Debounce } from 'monitor-common/utils/utils'; +import ListLegend from 'monitor-ui/chart-plugins/components/chart-legend/common-legend'; +import { + ChartLoadingMixin, + ErrorMsgMixins, + IntersectionMixin, + LegendMixin, + ResizeMixin, + ToolsMxin, +} from 'monitor-ui/chart-plugins/mixins'; +import BaseEchart from 'monitor-ui/chart-plugins/plugins/monitor-base-echart'; + +import { generateFormatterFunc, handleTransformToTimestamp } from '../../../../components/time-range/utils'; +import loadingChartSrc from '../../../../static/images/png/new-page/loadingChart.png'; +import { handleYAxisLabelFormatter, EStatusType, EAlertLevel } from '../utils'; + +import type { TimeRangeType } from '../../../../components/time-range/time-range'; +import type { IAlarmGraphConfig } from '../type'; +import type { MonitorEchartOptions } from 'monitor-ui/chart-plugins/typings'; + +import './home-alarm-chart.scss'; + +interface IHomeAlarmChartProps { + config: IAlarmGraphConfig; + timeRange: TimeRangeType; + currentActiveId: number; +} +interface IHomeAlarmChartEvents { + onMenuClick: any; +} + +const handleSetTooltip = params => { + // 获取时间并格式化 + const pointTime = dayjs.tz(Number(params[0].axisValue)).format('YYYY-MM-DD HH:mm:ss'); + + // 构建每个数据点的 HTML 列表项 + const liHtmls = params + .map(item => { + return ` +
  • + + ${item.seriesName}: + ${item.value[1]} +
    • `; + }) + .join(''); + + // 构建 tooltip 的 HTML + return ` +
    +

    ${pointTime}

    +
      ${liHtmls}
    +
    `; +}; + +@Component +class HomeAlarmChart extends Mixins< + ChartLoadingMixin & IntersectionMixin & ToolsMxin & ResizeMixin & LegendMixin & ErrorMsgMixins +>(IntersectionMixin, ChartLoadingMixin, ToolsMxin, ResizeMixin, LegendMixin, ErrorMsgMixins) { + @Prop({ default: () => ({}) }) config: IAlarmGraphConfig; + @Prop() currentActiveId: number; + @Prop({ default: () => ['', ''] }) timeRange: TimeRangeType; + @Ref('menuPopover') menuPopoverRef: HTMLDivElement; + // 高度 + height = 100; + // 宽度度 + width = 300; + empty = false; + init = true; + cancelTokens = []; + emptyText = window.i18n.tc('暂无数据'); + minBase = 0; + colorList = ['#F8B4B4', '#A1E3BA', '#C4C6CC']; + searchList = [ + { + name: 'FATAL', + display_name: window.i18n.tc('致命'), + }, + { + name: 'WARNING', + display_name: window.i18n.tc('预警'), + }, + { + name: 'INFO', + display_name: window.i18n.tc('提醒'), + }, + ]; + loading = false; + legendData = []; + /** 更多操作列表 */ + menuList = [ + { + name: window.i18n.tc('查看详情'), + checked: false, + id: 'detail', + }, + { + name: window.i18n.tc('编辑'), + checked: false, + id: 'edit', + }, + { + name: window.i18n.tc('删除'), + checked: false, + id: 'delete', + }, + ]; + searchValue = ['FATAL', 'WARNING', 'INFO']; + options = {}; + chartOption = { + color: this.colorList, + tooltip: { + className: 'new-home-chart-tooltips', + trigger: 'axis', + axisPointer: { + type: 'shadow', + }, + formatter: handleSetTooltip, + }, + legend: { + show: false, + }, + grid: { + containLabel: true, + left: 16, + right: 16, + top: 10, + bottom: 6, + backgroundColor: 'transparent', + }, + yAxis: { + type: 'value', + splitLine: { + show: true, + lineStyle: { + color: '#F0F1F5', + type: 'solid', + }, + }, + axisLabel: { + formatter: (v: number) => handleYAxisLabelFormatter(v - this.minBase), + }, + }, + }; + + formatterFunc = null; // x轴格式化函数 + + /** 更多操作 */ + @Emit('menuClick') + handleMenuClick(item) { + this.menuPopoverRef?.hideHandler(); + return item; + } + + // 告警等级切换 + changeSelect() { + this.getPanelData(); + } + + @Watch('timeRange') + handleTimeRangeChange(newTime, oldTime) { + const [newS, newE] = newTime; + const [oldS, oldE] = oldTime; + if (newS === oldS && newE === oldE) return; + this.getPanelData(); + } + /** + * @description: 获取图表数据 + */ + @Debounce(100) + async getPanelData() { + this.cancelTokens.forEach(cb => cb?.()); + this.cancelTokens = []; + if (!this.isInViewPort()) { + if (this.intersectionObserver) { + this.unregisterOberver(); + } + this.registerObserver(); + return; + } + this.formatterFunc = generateFormatterFunc(this.timeRange); + if (this.init) this.handleLoadingChange(true); + this.emptyText = window.i18n.tc('加载中...'); + this.loading = true; + try { + this.unregisterOberver(); + const [start, end] = handleTransformToTimestamp(this.timeRange); + const conditions = [{ key: 'strategy_id', value: this.config.strategy_ids || [] }]; + // 下拉切换告警级别筛选 + if (this.searchValue.length !== this.searchList.length) { + conditions.push({ key: 'severity', value: this.searchValue.map(val => EAlertLevel[val]) }); + } + const { series } = await alertDateHistogram( + { + bk_biz_ids: [this.currentActiveId], + conditions, + start_time: start, + end_time: end, + }, + { + cancelToken: new CancelToken((cb: () => void) => this.cancelTokens.push(cb)), + needMessage: false, + } + ); + if (series?.length) { + this.empty = false; + this.updateChartData(series); + } else { + this.empty = true; + this.emptyText = window.i18n.tc('暂无数据'); + } + } catch { + this.empty = true; + this.emptyText = window.i18n.tc('出错了'); + } finally { + this.cancelTokens = []; + this.loading = false; + } + this.handleLoadingChange(false); + } + /** + * @description: 更新图表的数据 + */ + updateChartData(srcData) { + const legendList = []; + const dataList = []; + srcData.forEach((item, ind) => { + const { data, display_name } = item; + legendList.push({ name: display_name, color: this.colorList[ind], show: true }); + dataList.push({ + name: display_name, + type: 'bar', + stack: 'total', + data: data, + }); + }); + this.legendData = legendList; + this.options = Object.freeze( + deepmerge(this.chartOption, { + series: dataList, + xAxis: { + type: 'category', + axisTick: { + show: false, + }, + axisLine: { + show: false, + }, + axisLabel: { + formatter: v => this.formatterFunc(dayjs.tz(+v)), + fontSize: 12, + color: '#979BA5', + }, + }, + }) + ) as MonitorEchartOptions; + } + + render() { + return ( +
    +
    + {this.config.status.some(({ status }) => EStatusType[status]) && ( + + + + +
    + {(this.config.status || []).map( + (item, index) => + EStatusType[item.status] && ( +
    + {EStatusType[item.status]} + {item.name} +
    + ) + )} +
    +     + )} + + {this.config.name} + + + {this.searchList.map(item => ( + + ))} + + + + + +
    + {this.menuList.map(item => ( + this.handleMenuClick(item)} + > + {item.name} + + ))} +
    +     +
    + {!this.empty ? ( +
    +
    + {!this.loading ? ( + this.init && ( + + ) + ) : ( +
    +
    + +
    + 加载中… +
    + )} +
    +
    + ) : ( +
    {this.emptyText}
    + )} +
    + +
    +
    + ); + } +} +export default ofType().convert(HomeAlarmChart); diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.scss new file mode 100644 index 0000000000..b89b9aa6a5 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.scss @@ -0,0 +1,312 @@ +/* stylelint-disable declaration-no-important */ +@import '../../../../theme/index.scss'; + +.new-biz-select-wrap { + z-index: 9; + display: flex; + + &.dark { + .biz-select-target { + height: 32px; + cursor: pointer; + + .biz-name-first-code { + width: 20px; + height: 20px; + background-color: #a09e21; + border-radius: 4px; + } + + .biz-select-target-main { + height: 32px; + padding-left: 8px; + margin: 0 8px; + background-color: #404663; + border-radius: 2px; + + .biz-name-text { + display: inline-block; + overflow: hidden; + color: #acb2c6; + text-overflow: ellipsis; + white-space: nowrap; + + .biz-name-text-id { + margin-left: 8px; + color: #66768e; + } + } + } + + &:not(.is-shrink) { + .biz-name-first-code { + width: 20px; + height: 20px; + border-radius: 2px; + } + } + } + } + + .space-type-list { + position: relative; + display: flex; + align-items: center; + padding: 8px 0 4px 0; + margin: 0 12px; + overflow-y: auto; + border-bottom: 1px solid #2c354d; + + -ms-overflow-style: none; /* IE 和 Edge */ + scrollbar-width: none; /* Firefox */ + &::-webkit-scrollbar { + display: none; + } + .space-type-item { + display: flex; + align-items: center; + justify-content: center; + height: 22px; + padding: 0 8px; + margin-right: 4px; + margin-bottom: 4px; + font-size: 12px; + + /* 颜色类型 */ + color: #63656e; + white-space: nowrap; + cursor: pointer; + background-color: #f0f1f5; + border: 1px solid transparent; + border-radius: 2px; + + &.bkcc { + color: #3a84ff; + background-color: #edf4ff; + } + + &.bkci { + color: #ea3536; + background-color: #feebea; + } + + &.bcs { + color: #fe9c00; + background-color: #fff1db; + } + + &.paas, + &.bksaas { + color: #14a568; + background-color: #e4faf0; + } + + /* 边框类型 */ + &.selected { + background: #fafbfd; + border-color: #979ba54d; + + &.bkcc { + background: #f0f5ff; + border-color: #a3c5fd; + } + + &.bkci { + background: #fee; + border-color: #f8b4b4; + } + + &.bcs { + background: #fff3e1; + border-color: #ffd695; + } + + &.paas, + &.bksaas { + background: #e4faf0; + border-color: #14a5684d; + } + } + + /* hover */ + &.hover-active { + &:hover { + background: #dcdee5; + + &.bkcc { + background: #e1ecff; + } + + &.bkci { + background: #fedddc; + } + + &.bcs { + background: #ffe8c3; + } + + &.paas, + &.bksaas { + background: #c9f5e2; + } + } + } + } + + } + + .space-type-list-wrap { + position: relative; + + .pre-btn, + .next-btn { + position: absolute; + top: 7px; + display: none; + width: 16px; + height: 24px; + cursor: pointer; + background: #182233; + opacity: 1; + + .icon-arrow-left, + .icon-arrow-right { + font-size: 20px; + color: #959eaf; + } + + &.disable { + cursor: not-allowed; + + .icon-arrow-left, + .icon-arrow-right { + color: #444f69; + } + } + } + + &.light { + .pre-btn, + .next-btn { + background: #fff; + + &.disable { + .icon-arrow-left, + .icon-arrow-right { + color: #959eaf; + } + } + } + + .icon-arrow-left, + .icon-arrow-right { + color: #444f69; + } + } + + .pre-btn { + left: 12px; + } + + .next-btn { + right: 12px; + } + + &.show-btn { + .space-type-list { + padding: 8px 16px 4px 16px; + } + + .pre-btn, + .next-btn { + display: flex; + align-items: center; + justify-content: center; + } + } + } + + .biz-list-wrap { + background-color: #fff; + border-radius: 2px; + + &.dark { + border: 0; + border-radius: 2px; + box-shadow: 0px 2px 6px 0px rgba(0,0,0,.20); + + .biz-list-mian { + .biz-search { + .bk-form-input { + color: #acb5c6; + background-color: #192133; + border: 0; + border-bottom: 1px solid #2c354d!important; + border-radius: 0; + + &::placeholder { + color: #66768e!important; + background-color: #192133; + } + + &:focus { + background-color: #192133 !important; + border-bottom-color: #2c354d!important; + } + } + } + } + } + + &.light { + .space-type-list { + border-bottom: 1px solid #eaebf0; + } + } + + .biz-list-mian { + .biz-search-wrap { + padding: 0 12px; + } + + .biz-search { + .control-icon.left-icon { + left: 0; + color: #63656e; + } + + &.with-left-icon { + .bk-form-input { + padding-left: 26px; + } + } + + .bk-form-input { + border-bottom-color: #eaebf0 !important; + } + } + + .biz-list { + max-height: 300px; + overflow-y: auto; + } + } + } + + .tippy-tooltip { + &.list-dark-theme { + border-radius: 2px; + box-shadow: 0px 2px 6px 0px rgba(0,0,0,.20); + + .tippy-content { + background-color: #39455f; + } + } + + &.list-light-theme { + .tippy-content { + background-color: #fff; + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx new file mode 100644 index 0000000000..88887fda10 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx @@ -0,0 +1,516 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +import { Component, Emit, Prop, Ref } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import { Debounce } from 'monitor-common/utils/utils'; + +import { SPACE_TYPE_MAP } from '../../../../common/constant'; +import List, { type IListItem } from '../../../../components/biz-select/list'; +import { Storage } from '../../../../utils'; + +import type { ISpaceItem } from '../../../../types'; + +import './home-biz-list.scss'; + +/** 业务组件常用的业务缓存key */ +const BIZ_SELECTOR_COMMON_IDS = 'BIZ_SELECTOR_COMMON_IDS'; +/** 业务组件常用业务缓存最大个数 */ +const BIZ_SELECTOR_COMMON_MAX = 5; +const BIZ_COLOR_LIST = [ + '#7250A9', + '#3563BE', + '#3799BA', + '#4FB17F', + '#86AF4A', + '#E9AE1D', + '#EB9258', + '#D36C68', + '#BC4FB3', +]; + +interface IProps { + zIndex?: number; + bizList: ISpaceItem[]; + isShrink?: boolean; + theme?: ThemeType; + minWidth?: number; + stickyList?: string[]; + isShowCommon?: boolean; + canAddBusiness?: boolean; +} +export type ThemeType = 'dark' | 'light'; +interface IEvents { + onChange: number; + onOpenSpaceManager: () => void; +} + +/** + * 业务选择器组件 + */ +@Component +export default class HomeBizSelect extends tsc { + @Prop({ default: () => [], type: Array }) bizList: ISpaceItem[]; + @Prop({ default: false, type: Boolean }) isShrink: boolean; + @Prop({ default: true, type: Boolean }) isShowCommon: boolean; + @Prop({ default: null, type: Number }) zIndex: number; + @Prop({ default: 200, type: Number }) minWidth: number; + @Prop({ default: () => [], type: Array }) stickyList: string[]; + @Prop({ default: true, type: Boolean }) canAddBusiness: boolean; + @Prop({ + default: 'light', + type: String, + validator: (val: string) => ['dark', 'light'].includes(val), + }) + theme: ThemeType; + @Ref() menuSearchInput: any; + @Ref() homePopoverRef: any; + @Ref('typeList') typeListRef: HTMLDivElement; + + localValue: number = null; + showBizList = false; + keyword = ''; + + listWidth = 200; + + storage: Storage = null; + commonListIds: number[] = []; + spaceTypeIdList: { id: string; name: string; styles: any }[] = []; + searchTypeId = ''; + bizBgColor = ''; + + bizListFilter = []; + + generalList: IListItem[] = []; + pagination: { + current: number; + count: number; + limit: number; + data: IListItem[]; + } = { + current: 1, + count: 0, + limit: 20, + data: [], + }; + + typeWrapInfo = { + showBtn: false, + nextDisable: false, + preDisable: false, + }; + + firstCodeBgColor = ''; + + created() { + this.bizBgColor = this.$store.getters.bizBgColor || this.getRandomColor(); + const spaceTypeMap: Record = {}; + for (const item of this.bizList) { + spaceTypeMap[item.space_type_id] = 1; + if (item.space_type_id === 'bkci' && item.space_code) { + spaceTypeMap.bcs = 1; + } + } + this.spaceTypeIdList = Object.keys(spaceTypeMap).map(key => ({ + id: key, + name: SPACE_TYPE_MAP[key]?.name || this.$t('未知'), + styles: (this.theme === 'dark' ? SPACE_TYPE_MAP[key]?.dark : SPACE_TYPE_MAP[key]?.light) || {}, + })); + } + + mounted() { + this.storage = new Storage(); + this.commonListIds = this.storage.get(BIZ_SELECTOR_COMMON_IDS) || []; + } + + @Debounce(300) + handleBizSearch(keyword?: string) { + this.keyword = keyword; + this.bizListFilter = this.getBizListFilter(); + } + + @Emit('change') + handleBizChange(id: number) { + this.homePopoverRef.instance.hide(); + this.handleCacheBizId(id); + return id; + } + + getBizListFilter() { + const stickyList: IListItem = { + id: null, + name: this.$tc('置顶'), + children: [], + }; + const commonList: IListItem = { + id: null, + name: this.$tc('常用的'), + children: [], + }; + const list: IListItem = { + id: 'general', + name: '', + children: [], + }; + const keyword = this.keyword.trim().toLocaleLowerCase(); + const listTemp = { + stickyList: { + preArr: [], + nextArr: [], + }, + commonList: { + preArr: [], + nextArr: [], + }, + generalList: { + preArr: [], + nextArr: [], + }, + }; + const setListTemp = (key: keyof typeof listTemp, item: IListItem, preciseMatch: boolean) => { + if (preciseMatch) { + listTemp[key].preArr.push(item); + } else { + listTemp[key].nextArr.push(item); + } + }; + const concatListTemp = (key: keyof typeof listTemp) => { + const { preArr, nextArr } = listTemp[key]; + return [...preArr, ...nextArr]; + }; + + for (const item of this.bizList) { + let preciseMatch = false; + let show = false; + if (this.searchTypeId) { + show = + this.searchTypeId === 'bcs' + ? item.space_type_id === 'bkci' && !!item.space_code + : item.space_type_id === this.searchTypeId; + } + if ((show && keyword) || (!this.searchTypeId && !show)) { + preciseMatch = + item.space_name?.toLocaleLowerCase() === keyword || + item.py_text === keyword || + item.pyf_text === keyword || + `${item.id}` === keyword || + `${item.space_id}`.toLocaleLowerCase() === keyword; + show = + preciseMatch || + item.space_name?.toLocaleLowerCase().indexOf(keyword) > -1 || + item.py_text?.indexOf(keyword) > -1 || + item.pyf_text?.indexOf(keyword) > -1 || + `${item.id}`.includes(keyword) || + `${item.space_id}`.toLocaleLowerCase().includes(keyword); + } + if (show) { + const tags = [{ id: item.space_type_id, name: item.type_name, type: item.space_type_id }]; + if (item.space_type_id === 'bkci' && item.space_code) { + tags.push({ id: 'bcs', name: this.$tc('容器项目'), type: 'bcs' }); + } + const newItem = { + ...item, + name: item.space_name.replace(/\[.*?\]/, ''), + tags, + }; + if (this.stickyList.includes(item.space_uid)) { + setListTemp('stickyList', newItem as IListItem, preciseMatch); + } else if (this.commonListIds.includes(item.id) && this.isShowCommon) { + setListTemp('commonList', newItem as IListItem, preciseMatch); + } else { + setListTemp('generalList', newItem as IListItem, preciseMatch); + } + } + } + this.generalList = concatListTemp('generalList'); + stickyList.children = concatListTemp('stickyList'); + this.setPaginationData(true); + list.children = this.pagination.data; + const allList: IListItem[] = []; + if (stickyList.children.length) { + allList.push(stickyList); + } + let preTemp = []; + let nextTemp = []; + if (listTemp.commonList.preArr.length) { + preTemp = this.commonListIds.reduce((total, id) => { + const item = listTemp.commonList.preArr.find(item => item.id === id); + if (item) total.push(item); + return total; + }, []); + } + if (listTemp.commonList.nextArr.length) { + nextTemp = this.commonListIds.reduce((total, id) => { + const item = listTemp.commonList.nextArr.find(item => item.id === id); + if (item) total.push(item); + return total; + }, []); + } + if (preTemp.length || nextTemp.length) { + commonList.children = [...preTemp, ...nextTemp]; + allList.push(commonList); + } + !!list.children.length && allList.push(list); + return allList; + } + + setPaginationData(isInit = false) { + const showData = this.generalList; + this.pagination.count = showData.length; + if (isInit) { + this.pagination.current = 1; + this.pagination.data = showData.slice(0, this.pagination.limit); + } else { + if (this.pagination.current * this.pagination.limit < this.pagination.count) { + this.pagination.current += 1; + const temp = showData.slice( + (this.pagination.current - 1) * this.pagination.limit, + this.pagination.current * this.pagination.limit + ); + this.pagination.data.push(...temp); + } + } + } + + getRandomColor() { + const color = BIZ_COLOR_LIST[Math.floor(Math.random() * BIZ_COLOR_LIST.length)]; + this.$store.commit('app/SET_BIZ_BGCOLOR', color); + return color; + } + + handleCacheBizId(id: number) { + const leng = this.commonListIds.length; + const isExist = this.commonListIds.includes(id); + let newIds = [...this.commonListIds]; + if (isExist) { + newIds = newIds.filter(item => item !== id); + newIds.unshift(id); + } else { + newIds.unshift(id); + if (leng >= BIZ_SELECTOR_COMMON_MAX) { + newIds.length = BIZ_SELECTOR_COMMON_MAX; + } + } + this.commonListIds = newIds; + this.storage.set(BIZ_SELECTOR_COMMON_IDS, this.commonListIds); + } + + handleSetListWidth() { + this.bizListFilter = this.getBizListFilter(); + const react = this.$el.getBoundingClientRect(); + this.listWidth = react.width <= this.minWidth ? this.minWidth : react.width; + this.showBizList = !this.showBizList; + setTimeout(() => { + this.menuSearchInput.focus(); + }, 100); + this.homePopoverRef.instance.popper.querySelector('.tippy-tooltip').style.width = `${this.listWidth}px`; + this.zIndex && + this.homePopoverRef.instance.set({ + zIndex: this.zIndex, + }); + this.typeListWrapNextPreShowChange(); + } + + handleOpenSpaceManager() { + this.handleSearchBlur(); + } + + handleSearchBlur() { + setTimeout(() => { + const popover = this.homePopoverRef; + const isVisible = popover?.instance?.state?.isVisible; + if (isVisible) popover?.hideHandler(); + }, 200); + } + + handleContentMouseDown(e: MouseEvent) { + if (this.menuSearchInput.$el.contains(e.target)) { + return; + } + e.preventDefault(); + e.stopPropagation(); + } + + handleSearchType(typeId: string) { + this.searchTypeId = typeId === this.searchTypeId ? '' : typeId; + this.bizListFilter = this.getBizListFilter(); + } + + handleScroll(event) { + const el = event.target; + const { scrollHeight, scrollTop, clientHeight } = el; + if (Math.ceil(scrollTop) + clientHeight >= scrollHeight) { + this.setPaginationData(false); + const generalData = this.bizListFilter.find(item => item.id === 'general'); + if (generalData?.children) { + generalData.children = this.pagination.data; + } + } + } + + typeListWrapNextPreShowChange() { + this.$nextTick(() => { + const hasScroll = this.typeListRef?.scrollWidth > this.typeListRef?.clientWidth; + this.typeWrapInfo.showBtn = hasScroll; + this.typeWrapInfo.preDisable = true; + }); + } + + handleTypeWrapScrollChange(type: 'next' | 'pre') { + const smoothScrollTo = (element: HTMLDivElement, targetPosition: number, duration: number, callback) => { + const startPosition = element.scrollLeft; + const distance = targetPosition - startPosition; + const startTime = new Date().getTime(); + const easeOutCubic = t => 1 - (1 - t) ** 3; + const scroll = () => { + const elapsed = new Date().getTime() - startTime; + const progress = easeOutCubic(Math.min(elapsed / duration, 1)); + element.scrollLeft = startPosition + distance * progress; + if (progress < 1) requestAnimationFrame(scroll); + callback(); + }; + scroll(); + }; + let target = 0; + const speed = 100; + const duration = 300; + const { scrollWidth, scrollLeft, clientWidth } = this.typeListRef; + const total = scrollWidth - clientWidth; + if (type === 'next') { + const temp = scrollLeft + speed; + target = temp > total ? total : temp; + } else { + const temp = scrollLeft - speed; + target = temp < 0 ? 0 : temp; + } + smoothScrollTo(this.typeListRef, target, duration, () => { + this.typeWrapInfo.nextDisable = this.typeListRef.scrollLeft > total - 1; + this.typeWrapInfo.preDisable = this.typeListRef.scrollLeft === 0; + }); + } + + render() { + return ( +
    + { + this.showBizList = false; + this.handleBizSearch(''); + return true; + }, + }} + animation='slide-toggle' + arrow={false} + offset={'158, 6'} + theme={`${this.theme} common-popover list-${this.theme}`} + trigger='click' + > + + + {this.$t('添加业务')} + +
    +
    +
    + this.handleBizSearch('')} + /> +
    + {this.spaceTypeIdList.length > 1 && ( +
    +
      + {this.spaceTypeIdList.map(item => ( +
    • this.handleSearchType(item.id)} + > + {item.name} +
      • + ))} +
    +
    !this.typeWrapInfo.preDisable && this.handleTypeWrapScrollChange('pre')} + > + +
    +
    !this.typeWrapInfo.nextDisable && this.handleTypeWrapScrollChange('next')} + > + +
    +
    + )} +
      + +
    +
    +
    +     +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.scss new file mode 100644 index 0000000000..14f70cbbd8 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.scss @@ -0,0 +1,343 @@ +.new-home-select { + position: relative; + width: 100%; + min-height: 52px; + + .loading-view { + width: 170px; + height: 24px; + padding: 0 8px; + margin: 0 auto; + line-height: 24px; + text-align: center; + // background: #eaebf0; + border-radius: 12px; + + .icon-loading1 { + margin-right: 6px; + } + } + + .mt-30 { + margin-top: 30px; + } + + .new-home-select-input { + position: relative; + width: 100%; + min-height: 52px; + padding: 0 14px 0 66px; + background: #333c5d; + background-image: linear-gradient(to right, #333c5d, #333c5d), linear-gradient(90deg, #74b9ff, #64dcd7); + background-clip: padding-box, border-box; + background-origin: padding-box, border-box; + border: 2px solid transparent; + border-radius: 8px; + margin: 0 auto; + + .clear-btn { + position: absolute; + top: 18px; + right: 18px; + z-index: 1; + font-size: 18px; + color: #c4c6cc; + cursor: pointer; + border-radius: 50%; + // display: none; + } + } + + .ip-tag { + height: 16px; + padding: 0 4px; + margin-right: 4px; + font-size: 10px; + line-height: 16px; + color: #4d4f56; + background: #f0f1f5; + border-radius: 2px; + } + + .ip-sub { + color: #979ba5; + } + + .host-show-view { + position: absolute; + top: 16px; + display: flex; + align-items: center; + justify-content: center; + font-size: 16px; + color: #fff; + background: #333c5d; + + .ip-tag { + display: inline-block; + height: 22px; + padding: 0 6px; + font-size: 14px; + line-height: 22px; + color: #fff; + background: #979ba5; + } + + .ip-sub { + font-size: 14px; + } + } + + .new-home-select-icon { + position: absolute; + top: 3px; + left: 12px; + display: inline-block; + width: 50px; + height: 50px; + margin-right: 2px; + background: url('../../../../static/images/png/new-page/search-icon.png'); + background-size: 100% 100%; + } + + .home-select-input { + box-sizing: border-box; + width: 98%; + padding: 16px 0 12px; + overflow: hidden; + font-size: 16px; + line-height: 22px; + color: #f5f7fa; + caret-color: #fff; + resize: none; + background: transparent; + border: none; + + &::placeholder { + font-size: 16px; + line-height: 24px; + color: #7a8199; + } + + .clear-icon { + font-size: 18px; + } + + .bk-textarea-wrapper { + /* stylelint-disable-next-line declaration-no-important */ + background-color: transparent !important; + } + } +} + +.select-empty { + z-index: 1; + width: 100%; + height: 250px; + padding-top: 30px; + border-radius: 8px; + box-shadow: 0 4px 10px 10px rgba(0, 0, 0, 0.15); + + .bk-exception-img.part-img .exception-image { + height: 96px; + } + + .bk-exception-text.part-text { + margin-top: 10px; + font-size: 12px; + color: #4d4f56; + } + + .empty-clear-btn { + display: block; + margin-top: 10px; + font-size: 12px; + color: #3a84ff; + cursor: pointer; + } +} + +.new-home-select-popover { + position: absolute; + left: 0; + z-index: 500; + width: 100%; + max-height: 405px; + margin-top: 4px; + background: #fff; + border-radius: 8px; +} + +.new-home-select-popover-content { + width: 100%; + max-height: 405px; + min-height: 252px; + padding-bottom: 12px; + overflow: auto; + font-size: 12px; + background: #fff; + border-radius: 8px; + box-shadow: 0 4px 10px 10px rgba(0, 0, 0, 0.15); + + .item-list { + min-height: 100px; + padding-top: 12px; + } + + .is-history { + padding-top: 0; + } + + .item-list-title { + position: relative; + padding: 12px 12px 8px; + font-size: 12px; + color: #979ba5; + + .item-list-clear { + position: absolute; + right: 24px; + cursor: pointer; + } + + .icon-mc-clear { + margin-right: 5px; + } + } + + .new-home-select-divider { + width: 98.5%; + height: 1px; + margin: 12px auto; + border-bottom: 1px solid #eaebf0; + } + + .secondary-list { + margin-bottom: 8px; + } + + .new-home-select-router-list { + padding: 0 24px; + + .new-home-select-router-item { + display: inline-block; + width: 80px; + height: 80px; + padding: 12px 0; + margin-top: 8px; + margin-right: 16px; + color: #4d4f56; + text-align: center; + vertical-align: middle; + background: #f0f5ff; + border-radius: 2px; + + &:hover { + cursor: pointer; + background: #e1ecff; + } + + .router-item-icon { + font-size: 34px; + color: #a3c5fd; + } + + .item-txt { + display: inline-block; + width: 100%; + margin-top: 6px; + font-size: 10px; + } + } + } + + .item-icon { + margin-right: 8px; + color: #4d4f56; + } + + .new-home-select-history-item, + .new-home-select-item-title, + .new-home-select-group-item { + width: 100%; + height: 32px; + padding: 0 16px 0 24px; + line-height: 32px; + color: #4d4f56; + cursor: pointer; + + &.active, + &:hover { + background: #f0f1f5; + + .ip-tag { + background: #dcdee5; + } + } + + &.disabled { + color: #c4c6cc; + cursor: not-allowed; + } + + .history-item-name { + display: inline-block; + width: 97%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: top; + cursor: pointer; + } + } + + .new-home-select-item-title { + padding-left: 12px; + color: #979ba5; + cursor: none; + + &:hover { + background: none; + } + } + + .new-home-select-group-item { + display: flex; + align-items: center; + justify-content: center; + + .item-label { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .highlight { + color: #f59500; + } + + .item-business { + width: 130px; + color: #979ba5; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .item-operator { + margin-right: 20px; + color: #3a84ff; + + .item-operator-item { + margin-right: 24px; + cursor: pointer; + + &:last-child { + margin-right: 0; + } + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.tsx new file mode 100644 index 0000000000..1a5e9ac6dc --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-select.tsx @@ -0,0 +1,721 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component, Ref } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import debounceDecorator from 'monitor-common/utils/debounce-decorator'; + +import { COMMON_ROUTE_LIST } from '../../../../router/router-config'; +import { highLightContent, ESearchType, ESearchPopoverType } from '../utils'; + +import type { ISearchListItem, ISearchItem, IRouteItem, IDataItem } from '../type'; + +import './home-select.scss'; + +interface IHomeSelectProps { + searchList?: ISearchListItem[]; + historyList?: ISearchListItem[]; +} +const storageKey = 'bk_monitor_new_home_history'; + +@Component({ + name: 'HomeSelect', +}) +export default class HomeSelect extends tsc { + @Ref('select') selectRef: HTMLDivElement; + @Ref('textareaInput') textareaInputRef: HTMLDivElement; + searchValue = ''; + searchType = ''; + showPopover = false; + routeList: IRouteItem[] = []; + /** 策略可跳转列表 */ + operatorList = [ + { name: this.$t('关联的告警'), key: 'strategy-alarm' }, + { name: this.$t('关联的屏蔽配置'), key: 'alarm-shield' }, + ]; + isLoading = false; + /** 高亮选中的index, 第一个表示组的下标，第二个表示items的下标 */ + highlightedIndex: number[] = [-1, -1]; + /** 高亮选中的Item */ + highlightedItem: ISearchItem = {}; + /** 历史搜索数据 */ + localHistoryList: ISearchListItem[] = []; + /** 接口搜索结果列表 */ + searchList: ISearchListItem[] = []; + /** 是否为input输入内容 */ + isInput = false; + isEmpty = false; + searchLenArr: number[] = []; + isComposing = false; + currentAbortController: IDataItem = null; + /** 窗口宽度 */ + windowWidth = 0; + + /** 处理数据 */ + flattenRoute(tree: IRouteItem[]) { + const result = []; + const traverse = node => { + if (!node) return; + result.push(node); + if (node.children && node.children.length > 0) { + node.children.map(child => traverse(child)); + } + }; + tree.map(rootNode => traverse(rootNode)); + return result; + } + /** 符合搜索内容的路由列表 */ + get searchRouteList() { + return (this.routeList || []).filter(item => item.name.indexOf(this.searchValue) !== -1); + } + /** 是否展示搜索结果 */ + get isSearchResult() { + return !!this.searchValue && this.isInput; + } + + get currentListKey() { + return this.isSearchResult ? ESearchPopoverType.searchList : ESearchPopoverType.localHistoryList; + } + get computedWidth() { + return this.windowWidth < 2560 ? 920 : 1080; + } + + mounted() { + this.autoResize(); + this.updateWidth(); + this.routeList = this.flattenRoute(COMMON_ROUTE_LIST).filter(item => item.icon); + document.addEventListener('click', this.handleClickOutside); + window.addEventListener('resize', this.updateWidth); + } + beforeDestroy() { + document.removeEventListener('click', this.handleClickOutside); + window.removeEventListener('resize', this.updateWidth); + } + /** 窗口变化时更新宽度值 */ + updateWidth() { + this.windowWidth = window.innerWidth; + } + /** 点击收起下拉框 */ + handleClickOutside(event: Event) { + if (this.showPopover && this.selectRef && !this.selectRef.contains(event.target)) { + this.showPopover = false; + } + } + /** 后台eventStream数据处理 Start */ + /** 解析后台返回的eventStream */ + @debounceDecorator(500) + async fetchEventStream(url: string) { + // 如果已经存在一个请求，取消请求 + if (this.currentAbortController) { + this.currentAbortController.abort(); + } + this.currentAbortController = new AbortController(); + const { signal } = this.currentAbortController; + + this.searchList = []; + this.highlightedIndex = [-1, -1]; + this.highlightedItem = null; + this.isLoading = true; + try { + const response = await fetch(url, { signal }); + const reader = response.body.getReader(); + const decoder = new TextDecoder('utf-8'); + let buffer = ''; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + + let boundary = buffer.indexOf('\n\n'); + while (boundary !== -1) { + const eventString = buffer.substring(0, boundary); + buffer = buffer.substring(boundary + 2); + this.processEvent(eventString); + boundary = buffer.indexOf('\n\n'); + } + } + } catch (error) { + this.isLoading = false; + this.searchList = []; + console.error('Error fetching event stream:', error); + } finally { + this.isLoading = false; + } + } + /** 特殊处理alert_id */ + extractAlertId(str: string) { + const regex = /"alert_id":(.*?),/; + const match = str.match(regex); + if (match?.[1]) { + return match[1].trim(); + } + return null; + } + // 从给定的事件字符串中提取数据，如果事件字符串以"data:"开头，则截取并解析其中的JSON数据，否则返回null + extractDataFromEventString(eventString: string) { + if (eventString.startsWith('data:')) { + const eventData = eventString.slice(5).trim(); + const pattern = /"alert_id":\s*[^,]+,/; + const outputString = eventData.replace(pattern, `"alert_id": "${this.extractAlertId(eventData)}",`); + return JSON.parse(outputString); + } + return null; + } + + // 根据传入的已解析数据（parsedData）来更新搜索列表（searchList） + // 如果已解析数据的类型在搜索列表中已存在，则过滤掉原列表中同类型的数据，然后将新数据加入列表 + // 如果不存在，则直接将新数据添加到搜索列表末尾，并返回更新后的搜索列表 + updateSearchList(searchList: ISearchListItem[], parsedData: ISearchListItem) { + const index = searchList.findIndex(item => item.type === parsedData.type); + if (index !== -1) { + const data = searchList.filter(item => item.type !== parsedData.type); + return [...data, parsedData]; + } + return [...searchList, parsedData]; + } + /** 处理后台返回的数据 */ + processEvent(eventString: string) { + try { + // 事件字符串中是否包含'end'来设置this.isLoading的值，若不包含'end'则设为true，表示正在加载，反之设为false + this.isLoading = eventString.indexOf('end') < 0; + // 提取事件字符串中的数据 + const parsedData = this.extractDataFromEventString(eventString); + if (parsedData) { + this.searchLenArr = []; + // 如果提取到了有效数据，更新搜索列表 + this.searchList = this.updateSearchList(this.searchList, parsedData); + this.searchList.map(item => this.searchLenArr.push(item.items.length)); + /** 默认选中第一个，直接回车的话就按照第一个跳转 */ + this.highlightedIndex = [0, 0]; + this.getSearchHightItem(); + } + } catch (error) { + this.isLoading = false; + this.searchList = []; + console.error('Error parsing event string:', error); + } + } + /** 后台eventStream数据处理 End */ + + /** 获取搜索结果 */ + getSearchList() { + this.isLoading = true; + this.fetchEventStream(`${location.origin}/rest/v2/overview/search/?query=${this.searchValue}`); + } + /* 显示弹出层 */ + handleMousedown() { + this.showPopover = true; + this.localHistoryList = JSON.parse(localStorage.getItem(storageKey)) || []; + } + /** 关联的屏蔽策略/关联的告警 */ + handleOperator(e: Event, item: ISearchItem, key: string) { + e.stopPropagation(); + this.handleSearchJumpPage(item, key); + } + + /** + * 渲染查询结果Item + * @param item - 当前渲染的查询结果Item。 + * @param type - 当前渲染的查询结果Item的类型，类型包含可见 ESearchType + * @param parentInd - 当前渲染的查询结果Item的父级下标。 + * @param ind - 当前渲染的查询结果Item的下标。 + */ + renderGroupItem(item: ISearchItem, type: string, parentInd: number, ind: number) { + const isHost = type === ESearchType.host; + const isStrategy = type === ESearchType.strategy; + return ( +
    this.handleItemClick(item, type)} + > + {isHost && {item.bk_cloud_id}:} + + + {isHost && （{item.bk_host_name}）} + + {isStrategy && ( + + {this.operatorList.map(operator => ( + this.handleOperator(e, item, operator.key)} + > + {operator.name} + + ))} + + )} + {item.bk_biz_name} +
    + ); + } + /** 渲染历史搜索Item */ + renderHistoryItem(item: ISearchItem, ind: number) { + return ( +
    this.handleClickHistoryItem(e, item)} + > + + {item.name} +
    + ); + } + /** 点击选中历史搜索Item */ + handleClickHistoryItem(e: Event, item: ISearchItem) { + e.stopPropagation(); + this.isInput = true; + this.searchValue = item.name; + this.handleGetSearchData(); + this.textareaInputRef.focus(); + } + /** 获取搜索结果 */ + handleGetSearchData() { + this.searchValue && this.getSearchList(); + } + /** 跳转到具体的功能 */ + handleGoRoute(item: IRouteItem) { + this.showPopover = false; + this.searchValue && this.setLocalHistory(this.searchValue); + window.open(location.href.replace(location.hash, item.href)); + } + /** 相关功能Render */ + renderRouterList() { + /** 根据当前bizId区分是要展示新版的k8s还是旧版的k8s, 当isEnableK8sV2为true时，不展示旧版 */ + const filterKey = this.$store.getters.isEnableK8sV2 ? 'k8s' : 'k8s-new'; + return ( +
    + + {this.$t('相关功能')} ( {this.searchRouteList.length} ) + +
    + {(this.searchRouteList || []) + .filter(item => item.id !== filterKey) + .map(item => ( + this.handleGoRoute(item)} + > + + {item?.name} + + ))} +
    +
    + ); + } + /** 设置历史搜索 */ + setLocalHistory(value: string) { + try { + const listStr = localStorage.getItem(storageKey); + const obj = { name: value }; + const list = listStr ? JSON.parse(listStr) : []; + const resultList = list.filter(item => item.name !== value); + + if (resultList.length >= 50) { + resultList.splice(resultList.length - 1, resultList.length - 50); + } + + resultList.unshift(obj); + localStorage.setItem(storageKey, JSON.stringify(resultList)); + } catch (err) { + console.log(err); + } + } + /** 选中搜索结果 */ + handleItemClick(item: ISearchItem, type: string) { + this.searchType = type; + this.showPopover = false; + this.highlightedItem = item; + this.handleSearchJumpPage(item, type); + } + /** 渲染历史搜索列表 */ + renderHistoryList() { + return this.localHistoryList.map((item, ind) => this.renderHistoryItem(item, ind)); + } + /** 相关功能/文档渲染 */ + renderRouteAndWord() { + if (this.searchValue && this.searchRouteList.length > 0) { + return ( +
    +
    + {this.renderRouterList()} +
    + ); + } + } + /** 渲染搜索列表 */ + renderGroupList() { + return this.searchList.map((item, ind) => { + const data = highLightContent(this.searchValue, item.items, ['name']); + return ( +
    + + {item.name} ( {item.items.length} ) + + {data.map((child, key) => this.renderGroupItem(child, item.type, ind, key))} +
    + ); + }); + } + + /** 清空输入 */ + clearInput(e: Event) { + e.stopPropagation(); + this.searchList = []; + this.handleResetData(); + this.textareaInputRef.style.height = '52px'; + } + /** 重置相关的数据 */ + handleResetData() { + this.isInput = false; + this.searchValue = ''; + this.highlightedIndex = [-1, -1]; + this.highlightedItem = null; + } + /** 溢出动态展示输入框高度 */ + autoResize(event?: Event) { + !this.isComposing && this.handleGetSearchData(); + this.isInput = !!event?.target?.value; + this.textareaInputRef.style.height = 'auto'; + this.textareaInputRef.style.height = `${this.textareaInputRef.scrollHeight}px`; + } + /** 清空历史 */ + clearHistory() { + localStorage.setItem(storageKey, JSON.stringify([])); + this.localHistoryList = []; + this.handleResetData(); + } + /** 获取选中当前高亮的搜索项 */ + getSearchHightItem(key: string = ESearchPopoverType.searchList) { + if (this[key].length === 0) { + this.highlightedItem = null; + return; + } + if (key === ESearchPopoverType.searchList) { + this.highlightedItem = this[key][this.highlightedIndex[0]].items[this.highlightedIndex[1]]; + this.highlightedItem.type = this[key][this.highlightedIndex[0]].type; + return; + } + this.highlightedItem = this[key][this.highlightedIndex[1]]; + this.searchValue = this[key][this.highlightedIndex[1]].name; + } + + /** 键盘向上切换选中设置当前的index */ + setHighlightIndexUp(key: string = ESearchPopoverType.searchList) { + if (this[key].length === 0) { + return; + } + if (key === ESearchPopoverType.searchList) { + this.keyWordUpOrDown('up'); + return; + } + this.highlightedIndex[1] = (this.highlightedIndex[1] - 1 + this[key].length) % this[key].length; + } + /** 键盘上下键操作 */ + keyWordUpOrDown(type: string) { + const len = this.searchLenArr.length; + let parentId = this.highlightedIndex[0]; + let ind = this.highlightedIndex[1]; + /** 向上 */ + if (type === 'up') { + ind -= 1; + if (ind < 0) { + parentId -= 1; + ind = this.searchLenArr[parentId] - 1; + } + if (parentId < 0) { + parentId = len - 1; + ind = this.searchLenArr[parentId] - 1; + } + } + /** 向下 */ + if (type === 'down') { + ind += 1; + if (ind > this.searchLenArr[parentId] - 1) { + parentId += 1; + ind = 0; + } + if (parentId > len - 1) { + parentId = 0; + ind = 0; + } + } + this.highlightedIndex = [parentId, ind]; + } + /** 键盘向上切换选中设置当前的index */ + setHighlightIndexDown(key: string = ESearchPopoverType.searchList) { + if (this[key].length === 0) { + return; + } + if (key === ESearchPopoverType.searchList) { + this.keyWordUpOrDown('down'); + return; + } + this.highlightedIndex[1] = (this.highlightedIndex[1] + 1) % this[key].length; + } + /** 键盘向上切换选中 */ + handleHighlightUp() { + this.setHighlightIndexUp(this.currentListKey); + this.getSearchHightItem(this.currentListKey); + } + /** 键盘向下切换选中 */ + handleHighlightDown() { + this.setHighlightIndexDown(this.currentListKey); + this.getSearchHightItem(this.currentListKey); + } + + /** 键盘操作 */ + handleKeydown(event: KeyboardEvent) { + switch (event.key) { + case 'ArrowUp': + this.handleHighlightUp(); + break; + case 'ArrowDown': + this.handleHighlightDown(); + break; + /** 回车跳转 */ + case 'Enter': + event.preventDefault(); + /** 如果是搜索结果，回车则是跳转 */ + if (this.isSearchResult) { + this.highlightedItem && this.handleSearchJumpPage(this.highlightedItem, this.highlightedItem.type); + return; + } + this.isInput = true; + /** 如果是历史搜索页面回车则搜索 */ + this.handleGetSearchData(); + break; + default: + return; + } + } + /** 跳转到具体的页面 */ + handleSearchJumpPage(item: ISearchItem, type: string) { + /** 回车跳转了则存入到历史搜索中 */ + if (this.searchValue) { + this.setLocalHistory(this.searchValue); + } + const baseParams = { bizId: item.bk_biz_id }; + const k8sV2EnableList = this.$store.getters.k8sV2EnableList; + /** 是否需要跳转到新版的k8s */ + const isNewK8sV2List = k8sV2EnableList.some(id => (id === 0 ? true : +id === +item.bk_biz_id)); + const routeOptions = { + /** 告警 */ + alert: { + name: 'event-center', + query: { alertId: String(item.alert_id) }, + extraParams: { specEvent: 1 }, + }, + /** 告警策略 */ + strategy: { + name: 'strategy-config', + query: { filters: JSON.stringify([{ key: 'strategy_id', value: [item.strategy_id] }]) }, + }, + /** Trace */ + trace: { + name: 'trace-retrieval', + query: { + app_name: item.app_name, + search_type: 'accurate', + search_id: 'traceID', + trace_id: item.trace_id, + }, + }, + /** APM应用 */ + apm_application: { + name: 'apm-home', + query: { app_name: item.app_name }, + }, + /** 主机 */ + host: { + name: 'performance-detail', + params: { id: item.bk_host_id }, + }, + /** 关联的告警 */ + 'strategy-alarm': { + name: 'event-center', + query: { queryString: `策略ID : ${item.strategy_id}` }, + }, + /** 关联的屏蔽策略 */ + 'alarm-shield': { + name: 'alarm-shield', + query: { queryString: JSON.stringify([{ key: 'strategy_id', value: [item.strategy_id] }]) }, + }, + /** bcs */ + bcs_cluster: { + name: isNewK8sV2List ? 'k8s-new' : 'k8s', + query: isNewK8sV2List + ? { + sceneId: 'kubernetes', + cluster: item.bcs_cluster_id, + scene: 'performance', + activeTab: 'list', + } + : { + 'filter-bcs_cluster_id': item.bcs_cluster_id, + sceneId: 'kubernetes', + sceneType: 'detail', + dashboardId: 'cluster', + }, + }, + }; + + const option = routeOptions[type]; + if (!option) return; + + const routeData = this.$router.resolve(option); + const extraParams = option.extraParams ? `&${new URLSearchParams(option.extraParams).toString()}` : ''; + const baseUrl = `${location.origin}/?${new URLSearchParams(baseParams).toString()}${extraParams}`; + window.open(`${baseUrl}${routeData.href}`, '_blank'); + } + handleCompositionend() { + this.isComposing = false; + } + handleCompositionstart() { + this.isComposing = true; + } + handleBlur() { + this.showPopover = false; + } + /** 渲染历史搜索View */ + renderHistoryView() { + if (this.localHistoryList.length > 0) { + return ( +
    +
    + {this.$t('历史搜索')} + + + {this.$t('清空历史')} + +
    +
    {this.renderHistoryList()}
    +
    + ); + } + return ( + + {this.$t('请输入关键词进行搜索')} + + ); + } + /** 渲染搜索结果View */ + renderSearchView() { + if (!this.isLoading && this.searchList.length === 0) { + return ( + + + {this.$t('当前输入条件无匹配结果，请清空后重新输入')} + + + + ); + } + return ( +
    +
    + {this.renderGroupList()} + {this.isLoading && ( +
    + )} + {this.renderRouteAndWord()} +
    +
    + ); + } + + render() { + return ( +
    +
    + + + {this.searchValue && ( + + )} + {this.showPopover && ( +
    + {this.isSearchResult ? this.renderSearchView() : this.renderHistoryView()} +
    + )} +
    +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.scss new file mode 100644 index 0000000000..9b040afb5a --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.scss @@ -0,0 +1,207 @@ +@mixin common-route-icon { + display: flex; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + margin: 0 12px; + overflow: hidden; + font-size: 12px; + color: #DCDEE5; +} + +@mixin customize { + display: flex; + align-items: center; + justify-content: space-around; + width: 70px; + height: 23px; + cursor: pointer; + background: #0F1216; + border: 1px solid #33415B; + border-radius: 2px; + + &:hover { + background: #293241; + border: 1px solid #405680; + } + + .icon-menu-setting { + color: #699DF4; + } + + span { + font-size: 12px; + line-height: 20px; + color: #699DF4; + letter-spacing: 0; + } +} + +// 定义扩展动画 +@keyframes expand { + from { + max-height: 32px; + } + + to { + max-height: 96px; + } +} + +// 定义收缩动画 +@keyframes shrink { + from { + max-height: 96px; + } + + to { + max-height: 32px; + } +} + +.quick-access { + position: relative; + width: 19%; + + .quick-head { + display: flex; + justify-content: space-between; + + .customize { + @include customize; + } + + .quick-title { + margin-bottom: 12px; + font-family: MicrosoftYaHei-Bold; + font-size: 18px; + font-weight: 700; + color: #FFFFFF; + } + } + + .quick-list { + display: flex; + flex-direction: column; + justify-content: space-between; + height: calc(100% - 36px); + padding: 0; + padding-top: 16px; + margin: 0; + color: #fff; + background-color: #fff; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + + .quick-items { + flex: 1; + max-height: 160px; + overflow: auto; + + &.no-ai-whale { + max-height: 230px; + } + + &-empty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; + font-size: 14px; + color: #4D4F56; + text-align: center; + + .empty-img { + width: 220px; + height: 100px; + + img { + width: 100%; + height: 100%; + } + } + } + + .quick-item { + padding: 5px 0 7px 12px; + font-family: MicrosoftYaHei; + font-size: 12px; + line-height: 19px; + color: #4D4F56; + cursor: pointer; + transition: color 0.3s; + + .icon-monitor { + margin-right: 5px; + font-size: 14px; + color: #979BA5; + } + + &:hover { + color: #007bff; + background: #E1ECFF; + + .icon-monitor { + color: #007bff; + } + } + } + } + + .skeleton { + .skeleton-element { + height: 24px; + margin: 4px auto 8px; + width: calc(100% - 24px); + &:last-child { + margin: 0 auto; + } + } + &.no-ai-whale { + max-height: 230px; + } + } + } +} + +.myself-popover { + .tippy-tooltip { + padding: 0; + } + + .common-tool-popover { + .tool-popover-title { + padding: 12px 16px; + font-family: MicrosoftYaHei; + font-size: 14px; + color: #313238; + + .route-count { + margin-left: 12px; + font-size: 12px; + color: #979BA5; + } + } + + .tool-popover-content-item { + display: flex; + flex: 1; + align-items: center; + justify-content: space-between; + padding: 4px 0 6px 16px; + margin-bottom: 4px; + + .icon-mc-tuozhuai { + cursor: move; + @include common-route-icon; + } + + &:last-child { + margin-bottom: 12px; + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.tsx new file mode 100644 index 0000000000..da615d6422 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/quick-access.tsx @@ -0,0 +1,182 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import Component from 'vue-class-component'; +import { Emit, Mixins, Prop } from 'vue-property-decorator'; + +import { deepClone } from 'monitor-common/utils'; + +import UserConfigMixin from '../../../../mixins/userStoreConfig'; +import { COMMON_ROUTE_LIST, COMMON_ROUTE_STORE_KEY, DEFAULT_ROUTE_LIST } from '../../../../router/router-config'; +import emptyImageSrc from '../../../../static/images/png/empty.png'; +import AiWhaleInput from './ai-whale-input'; +import HeaderSettingModal from './header-setting-modal'; + +import './quick-access.scss'; + +@Component({}) +export default class QuickAccess extends Mixins(UserConfigMixin) { + @Prop({ default: false, type: Boolean }) categoriesHasTwoRows: boolean; + @Prop({ default: false, type: Boolean }) enableAiAssistant: boolean; + + loadingQuickList = true; // 快捷入口loading + + quickAccessList = []; // 快捷入口列表 + + showModal = false; // 控制模态框显示 + + async created() { + try { + await this.initQuickAccessData(); + } catch { } + } + + // 初始化快捷入口的数据 + async initQuickAccessData() { + try { + this.loadingQuickList = true; + const data = (await this.handleGetUserConfig(COMMON_ROUTE_STORE_KEY, { reject403: true })) || []; + const routes = []; + for (const item of COMMON_ROUTE_LIST) { + const list = item.children?.filter(set => data.includes(set.id)); + list?.length && routes.push(...list); + } + this.quickAccessList = data.length + ? data.map(id => routes.find(item => item.id === id)).filter(Boolean) + : this.getDefaultQuickAccessList(); + } catch { + } finally { + this.loadingQuickList = false; + } + } + + // 获取默认快捷入口配置 + getDefaultQuickAccessList() { + const routes = []; + for (const item of COMMON_ROUTE_LIST) { + const list = item.children?.filter(set => DEFAULT_ROUTE_LIST.includes(set.id)); + list?.length && routes.push(...list); + } + return DEFAULT_ROUTE_LIST.map(id => routes.find(item => item.id === id)).filter(Boolean); + } + + // 缓存快捷入口 + async handleSetQuickAccess(v) { + this.loadingQuickList = true; + this.showModal = false; + this.quickAccessList = deepClone(v); + await this.handleSetUserConfig(COMMON_ROUTE_STORE_KEY, JSON.stringify(this.quickAccessList.map(item => item.id))); + this.$nextTick(() => { + this.loadingQuickList = false; + }); + } + + // 显示或隐藏头部设置模态框 + handleHeaderSettingShowChange(visible: boolean) { + this.showModal = visible; + } + + @Emit('handleGoStoreRoute') + handleGoStoreRoute(item) { + return item; + } + @Emit('handleKeyDown') + handleKeyDown(e) { + return e; + } + + render() { + return ( +
    +
    +
    {this.$t('快捷入口')}
    +
    (this.showModal = true)} + > + + {this.$t('自定义')} +
    +
    +
    + {!this.loadingQuickList ? ( +
      + {this.quickAccessList.length ? ( + this.quickAccessList + ?.filter(item => item.id) + .map(item => ( +
    • this.handleGoStoreRoute(item)} + > + + {this.$t(item.name.startsWith('route-') ? item.name : `route-${item.name}`)} +
      • + )) + ) : ( +
      + {' '} +
      + +
      + {this.$t('暂无快捷入口')} +
      + )} +
    + ) : ( +
    + {Array(this.enableAiAssistant ? 6 : 7) + .fill(null) + .map((_, index) => ( +
    + ))} +
    + )} +
    + {/* AI 小鲸 */} + {this.enableAiAssistant && ( + + )} + {/* 快捷入口模态框 */} + this.handleSetQuickAccess(v)} + /> +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.scss new file mode 100644 index 0000000000..04d4e5f0b5 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.scss @@ -0,0 +1,155 @@ +@import '../../../../theme/index.scss'; + +.recent-alarm-events { + padding-bottom: 20px; + margin: 0 auto; + background-color: #f5f7fa; + border-radius: 8px; + + .title { + margin-bottom: 12px; + font-family: MicrosoftYaHei; + font-size: 16px; + line-height: 24px; + color: #313238; + } + + + .content { + .loading-element { + transition: height 0.5s ease; /* 0.3 秒的过渡时间，可以根据需要调整 */ + } + .list-content { + display: flex; + flex-wrap: wrap; + gap: 24px 2%; + align-items: center; + + .list-item { + width: 32%; + height: 210px; + background: #ffffff; + border-radius: 2px; + box-shadow: 0 2px 4px 0 #1919290d; + + &:hover { + cursor: pointer; + } + } + + .add-content { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-family: MicrosoftYaHei; + font-size: 14px; + line-height: 22px; + color: #3a84ff; + text-align: center; + background: #f0f5ff; + border: 1px dashed #a3c5fd; + border-radius: 2px; + + .icon-mc-add { + font-size: 22px; + } + + &:hover { + background: #e1ecff; + } + } + } + + .empty-content { + .empty-img { + width: 220px; + height: 100px; + margin: 70px auto 0; + + img { + width: 100%; + height: 100%; + } + } + } + + .empty-info { + margin-bottom: 24px; + font-family: MicrosoftYaHei; + font-size: 14px; + line-height: 22px; + color: #4d4f56; + text-align: center; + } + + .empty-btn { + margin-bottom: 100px; + text-align: center; + } + } +} + +.task-del-dialog { + .bk-dialog-body { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 10px 32px 24px; + + .icon { + width: 42px; + height: 42px; + margin-bottom: 19px; + font-size: 30px; + line-height: 42px; + color: #ff9c01; + text-align: center; + background: #ffe8c3; + border-radius: 50%; + } + + .info { + height: 32px; + margin-bottom: 16px; + font-family: MicrosoftYaHei; + font-size: 20px; + line-height: 32px; + color: #313238; + text-align: center; + } + + .detail { + width: 100%; + height: 22px; + margin-bottom: 16px; + font-family: MicrosoftYaHei; + font-size: 14px; + line-height: 22px; + color: #4d4f56; + } + + .tips { + width: 100%; + height: 46px; + padding: 12px 16px; + margin: 0 auto; + margin-bottom: 24px; + font-family: MicrosoftYaHei; + font-size: 14px; + line-height: 22px; + color: #4d4f56; + background: #f5f6fa; + border-radius: 2px; + } + + .foot { + &:first-child, + button { + margin-right: 9px; + width: 88px; + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.tsx new file mode 100644 index 0000000000..e4d4928135 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-events.tsx @@ -0,0 +1,533 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component, Watch } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import { deleteAlarmGraphConfig, getAlarmGraphConfig, saveAlarmGraphConfig } from 'monitor-api/modules/overview'; +import draggable from 'vuedraggable'; + +import { shortcuts } from '../../../../components/time-range/utils'; +import emptyImageSrc from '../../../../static/images/png/empty.png'; +import AddAlarmChartDialog from './add-alarm-chart-dialog'; +import HomeAlarmChart from './home-alarm-chart'; +import RecentAlarmTab from './recent-alarm-tab'; + +import type { TimeRangeType } from '../../../../components/time-range/time-range'; +import type { IAlarmGraphConfig } from '../type'; +import type { IRecentAlarmTab } from '../type'; + +import './recent-alarm-events.scss'; + +@Component({ + name: 'RecentAlarmEvents', + components: { + draggable, + }, +}) +export default class RecentAlarmEvents extends tsc { + /** Tab 相关 */ + businessTab: IRecentAlarmTab[] = []; // 业务选项卡 + showTabLoading = false; // 展示tab的加载loading、 + activeTabId = null; // 默认选中第一个标签 + + /** 图表 相关 */ + alarmGraphContent: IAlarmGraphConfig[] = []; // 图表配置 + alarmGraphBizId = null; // 告警图表业务id + + loadingAlarmList = true; // 加载图表列表 + + isAppendMode = false; // 是否为新增图表 + showAddTaskDialog = false; // 展示添加图表/业务弹窗 + + editChartIndex = null; // 编辑的图表下标 + showDelDialog = false; // 展示删除图表/业务弹窗 + currentDelId = null; // 当前删除的图表id + + /** 策略配置 相关 */ + strategyConfig = { + strategy_ids: [], + name: '', + status: [], + }; + delStrategyIdSet: Set = new Set(); // 已删除的策略id列表 + + handleMenuMode: '' | 'delete' | 'detail' | 'edit' = ''; // MenuList 操作模式 + childRefs = []; // 存储每个子组件的 ref + timeRange = shortcuts[5].value as TimeRangeType; // 时间选择器 + + @Watch('activeTabId') + handleSwitchTab() { + this.getTabAndAlarmConfig(false); + } + + async created() { + await this.getTabAndAlarmConfig(); + this.activeTabId = this.businessTab[0]?.bk_biz_id; // 默认选中第一个标签 + } + + async getTabAndAlarmConfig(updateTab = true) { + try { + this.loadingAlarmList = !this.editChartIndex; + this.showTabLoading = updateTab; + const data = await getAlarmGraphConfig({ + bk_biz_id: this.activeTabId, + }); + if (updateTab) { + if (this.businessTab.length === 0) { + this.activeTabId = data.tags?.[0]?.bk_biz_id; + } else if (this.businessTab.length < data.tags.length) { + // 当新增业务时,切换至当前的新增业务 + this.activeTabId = data.tags?.at(-1)?.bk_biz_id; + } + this.businessTab = data.tags || []; + } + this.alarmGraphContent = data.config || []; + } catch (error) { + console.log('get Date error', error); + } finally { + this.showTabLoading = false; + this.loadingAlarmList = false; + } + } + + // 图表 start + // 图表列表 + getAlarmGraphList(list) { + // 列表最后一个为新增图表 + const add = () => ( +
    this.handleAddChart()} + > + + {this.$t('新增图表')} +
    + ); + return ( +
    + {list.map((item, index) => ( +
    + (this.childRefs[index] = el)} // 存储子组件的 ref + config={item} + currentActiveId={this.activeTabId} + timeRange={this.timeRange} + onMenuClick={({ id }) => this.handleMenuClick(id, item, index)} + /> +
    + ))} + {add()} +
    + ); + } + + /** MenuList操作 */ + handleMenuClick(mode, item, index) { + this.handleMenuMode = mode; + switch (mode) { + case 'edit': + this.strategyConfig.name = item.name; + this.strategyConfig.strategy_ids = item.strategy_ids; + this.strategyConfig.status = item.status; + this.editChartIndex = index; + this.handleAddChart(); + break; + case 'delete': + this.editChartIndex = index; + this.showDelDialog = true; + break; + case 'detail': { + // 跳转至事件中心 + const baseUrl = window.location.href.split('#')[0]; + let queryString = ''; + for (const id of item.strategy_ids) { + queryString += `策略ID : ${id} OR `; + } + queryString = queryString.slice(0, queryString.length - 3); + const [from, to] = this.timeRange; + const url = `${baseUrl}#/event-center/?queryString=${encodeURIComponent(queryString)}&from=${from}&to=${to}&bizIds=${this.activeTabId}`; + window.open(url, '_blank'); + break; + } + } + } + // 新增图表 + handleAddChart() { + this.alarmGraphBizId = this.activeTabId; + this.isAppendMode = true; + this.showAddTaskDialog = true; + } + + // 取消新增图表 + handleCancel() { + this.alarmGraphBizId = null; + this.showAddTaskDialog = false; + } + + // 生成配置 + generateConfig() { + // 如果是追加模式，遍历内容生成配置 + if (this.isAppendMode) { + return this.alarmGraphContent.map(({ name, strategy_ids }) => ({ + name, + strategy_ids, + })); + } + // 否则，返回空数组 + return []; + } + + /** + * 更新配置的主函数，根据编辑模式和操作类型执行相应操作。 + * @param config - 当前配置数组。 + * @param editChartIndex - 当前编辑的索引，null 表示新增模式。 + * @param handleMenuMode - 当前操作模式，'delete' 表示删除。 + * @param strategyConfig - 当前策略配置对象。 + * @param delStrategyIdSet - 需要删除的策略 ID 集合。 + */ + updateConfig( + config: Array, + editChartIndex: null | number, + handleMenuMode: string, + strategyConfig: { status: Array; strategy_ids: Array }, + delStrategyIdSet: Set + ): void { + const isEditMode = editChartIndex !== null; // 判断是否处于编辑模式 + const isDeleteMode = handleMenuMode === 'delete'; // 判断是否为删除操作 + + if (isEditMode) { + this.handleEditMode(config, editChartIndex, isDeleteMode, strategyConfig, delStrategyIdSet); + } else { + // 如果不是编辑模式，添加新的配置 + config.push(strategyConfig); + } + } + + /** + * 处理编辑模式下的配置更新。 + * @param config - 当前配置数组。 + * @param editChartIndex - 当前编辑的索引。 + * @param isDeleteMode - 是否为删除操作。 + * @param strategyConfig - 当前策略配置对象。 + * @param delStrategyIdSet - 需要删除的策略 ID 集合。 + */ + handleEditMode( + config: Array, + editChartIndex: number, + isDeleteMode: boolean, + strategyConfig: { status: Array; strategy_ids: Array }, + delStrategyIdSet: Set + ): void { + if (isDeleteMode) { + this.deleteConfig(config, editChartIndex); + } else { + this.modifyConfig(config, editChartIndex, strategyConfig, delStrategyIdSet); + } + } + + /** + * 删除指定索引的配置。 + * @param config - 当前配置数组。 + * @param editChartIndex - 要删除的索引。 + */ + deleteConfig(config: Array, editChartIndex: number): void { + config.splice(editChartIndex, 1); + } + + /** + * 修改指定索引的配置。 + * @param config - 当前配置数组。 + * @param editChartIndex - 要修改的索引。 + * @param strategyConfig - 当前策略配置对象。 + * @param delStrategyIdSet - 需要删除的策略 ID 集合。 + */ + modifyConfig( + config: Array, + editChartIndex: number, + strategyConfig: { status: Array; strategy_ids: Array }, + delStrategyIdSet: Set + ): void { + if (delStrategyIdSet.size > 0) { + this.filterStrategyConfig(strategyConfig, delStrategyIdSet); + } + config.splice(editChartIndex, 1, strategyConfig); + } + + /** + * 过滤策略配置中的状态和策略 ID。 + * @param strategyConfig - 当前策略配置对象。 + * @param delStrategyIdSet - 需要删除的策略 ID 集合。 + */ + filterStrategyConfig( + strategyConfig: { status: Array; strategy_ids: Array }, + delStrategyIdSet: Set + ): void { + strategyConfig.status = strategyConfig.status.filter(item => !delStrategyIdSet.has(item.strategy_id)); + strategyConfig.strategy_ids = strategyConfig.strategy_ids.filter(id => !delStrategyIdSet.has(id)); + } + + async handleSaveAlarmGraphConfig() { + // 生成初始配置 + this.showAddTaskDialog = false; + const config = this.generateConfig(); + this.updateConfig(config, this.editChartIndex, this.handleMenuMode, this.strategyConfig, this.delStrategyIdSet); + try { + // 保存告警图表配置 + await saveAlarmGraphConfig({ + bk_biz_id: this.getBusinessConfigId(), + config, + }); + // 如果是新增业务，需要刷新 tabs + await this.getTabAndAlarmConfig(!this.isAppendMode); + // 调用子组件的方法 + if (this.childRefs[this.editChartIndex]) { + this.childRefs[this.editChartIndex].getPanelData(); // 调用子组件的方法 + } + } catch (error) { + // 捕获并处理错误 + console.error('Error saving alarm graph config:', error); + this.$bkMessage({ + theme: 'error', + message: this.$t('保存告警图表配置时出错，请稍后重试'), + }); + } finally { + this.showDelDialog = false; + } + } + // 图表 end + + // 业务 start + // 添加业务 + async handleSelectBiz(id) { + this.alarmGraphBizId = id; + this.showAddTaskDialog = true; + this.isAppendMode = false; + } + + // 获取业务配置 ID + getBusinessConfigId() { + // 返回业务配置 ID，如果没有则返回当前活动的 Tab ID + return this.alarmGraphBizId || this.activeTabId; + } + + // 删除图表/业务 Dialog + getDelChartDialog() { + let detail = this.$t('业务：{0}', { + 0: this.businessTab.filter(item => item.bk_biz_id === this.currentDelId)[0]?.bk_biz_name, + }); + let tips = this.$t('删除后，该tab下的视图也会一起删除'); + let info = this.$t('确定删除该业务视图？'); + let handleDelFunction = this.delTaskByIndex; + if (this.handleMenuMode === 'delete') { + detail = ''; + tips = ''; + info = this.$t('确定删除该视图？'); + this.alarmGraphBizId = this.activeTabId; + this.isAppendMode = true; + handleDelFunction = this.handleSaveAlarmGraphConfig; + } + return ( + { + this.currentDelId = null; + this.handleMenuMode = ''; + // 重置编辑索引，关闭对话框，清除策略配置 + this.clearStrategyConfig(); + }} + onCancel={this.handleCancelDel} + > +
    +
    {info}
    + {detail &&
    {detail}
    } + {tips &&
    {tips}
    } +
    + + {this.$t('删除')} + + + {this.$t('取消')} + +
    + + ); + } + + // 处理删除业务逻辑 + handleDelTask(id) { + this.currentDelId = id; + this.showDelDialog = true; + } + + // 取消删除 + handleCancelDel() { + this.showDelDialog = false; + } + + // 删除业务 + delTaskByIndex() { + this.businessTab = this.businessTab.filter(item => item.bk_biz_id !== this.currentDelId); + deleteAlarmGraphConfig({ + bk_biz_id: this.currentDelId, + }); + // 当删除的是当前的业务，切换activeTab状态 + if (this.currentDelId === this.activeTabId && this.businessTab.length) { + this.activeTabId = this.businessTab[0].bk_biz_id; + } + // 业务全部删除 + if (this.businessTab.length === 0) { + this.alarmGraphContent = []; + } + this.showDelDialog = false; + this.clearStrategyConfig(); + } + // 业务 end + + // 空数组展示 + getEmptyContent() { + return ( +
    +
    + +
    +
    + {this.businessTab.length === 0 + ? this.$t('当前还未配置业务，快点击添加业务按钮新增图表') + : this.$t('当前业务还未配置视图，快点击下方按钮新增图表')} +
    + {this.businessTab.length > 0 && ( +
    + + {this.$t('新增图表')} + +
    + )} +
    + ); + } + + // 拖拽完成 + handleDropEnd(tabs) { + this.businessTab = tabs; + } + + // 计算Loading高度 + getLoadingHeight() { + if (!this.alarmGraphContent.length) return '398px'; + return `${Math.ceil((this.alarmGraphContent.length + 2) / 3) * 210}px`; + } + + // 清除相关数据 + clearStrategyConfig() { + this.strategyConfig.strategy_ids = []; + this.strategyConfig.name = ''; + this.editChartIndex = null; + this.handleMenuMode = ''; + this.delStrategyIdSet = new Set(); + } + + render() { + return ( +
    +
    + {this.$t('最近告警事件')} +
    + {/* 头部功能区 */} + { + this.activeTabId = id; + }} + onChangeTime={timeRange => { + this.timeRange = timeRange; + }} + onHandleDelTask={this.handleDelTask} + onHandleDropTab={this.handleDropEnd} + onHandleSelectBiz={this.handleSelectBiz} + /> + {/* 主体内容 */} +
    + {this.loadingAlarmList ? ( +
    + ) : !this.alarmGraphContent.length ? ( + this.getEmptyContent() + ) : ( + this.getAlarmGraphList(this.alarmGraphContent) + )} +
    + {/* 删除业务/图表-模态框 */} + {this.getDelChartDialog()} + {/* 新增业务/图表-模态框 */} + { + { + this.handleMenuMode = ''; + this.editChartIndex = null; + }} + onCancel={this.handleCancel} + onConfirm={(strategyIds, name, delStrategyIds) => { + this.strategyConfig.name = name; + this.strategyConfig.strategy_ids = strategyIds; + this.delStrategyIdSet = delStrategyIds; + this.handleSaveAlarmGraphConfig(); + }} + /> + } +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.scss new file mode 100644 index 0000000000..7edacc4534 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.scss @@ -0,0 +1,106 @@ +.recent-alarm-tab { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 12px; + + .tabs { + display: flex; + align-items: center; + + .tab { + position: relative; + display: flex; + align-items: baseline; + justify-content: space-between; + margin-right: 10px; + border: 1px solid transparent; + + .tab-title { + padding: 8px 8px 9px 8px; + font-family: MicrosoftYaHei; + font-size: 14px; + line-height: 22px; + color: #4d4f56; + vertical-align: middle; + cursor: pointer; + + &.active { + font-family: MicrosoftYaHei-Bold; + font-size: 16px; + font-weight: 700; + color: #4d4f56; + border-bottom: 2px solid #3a84ff; + } + &.is-dragover { + background-color: #e1ecff; + } + } + + .item-drag { + position: absolute; + top: 12px; + left: -13px; + height: 16px; + color: #979ba5; + visibility: hidden; + + &:hover { + cursor: move; + visibility: visible; + } + } + + .item-close { + font-size: 13px; + color: #4d4f56; + visibility: hidden; + + &:hover { + color: #ea3636; + cursor: pointer; + } + } + + &:hover { + .item-drag { + cursor: move; + visibility: visible; + } + + .item-close { + visibility: visible; + } + } + } + + .add-task { + margin-left: auto; + font-family: MicrosoftYaHei; + font-size: 12px; + line-height: 20px; + color: #3a84ff; + letter-spacing: 0; + cursor: pointer; + + .icon-plus-circle { + margin-right: 5px; + font-size: 14px; + } + } + + .task-disabled { + color: #c4c6cc; + cursor: not-allowed; + } + } + + .alarm-time-filter { + color: #4d4f56; + background: #ffffff; + width: 116px; + .icon-angle-down { + color: #979ba5; + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.tsx new file mode 100644 index 0000000000..53b0ec1ead --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-alarm-tab.tsx @@ -0,0 +1,243 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import Component from 'vue-class-component'; +import { Emit, Mixins, Prop } from 'vue-property-decorator'; + +import { saveAlarmGraphBizIndex } from 'monitor-api/modules/overview'; + +import { shortcuts } from '../../../../components/time-range/utils'; +import UserConfigMixin from '../../../../mixins/userStoreConfig'; +import { RECENT_ALARM_TIME_RANGE_KEY } from '../utils'; +import HomeBizSelect from './home-biz-list'; + +import type { TimeRangeType } from '../../../../components/time-range/time-range'; +import type { IRecentAlarmTab } from '../type'; + +import './recent-alarm-tab.scss'; + +interface IRecentAlarmTabProps { + tabs: IRecentAlarmTab[]; + activeTabId: number; + showTabLoading: boolean; +} +@Component({ + name: 'RecentAlarmTab', +}) +export default class RecentAlarmTab extends Mixins(UserConfigMixin) { + /** 业务列表 */ + @Prop({ default: () => [], type: Array }) tabs: IRecentAlarmTabProps['tabs']; + /** 当前业务ID */ + @Prop({ default: 0, type: Number }) activeTabId: IRecentAlarmTabProps['activeTabId']; + /** loading */ + @Prop({ default: false, type: Boolean }) showTabLoading: IRecentAlarmTabProps['showTabLoading']; + + /** 当前拖拽id */ + dragId = ''; + dragoverId = ''; + + /** 删除业务ID */ + currentDelId = null; + + /** 时间选择器 */ + timeRange = JSON.stringify(shortcuts[5].value as TimeRangeType); + + // 可以添加业务flag + get canAddBusiness() { + // 仅支持添加 10 个业务 + return this.tabs.length < 10; + } + + /** 业务列表 */ + get bizIdList() { + return this.$store.getters.bizList.filter( + ({ bk_biz_id }) => !this.tabs.map(item => item.bk_biz_id).includes(bk_biz_id) + ); + } + + async created() { + const timeRange = await this.handleGetUserConfig(RECENT_ALARM_TIME_RANGE_KEY, { + reject403: true, + }); + this.timeRange = JSON.stringify(timeRange || (shortcuts[5].value as TimeRangeType)); + } + + // 设置存储的首页时间选择器并同步到用户配置 + setStoreSelectedTimeRange() { + this.handleSetUserConfig(RECENT_ALARM_TIME_RANGE_KEY, this.timeRange); + } + + // 拖拽 start + // 拖拽开始，记录当前拖拽的ID + handleDragstart(index: number) { + this.dragId = index.toString(); + } + + // 拖拽经过事件，设置当前拖拽ID + handleDragover(index: number, e: DragEvent) { + e.preventDefault(); + this.dragoverId = index.toString(); + } + + // 拖拽离开事件，清除当前拖拽的ID + handleDragleave() { + this.dragoverId = ''; + } + + // 拖拽完成时逻辑 + handleDrop() { + if (this.dragId !== this.dragoverId) { + const tab = Object.assign([], this.tabs); + const dragIndex = Number.parseInt(this.dragId, 10); + const dragoverIndex = Number.parseInt(this.dragoverId, 10); + + const draggedTab = this.tabs[dragIndex]; + tab.splice(dragIndex, 1); + tab.splice(dragoverIndex, 0, draggedTab); + this.dragId = ''; + this.dragoverId = ''; + // 保存排序 + saveAlarmGraphBizIndex({ + bk_biz_ids: tab.map(tab => tab.bk_biz_id), + }); + this.$emit('handleDropTab', tab); + } + } + // 拖拽 end + + // 选择标签 + @Emit('changeTab') + selectTab(tabId: number) { + return tabId; + } + + // 处理删除业务逻辑 + @Emit('handleDelTask') + handleDelTask(id: number) { + return id; + } + + // 添加业务 + @Emit('handleSelectBiz') + handleSelectBiz(id: number) { + return id; + } + + // 改变时间选择器 + @Emit('changeTime') + handleChangeTime() { + return JSON.parse(this.timeRange); + } + + render() { + return ( +
    + { +
    + {this.tabs.map(({ bk_biz_name: name, bk_biz_id: id }, index) => ( +
    this.handleDragover(index, e)} + onDragstart={() => this.handleDragstart(index)} + onDrop={this.handleDrop} + > + + this.selectTab(id)} + > + {name} + +
    + this.handleDelTask(id)} + /> +
    +
    + ))} + {!this.canAddBusiness ? ( + + + {this.$t('添加业务')} + + ) : ( + + )} +
    + } + {/* 时间选择器 */} +
    + + {shortcuts.map(option => ( + + ))} + +
    +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss new file mode 100644 index 0000000000..30c4db9471 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss @@ -0,0 +1,171 @@ +.recent-content { + display: flex; + flex-wrap: wrap; + height: calc(100% - 36px); + padding: 24px; + background-color: #fff; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + + .category { + box-sizing: box-sizing; + padding: 0 8px 0 8px; + + .sub-head { + display: flex; + justify-content: space-between; + margin-bottom: 8px; + .head { + padding-left: 8px; + } + .recent-subtitle { + font-family: MicrosoftYaHei-Bold; + font-size: 14px; + font-weight: 700; + color: #313238; + } + + .bk-icon, + .img { + margin-right: 6px; + font-size: 20px; + } + + .img { + display: inline-block; + width: 20px; + + img { + width: 100%; + vertical-align: middle; + } + } + + .more { + width: 24px; + height: 20px; + font-family: MicrosoftYaHei; + font-size: 12px; + line-height: 20px; + color: #3A84FF; + letter-spacing: 0; + cursor: pointer; + } + + .skeleton-element { + width: 80px; + height: 23px; + } + } + + .recent-list { + height: 180px; + overflow: auto; + + &-empty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; + font-size: 14px; + text-align: center; + + .empty-img { + width: 220px; + height: 100px; + + img { + width: 100%; + height: 100%; + } + } + } + + .recent-item { + display: flex; + justify-content: space-between; + padding: 8px; + color: #555; + cursor: pointer; + transition: color 0.3s; + + &:nth-child(even) { + background: #FAFBFD; + } + + .detail { + overflow: hidden; + font-size: 12px; + line-height: 20px; + color: #313238; + text-overflow: ellipsis; + letter-spacing: 0; + white-space: nowrap; + + .favorite { + margin-right: 3px; + font-size: 14px; + color: #F8B64F; + } + + .tag { + display: inline-block; + width: 16px; + height: 16px; + margin-right: 8px; + line-height: 16px; + text-align: center; + background: #A3C5FD; + border-radius: 2px; + + span { + font-size: 10px; + font-weight: 700; + color: #FFFFFF; + text-align: center; + letter-spacing: 0; + } + } + } + + .desc { + height: 20px; + font-family: MicrosoftYaHei; + font-size: 12px; + line-height: 20px; + color: #979BA5; + text-align: right; + letter-spacing: 0; + } + + &:last-child { + border-bottom: none; + } + + &:hover { + background: #E1ECFF; + + .detail { + color: #3A84FF; + } + } + } + + .skeleton-list { + .skeleton-element { + margin-bottom: 13px; + height: 23px; + } + } + } + } + &.loading-element { + height: 258px; + width: 100%; + &.has-two-row { + height: 500px; + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.tsx new file mode 100644 index 0000000000..1a3679f9d0 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.tsx @@ -0,0 +1,281 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import Component from 'vue-class-component'; +import { Prop, Watch } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import { getFunctionShortcut } from 'monitor-api/modules/overview'; + +import emptyImageSrc from '../../../../static/images/png/empty.png'; +import dashboardSrc from '../../../../static/images/png/new-page/dashboard.png'; +import retrievalSrc from '../../../../static/images/png/new-page/retrieval.png'; +import serviceSrc from '../../../../static/images/png/new-page/service.png'; +import { EFunctionNameType } from '../utils'; + +import type { IRecentList } from '../type'; + +import './recent-favorites-list.scss'; + +interface IRecentFavoritesListProps { + hasTwoRows: boolean; + isRecentView: boolean; + itemsToDisplay?: IRecentList[]; + selectedCategories: string[]; + selectedNames: string[]; +} + +const categoryIcons = { + dashboard: dashboardSrc, + log_retrieve: retrievalSrc, + apm_service: serviceSrc, +}; + +// 三种布局方式 +const layoutClassesByLength = { + 1: 'single-col', + 2: 'double-col', + 3: 'triple-col', + 4: 'double-col', + 5: 'triple-col', + 6: 'triple-col', +}; +@Component({ + name: 'RecentFavoritesList', +}) +export default class RecentFavoritesList extends tsc { + @Prop({ default: false, type: Boolean }) hasTwoRows: boolean; + @Prop({ default: () => [], type: Array }) selectedCategories!: string[]; + @Prop({ default: () => [], type: Array }) selectedNames!: string[]; + @Prop({ default: false, type: Boolean }) isRecentView: boolean; + + recentItems: IRecentList[] = []; // 最近使用列表 + favoriteItems: IRecentList[] = []; // 收藏列表 + + loadingRecentList = false; + + // 计算布局策略 + get rowClass() { + return layoutClassesByLength[this.selectedCategories.length] || ''; + } + + // 根据当前视图状态获取要显示的项目 + get categoriesAfterSort() { + return this.selectedCategories.sort((a, b) => { + const orderA = this.orderMap[a] !== undefined ? this.orderMap[a] : Number.POSITIVE_INFINITY; + const orderB = this.orderMap[b] !== undefined ? this.orderMap[b] : Number.POSITIVE_INFINITY; + return orderA - orderB; + }); + } + + get orderMap() { + return this.selectedNames.reduce((acc, category, index) => { + acc[category] = index; + return acc; + }, {}); + } + + getItemByName(functionName): IRecentList { + const items = this.isRecentView ? this.recentItems : this.favoriteItems; + return items.filter(item => item.function === functionName)?.[0]; + } + + @Watch('selectedCategories') + handleSelect(newVal, oldVal) { + if (newVal === oldVal) return; + this.updateFunctionShortcut(); + } + + async updateFunctionShortcut() { + // TODO 分页 + this.loadingRecentList = true; + try { + const data = await getFunctionShortcut({ + type: this.isRecentView ? 'recent' : 'favorite', + functions: this.selectedCategories, + }); + if (this.isRecentView) { + this.recentItems = data; + } else { + this.favoriteItems = data; + } + } catch (error) { + console.log('error', error); + } finally { + this.loadingRecentList = false; + } + } + + /** 处理点击最近使用列表，实现跳转 */ + handleRecentList(type: string, item: any) { + const currentUrl = window.location.href; + const questionMarkIndex = currentUrl.indexOf('?'); + // 如果有 '?'，则截取字符串；否则返回完整的 URL + let baseUrl = questionMarkIndex !== -1 ? currentUrl.substring(0, questionMarkIndex) : currentUrl; + baseUrl += `?bizId=${item.bk_biz_id}`; + const callbacks: Record void> = { + /** 仪表盘 */ + dashboard: () => { + const url = `${baseUrl}#/grafana/d/${item.dashboard_uid}`; + window.open(url, '_blank'); + }, + /** APM */ + apm_service: () => { + const url = `${baseUrl}#/apm/service?filter-app_name=${item.app_name}&filter-service_name=${item.service_name}`; + window.open(url, '_blank'); + }, + /** 日志检索 */ + log_retrieve: () => { + const url = `${baseUrl}#/log-retrieval?indexId=${item.index_set_id}&spaceUid=${item.space_uid}`; + window.open(url, '_blank'); + }, + }; + + if (callbacks[type]) { + callbacks[type](); + } else { + console.warn(`Unhandled type: ${type}`); + } + } + + // 最近使用列表 + listItem({ item, title = '', tag = '', type }: { item: any; title?: string; tag?: string; type: string }) { + if (!item) return null; + return ( +
  • this.handleRecentList(type, item)} + > +
    + {!this.isRecentView && } + {tag && ( + + {tag} + + )} + {title} +
    + {item.bk_biz_name} +
    • + ); + } + + // 根据模块类型，获取对应参数 + getListItemParams(type: string, item: any) { + const typeHandlers: Record = { + /** 仪表盘 */ + dashboard: { + type, + item, + id: item.dashboard_uid, + title: item.dashboard_title, + }, + /** APM */ + apm_service: { + type, + item, + id: item.application_id, + title: `${item.app_name}/${item.service_name}`, + }, + /** 日志检索 */ + log_retrieve: { + type, + item, + title: item.index_set_name, + }, + }; + + return typeHandlers[type] || {}; + } + + renderList(param) { + const shortcut: IRecentList = this.getItemByName(param); + + return shortcut?.items.length ? ( + shortcut.items.map(item => this.listItem(this.getListItemParams(shortcut.function, item))) + ) : ( +
    +
    + +
    + {this.$t('暂无相关记录')} +
    + ); + } + + render() { + return ( +
    + {this.categoriesAfterSort.map(functionName => ( +
    +
    + {!this.loadingRecentList ? ( +
    + {categoryIcons[functionName] ? ( +
    + +
    + ) : ( + + )} + {EFunctionNameType[functionName]} + {/* 更多 */} +
    + ) : ( +
    + )} +
    +
      + {!this.loadingRecentList ? ( + this.renderList(functionName) + ) : ( +
      + {Array(5) + .fill(null) + .map((_, index) => ( +
      + ))} +
      + )} +
    +
    + ))} +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss new file mode 100644 index 0000000000..1cdf6c9dfe --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss @@ -0,0 +1,108 @@ + +@mixin common-route-icon { + display: flex; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + margin: 0 12px; + overflow: hidden; + font-size: 12px; + color: #DCDEE5; +} + +@mixin customize { + display: flex; + align-items: center; + justify-content: space-around; + width: 70px; + height: 23px; + cursor: pointer; + background: #0F1216; + border: 1px solid #33415B; + border-radius: 2px; + + &:hover { + background: #293241; + border: 1px solid #405680; + } + + .icon-menu-setting { + color: #699DF4; + } + + span { + font-size: 12px; + line-height: 20px; + color: #699DF4; + letter-spacing: 0; + } +} + +.recent-and-quick-access { + display: flex; + justify-content: space-between; + width: 100%; + margin: 0 auto; + border-radius: 8px; + + .recent-use { + position: relative; + width: 78%; + + .recent-head { + display: flex; + justify-content: space-between; + + .tab-buttons { + margin-bottom: 12px; + + .recent-title { + margin-right: 32px; + font-family: MicrosoftYaHei; + font-size: 14px; + color: #FFFFFF; + cursor: pointer; + } + + .active { + font-family: MicrosoftYaHei-Bold; + font-size: 18px; + font-weight: 700; + } + } + + .customize { + @include customize; + } + } + + /* 通过传递参数来动态控制每个 div 的宽度 */ + .single-col .category { + min-width: 100%; + } + + .double-col .category { + min-width: 50%; + } + + .triple-col .category { + min-width: 32%; + } + + .has-line { + gap: 27px 0; + + &::after { + position: absolute; + right: 30px; + bottom: 252px; + left: 30px; + display: block; + height: 1px; + content: ''; + background: #EAEBF0; + } + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx new file mode 100644 index 0000000000..0f57f25f3a --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx @@ -0,0 +1,269 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component, Mixins, Watch } from 'vue-property-decorator'; + +import bus from 'monitor-common/utils/event-bus'; +import draggable from 'vuedraggable'; + +import UserConfigMixin from '../../../../mixins/userStoreConfig'; +import { HANDLE_MENU_CHANGE } from '../../../../pages/nav-tools'; +import { GLOAB_FEATURE_LIST, type IRouteConfigItem } from '../../../../router/router-config'; +import aiWhaleStore from '../../../../store/modules/ai-whale'; +import { RECENT_FAVORITE_LIST_KEY } from '../utils'; +import QuickAccess from './quick-access'; +import RecentFavoritesList from './recent-favorites-list'; + +import './recent-favorites-tab.scss'; + +// 模块名称映射 +const modeNameMap = { + [window.i18n.tc('仪表盘')]: 'dashboard', + [window.i18n.tc('服务')]: 'apm_service', + [window.i18n.tc('日志检索')]: 'log_retrieve', + [window.i18n.tc('服务拨测')]: '-', + [window.i18n.tc('主机监控')]: '-', + [window.i18n.tc('容器服务')]: '-', +}; + +interface Category { + name: string; +} + +@Component({ + name: 'RecentFavoritesTab', + components: { + draggable, + }, +}) +export default class RecentFavoritesTab extends Mixins(UserConfigMixin) { + isRecentView = true; // 状态，用于切换视图 + selectedCategories = ['dashboard']; // 用户选择的类别 + categoriesConfig: Category[] = [ + { name: '仪表盘' }, + { name: '服务' }, + { name: '日志检索' }, + // { name: '服务拨测' }, + // { name: '主机监控' }, + // { name: '容器服务' }, + ]; + + // 展示AI小鲸输入框 + get enableAiAssistant() { + return aiWhaleStore.enableAiAssistant; + } + + // 是否两行布局 + get categoriesHasTwoRows() { + return this.selectedCategories.length > 3; + } + + @Watch('categoriesConfig') + onCategoriesOrderChanged() { + this.setStoreSelectedCategories(); + } + + // 获取被选中的变量名 + get selectedNames() { + return this.categoriesConfig.map(item => modeNameMap[item.name]); + } + + // 初始化最近使用的数据 + async initRecentUseData() { + try { + const [selected, selectList] = + (await this.handleGetUserConfig<[string[], []]>(RECENT_FAVORITE_LIST_KEY, { + reject403: true, + })) || []; + this.selectedCategories = selected.slice() || this.selectedCategories; + this.categoriesConfig = this.categoriesConfig + .reduce((accumulator: Category[], category: Category) => { + if (!accumulator.some(item => item.name === category.name)) { + accumulator.push(category); + } + return accumulator; + }, selectList || []) + .slice(); + } catch { } + } + + async created() { + try { + await this.initRecentUseData(); + } catch (error) { + console.log('error', error); + } + } + + // 设置存储的最近使用模块并同步到用户配置 + setStoreSelectedCategories() { + this.handleSetUserConfig( + RECENT_FAVORITE_LIST_KEY, + JSON.stringify([this.selectedCategories, this.categoriesConfig]) + ); + } + + // 切换视图状态 + toggleView(viewType: 'favorite' | 'recent'): void { + this.isRecentView = viewType === 'recent'; + } + + // 处理导航到存储路由 + handleGoStoreRoute(item: IRouteConfigItem) { + const globalSetting = GLOAB_FEATURE_LIST.find(set => set.id === item.id); + if (globalSetting) { + bus.$emit(HANDLE_MENU_CHANGE, item); + } else if (this.$route.name !== item.id) { + const route = item.usePath ? { path: item.path } : { name: item.id }; + const newUrl = this.$router.resolve({ + ...route, + query: { ...item.query }, + }).href; + // 在新标签页中打开这个 URL + window.open(newUrl, '_blank'); + } + } + + // 自定义设置组件 + getCustomize() { + return ( + +
    + + {this.$t('自定义')} +
    +
    +
    + {this.$t('展示模块')} + + {this.selectedCategories.length}/{this.categoriesConfig.length} + +
    + +
      + + + {this.categoriesConfig.map(item => ( +
    • + + {item.name} + + +
      • + ))} +       +       +
    +
    +     + ); + } + + // 触发 AI 小鲸，针对回车做处理 + handleKeyDown(event) { + if (event.key !== 'Enter') return; + // 阻止默认行为，即在没有按下 Shift 或 Ctrl 时不插入换行符 + if (event.shiftKey || event.ctrlKey) return; + event.preventDefault(); + // 打开小鲸聊天框 + aiWhaleStore.setShowAIBlueking(true); + aiWhaleStore.handleAiBluekingSend({ + content: event.target.innerText, + }); + event.target.innerText = ''; + } + + render() { + return ( +
    + {/* 最近/收藏 */} +
    +
    + {/* tab按钮 */} +
    + this.toggleView('recent')} + > + {this.$t('最近使用')} + + {/* this.toggleView('favorite')} + > + {this.$t('我的收藏')} + */} +
    + {this.getCustomize()} +
    + {/* 最近/收藏列表 */} + { + + } +
    + {/* 快捷入口 */} + +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.scss new file mode 100644 index 0000000000..88f920c93d --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.scss @@ -0,0 +1,36 @@ +.monitor-new-home { + position: relative; + position: relative; + width: 100%; + height: 100%; + background: #f5f7fa; + + .new-home-bg { + width: 100%; + height: 270px; + background: url('../../../static/images/png/new-page/home-bg.png'); + background-size: 100% 100%; + } + + .new-home-content { + width: 78%; + min-width: 840px; + position: absolute; + top: 32px; + left: 50%; + padding-bottom: 40px; + transform: translateX(-50%); + + .new-home-tool { + width: 100%; + min-height: 300px; + margin-top: 50px; + } + + .new-home-alarm-list { + width: 100%; + min-height: 300px; + margin-top: 40px; + } + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.tsx new file mode 100644 index 0000000000..a68e1b71c1 --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/new-home.tsx @@ -0,0 +1,55 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { Component } from 'vue-property-decorator'; +import { Component as tsc } from 'vue-tsx-support'; + +import HomeSelect from './components/home-select'; +import RecentAlarmEvents from './components/recent-alarm-events'; +import RecentFavoritesTab from './components/recent-favorites-tab'; + +import './new-home.scss'; + +@Component({ + name: 'NewHome', +}) +export default class NewHome extends tsc { + render() { + return ( +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    + ); + } +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/type.ts b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/type.ts new file mode 100644 index 0000000000..9627e2aa4e --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/type.ts @@ -0,0 +1,93 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +export interface ISearchItem { + bk_biz_id?: string; + bk_biz_name?: string; + name?: string; + bk_host_innerip?: string; + bk_cloud_id?: string; + bk_cloud_name?: string; + bk_host_name?: string; + bk_host_id?: string; + url?: string; + alert_id?: number; + nameSearch?: string; + type?: string; + strategy_id?: number; + app_name?: string; + trace_id?: string; + bcs_cluster_id?: string; +} +export interface IDataItem { + [key: string]: any; +} + +export interface ISearchListItem { + type: string; + name: string; + items: ISearchItem[]; +} +export interface IRouteItem { + name?: string; + icon?: string; + id?: string; + path?: string; + href?: string; + canStore?: boolean; +} + +export interface IRecentList { + function: string; + items: IRecentItem[]; + name: string; + icon?: string; +} + +interface IRecentItem { + bk_biz_id: number; + bk_biz_name: string; + name?: string; + url?: string; +} + +export interface IRecentAlarmTab { + bk_biz_id: number; + bk_biz_name: string; +} + +export interface IAlarmGraphConfig { + name: string; + strategy_ids: number[]; + status?: IAlarmGraphStatus[]; + strategy_names?: string[]; +} + +interface IAlarmGraphStatus { + name: string; + status: string; + strategy_id: number; +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/utils.ts b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/utils.ts new file mode 100644 index 0000000000..017e7e600e --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/utils.ts @@ -0,0 +1,118 @@ +/* +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +export interface IDataItem { + [key: string]: any; +} +/* 搜索的类型 */ +export enum ESearchType { + // alert: 告警 + alert = 'alert', + // apm_application: APM应用 + apm_application = 'apm_application', + // host: 主机 + host = 'host', + // strategy: 策略 + strategy = 'strategy', + // trace: Trace + trace = 'trace', +} +/* 搜索内容的类型 */ +export enum ESearchPopoverType { + // 历史搜索 + localHistoryList = 'localHistoryList', + // 接口搜索结果 + searchList = 'searchList', +} +/* status */ +export const EStatusType = { + deleted: '已删除', + disabled: '已停用', + shielded: '已屏蔽', +}; + +/* 告警级别 */ +export enum EAlertLevel { + FATAL = 1, + WARNING = 2, + // eslint-disable-next-line perfectionist/sort-enums + INFO = 3, +} + +/* functionName */ +export const EFunctionNameType = { + dashboard: '仪表盘', + apm_service: '服务', + log_retrieve: '日志检索', + metric_retrieve: '指标集', + // TODO +}; +export const RECENT_FAVORITE_LIST_KEY = 'recent_favorite_list_key'.toLocaleUpperCase(); +export const RECENT_ALARM_TIME_RANGE_KEY = 'recent_alarm_time_range_key'.toLocaleUpperCase(); + +/** + * @description 输入字段匹配字段高亮 + * @param searchValue 输入的字段 + * @param listData + * @param dataKeys 需要匹配的key列表 + * @returns + */ +export function highLightContent(searchValue: string, listData: IDataItem[], dataKeys: string[]) { + const searchKey = searchValue.trim().split(' '); + return listData.map(data => { + const copyData = JSON.parse(JSON.stringify(data)); + dataKeys.map(key => { + copyData[`${key}Search`] = searchKey[0] + ? data[key].replace(new RegExp(`(${searchKey.join('|')})`, 'gi'), `$1`) + : data[key]; + }); + return copyData; + }); +} +/** + * @description: 在图表数据没有单位或者单位不一致时则不做单位转换 y轴label的转换用此方法做计数简化 + * @param {number} num + * @return {*} + */ +export function handleYAxisLabelFormatter(num: number): string { + const si = [ + { value: 1, symbol: '' }, + { value: 1e3, symbol: 'K' }, + { value: 1e6, symbol: 'M' }, + { value: 1e9, symbol: 'G' }, + { value: 1e12, symbol: 'T' }, + { value: 1e15, symbol: 'P' }, + { value: 1e18, symbol: 'E' }, + ]; + const rx = /\.0+$|(\.[0-9]*[1-9])0+$/; + let i: number; + for (i = si.length - 1; i > 0; i--) { + if (num >= si[i].value) { + break; + } + } + return (num / si[i].value).toFixed(3).replace(rx, '$1') + si[i].symbol; +} diff --git a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-table.tsx b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-table.tsx index e5d4cf4cf8..38e6750be4 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-table.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-table.tsx @@ -524,6 +524,9 @@ export default class CommonTable extends tsc { // #if APP !== 'external' - + /** 新版首页无需展示右侧的全站搜索框 */ + this.$route.name && this.$route.name !== 'home' && ( + + ) // #endif } { diff --git a/bkmonitor/webpack/src/monitor-pc/router/home/index.ts b/bkmonitor/webpack/src/monitor-pc/router/home/index.ts index e71ebb111b..dfe88a17d2 100644 --- a/bkmonitor/webpack/src/monitor-pc/router/home/index.ts +++ b/bkmonitor/webpack/src/monitor-pc/router/home/index.ts @@ -25,7 +25,8 @@ */ import type { RouteConfig } from 'vue-router'; // import * as homeAuth from '../../pages/home/authority-map'; -const Home = () => import(/* webpackChunkName: 'Home' */ '../../pages/home/home'); +// const Home = () => import(/* webpackChunkName: 'Home' */ '../../pages/home/home'); +const Home = () => import(/* webpackChunkName: 'Home' */ '../../pages/home/new-home/new-home'); export default [ { path: '/', diff --git a/bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/aiWhale.png b/bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/aiWhale.png new file mode 100644 index 0000000000000000000000000000000000000000..f7df3bd059875f2f9703babf6945472cf9a26fb4 GIT binary patch literal 796 zcmV+%1LOROP)Px%)=5M`R5(wSlwXKdRTRd*Z>_b@y*iFpLe0@~jF}iv{DVrMi6QyYQ}{4J^r8`h zJ@`^2NQJ(rs5paQR1d!BLm-GK9oJ(w~xcY=~JkPsum@I^iTWNVpXix6;tV5XY7J`ABca@CyO^ex6t_Dg#j8BnB`z zXn>gK?_wBt_0L9^&OQI!lzV=7^o|J5O7L<9p*bWJ&*BE8*ubgrlaZyBf&W7rDfgVc zw-AzCr+KAm;S5~fJ;vJ8ZYCaN;)Lw%kt<7-TpD1 zTotu*N=uLa&U6z?H@iw%6Td`5$g)X^)l#lmUw38f44Ja)cv_|T>b#<@MK~ZO{z-Bi zA^lK;e?-G}2A@a8U|pI_Q;6T5uFdKGV+E(U=$OAjixe2yaPJ z8-vMZRp0J`^CZNTp~rksEnXgyFkN_4d8;qzD6w$i$R*(CIi%6^4Kx;PRO%4EeX14 z{x;2bw0QaDBk3V3_vC)Ym!V#}crK=3O+D7(7VkVe=^o@g9wL#QZNNUZvnCCfGp5 aYySZ^as%J`e^aRd0000Px)-$_J4R9Hvtn0stfRUF5^=ic^qZP%?UV-aw$X$*pigCU}zgYeXV$Ri|65X68) z6rx08f2@4{0Q6Cj%u*3xw# z*g61|3r>J3xtP>n?a)N7bgB))F<(0j04H+w3zYP8F+o7r}fqBMCSh8O7 zACu1jn*gN5Ity=YLE@h~p{lzC$A}D=X0C#)*2U@`Fph6GVemJr5qGT^pfY5Q9(5lu zy?l0y0g5p#FO?zOs6g@$??Py-^hJ=8hQgAy1h(;WA!`z2230mzW6=K1h`UiO`Dk#*K!f^N#cQAirOK5yy z9UN&HZbcLFa-h3#5X#1?z~F?yIcyZ#=B!0$+8FTGRt!4uA=Kq(yAu`EFwS2O>-ZPL z!m)v20a?i>@7)09t?Gbf>`c!@YxWk1gNJ*YkQ-9CRfEJozJjLYB$(>{#x}nFvB}_U zMyM~J197pg2Dh^2Da&A6T-p2a2$5?e)o?Q&{^jARzb;L=% z4|sDEw3l+BKlV9TwFVnis$j`liniz80Ql&4kr2S)8zzG5u(;#0Gp=>fM%YJA0$A1d z!W72qNI3l+;){L*XZOUT3KfiV--hk!MLl*PcJBRM?Ltkn9J&V+Pwj#(F9%ZcaG0mB zgni`1USI{)iR6T)

    ygzlXA=9<~YdVVd=N)b?1{D&t781g8|CNcv242OJxW6er3g znC+ha5%r+H19Qe4f+=>ONJNvRySWV*K)VQ>E|+kn$w@IhO`|Tc zOo8)NF4P-kWKRgZ_Z8N-Aj!bPDI5%10zR;X#=NX-j>;w($Nuvi;K3GALFQO`T}EDo zh~5JLNYh&t9zil2)lm?OZ2U1A1T(J13oxdf-*euxI> zon5OU7^?RunxZ2S&-YFdID17x*^R)Wh`Pl8*2yTSmf#5560rh$C*TM$L{E@8g2#|V z0<{ph{HHHVC~lBLu9Q6jUTv0JLDzikQi!L*n~&E%JMk?D-rV$?i2Edx=a^^Iwzgxz4eb&G^yOLD`4%0Rt!~(2%0z zvfZlXoENA3RYiAnIO#(&4X@K$eWN2KxNOTC&O?#ebq)Y?x}Z_nCw6y%mdS#kC&CNuIKwciTt6`ViQ~ zo_pHsF zC}1NqYe~~TxHEm#{=}nab-S+Pgz&YRDt4L0x#LsBNZRakz|8%rx3N{Z>t2xP$y&X_ zjv;fG@^X+ri|XutJ99(medpR_GXuXd2WiW+E30F7>J7nH`OSIWn&4}p`zd;(VdTzU zagI#K<-_xBY&pA=6=(7LNu|k3rMuK-NK&iW5bGFwyUZ3{cU9)zzv`*KZFf72LIIY}H)bFXW4$k9*0RKvJiceuC}e;rhFFm-cR-`BfOq~GEc#?Ic+gxxtzh5 zBHQ$xi^E$Jo1&EAX?;36Z#1@`83iPA>tyu# zbq#NPuI!d28I$)F$INHFtMJKNZoZ$)gl^c$37DQ2L95@u|t9dUQ{a*RKrf(0@iIZ#UIA$EHH(C%5W3 z1*|)_kQrXSnCkAw)#W4#_oZa0MK?yC?t zO2ZhOt-*3ca0dokLokCI^p|J+SDhnwMbI}=~?{V^@cjvbH50t+wcv8~5~ zt8MRE!x;#Ha2o~ka!Ys^&QmS|bhZnr%wcF|+6oWA-B?2hF5hk$F;xJ}P>BghkYJE7 zUCT11{zu*e4;EK9vf7d&+pB(!Y@sYw*sK&YOykWg*xZfK?zyU)f?WjJwp$E zB@M*=3xA7v=L_`Ew%GRl+A{kEjrmL+&W@y|7mkD+4xo(m8(flWztst>J-}9G+$X04hn2?*laDR?=SMzC<5rv2Py!&5C;RL8 zFdsHxg^J9+_cM&fTxZfk*kRNR$+>3cf;yNxXn$bUxS{X0SciuF-PN-z#;_*^;qQ%o z6zBy2-5>>K;;HZr&qj1JRAH;eEjE_xzwPWoqBfa;*;y;9wK}Z*`0{~nsxQ!5)wTfi zfz-f0S)MC{1QD@vxBy50DFM#GRK`t2;6C|v&qugmYm0{wCh*s#89tZ0u*1lGYY5Zx zsXz6r`S)lT)vfRHANN&bim#8x%T%{}<6 zx%`R;^xLePgo*VD)gmSXQ@v);;V=-O;Uh@l z=x&kg1ORR$H1FAce4dXTUrPWE^RGL#MO+f@!zmCVhY&R_`Je*~T>sReh5GOz-3RtD zPfg`s26U${Ejcb5`H$mm{kJjE8iFvL5{vS;7#uJ7GL_X5K^M&!R3C5>o|jw;t}>pQiQWu*g;rNELAkJGS+n?1aCW^?21d>F}`4@tm_5S&!)sR z1|^TUk^g7e?6D~HtKY;ykYK1rYBFq_9$jA#xpHRvC%wzOs0(Juw?OSz8}JGS#dAAc zigJZg$a6^{mw<>wo9GhbK9KU{_wE4Gc-9v_ryUneEB*M40pMxLXd&Kdrh0nr&J}G_ zkgRjLs=qU2I{G?UTmzXUb#`nsc&()d%^s3an+9GP_$@2*n!bjGc+4VWr0LR$BC0|& z^vVpH<`zAJO#O_S)=R8}c$nD`sOFZ=-R+ zL4`6uBpNh)kdRX{of&UlpHf!U-JihO7ekRPF2|UfGM;rie;d9N{p%NM6r%!0p27p- zv5}xM995GP!J;U@5w6WB%|si*U5VK}!4I959Xhx&&*JK2v&{o_qvqEeqV7HR9^rJJ z@iN=sY&-Vt>h?;7tjqCDc7RK!l6g!izcKpxSslPx=~omu2f^5iXElzVPC;NvRDUU0 zLfyZ0T<{-G{JJ1Kh-Zm_pgw{eSGO#XQcgd9(0e?vF13|A z_3gc~YM-MEJ^Im7UiBqvJ27Y${=Wx?@h{2dqa%m9v1xzcf$YB6r2|wc7!%;p-YSH^ zLnfRBE%biT(?XB|h* zobt#Al{LZR_rjvacfOZD=gyWOa z`z~DSIvkGeBb?e$?{a!&C1WC7YUubu7WY2lUxb~vFCTX*n>B%59h29~csOuQiIQeE zO-VRjb!!uk9$rt$4C8E4EiL580~Awc4?-ofQb2tDh}?<0#Fb*NQfxkNnAtatpP+Ez zsu>w2l$#N%bcD6bO?#!$0FRT@Pk~8Rj{WV_oC3vCgh3;oB&BYrtxX;}Ugbddk?R-n zp#P@BrP}>GX2F*UP`*7N^O3cy z(X!8+Yk{_>Ze$>QY4>?#aYzFVt6gD69Vtm7_4xuwQ7BA>TA{vv^w2ZpOeWBSPg0=n z<^Vo&6n38SJv_ul9G&9;_UBo`KngOz_0Ip)_q4Y^(UZ-6^-iGNJmIdapDg!2o!enO z;pMGNqBXyrdxzICPxC+yf)0E>QaS^{u5~ErPtYfw5acNIN>2nck0|?fMo$0PW&OSS z$|vmT`<&s!7Z%D?!bXd@cn1%y7|9yGHB=7cB_ia$ezn;*80DGVyZ?Ox5BQS8_OQo%jen9NPH;H+jl_9Se{<-+kNeo@2PpVN}D*1V057%PZC z$iYTqPPrC~webs>ef?hDa8zH`)7kq2^}Pqeau;E>KFynu(33AE9s9?L?~O%fjvr}F za%^h!U<=%p%c@$GVO{U0w96rQKzpB}m=NdbaiIV%n7pjpBA;{)H3x6pA;heqwF*1X zbf4orO^LV?l?claMYuKs8ZFl@Wf$e;d1>gx9_+DIDuuR%^iL*Z-&9EA54)*6?-S4(3(O)8L4R?+l7~DyQq)(1q^`u@KiV0`* z2(Y+zcsz~kD*yK`K<1>=jz?9BA*P-ieX!IPXB&=mg9YZbaCh(Qu6Tg3eEKClZMfQp zBr5d}ef^((o%>Hte4S84TB=`Bqw3nrFp+az+2MuDF(g4Udg-$d$gm3i-D@%#9>bOt1~T&bm?HEBCvctu~7H%CmY z0xA-!Z5wkF=b0(XZc zqlEoWbvBDm!O2c@p*Ip4Xtt`(ba*mF21u9Hht}?QVkt9Iev7QG?ac+O0u|r3dvVy2 zpqJA%gU+@SJ?E7aQTWE)iL_U$gI4!NC@GWX{z@xfUy8r)5#EzMJWzz#;)0Fx)w?c| z#t(cvly#S=fss`prSG+YUtY2Nzqb6q|0diLzTI2#$FRdmDSlr0X?)jK6EXMFGH}SG z#)1ouZVnD$F%5arP#N|V?4`=!FMAKGh%9cI_PC}~po@d-5LrDa8IACO_5Nk+n^OSW zivuVr=`Ri-fUDXdQf0_@A$!FC1O1m;9HP_FiA{4y_toQ5ui_7`?dT|Qu7%J10QBQr z6(oE^J+cXJQ5s*)wHqHG)sJlIL1M$*Oe&E5d89Q(izXgDH)b@|SsWYDElY=(_n^Mp zE%%kxeV@7jK;UA5QtT|qtzoP~{w2)rX_cL~MDEiX!FoYPhprx~Vxi?(tA&L$I!^R7a(fYq>$9;;3!uzjj z$scz14+EE2<4O{W8WIAbBus|}d^i;A;dpQP22N#ANmzNr8=#C42!|PmVq&pM_G8up@(3cs3Utq9FrjEGP{e5NFA*Gst;nus}w?3)zO(w zYx&~}!M^T>*kwMql9K_cxIy(Qwt5Rec1{sEB8&5KAYx54G134mgury{QpX$uy}qY6 z>aH*fpGdp-v^q)!_>yxYW3m4p1fo-vD~iOf$=2byqOpwjdiklu@5DS zO2;cgod1REcd^M5NJ}{|F*)?N$%e52v^=>hJ4!XMNm>i#V@gsGAp$#|86y;J=$pXT z2LuQvOlvFbR8UV*DULwxUc&uBU4g4j|z;%4Zch?};=aQ38 zG;eVCPJDw9B;Y=Fn+}At6Cucq?lWpTv|Br_IetL)DBNuP#1~(rnjO+6#GvWW)9$@~ z#8~7HScxpnSFSC$=pP{V*zWsTIpt9s!0&Fp4vN`h;sD^brMO8wKN^7`Pm?k@`jA~7 zSuz&7+(9h|+CO3$Kj$?4Lqc>a!^<*La({XJ)jc4}Uc20NRLJLcafb^P*BZI;h-=l~ zr%;!T7SeJ`&>llwgUZ6uc*+GRS&+%Rfy(a6 zSjzxLwFMEYv#<4NvKK?41jmbC3HM6~q0qd$3BhD9O*#2JUUvEix$FN%s#G@Pa1E_U zG`?%AX>~IDnG5%mk+5mJXRhYqf(IuYmW(f3;P^cjY@wHtFekUe899w(i-~5<-NOM= z8t2(#0)H+){xMSS6G3E>^_AN8S@oKrAKQyT>m3mrFme+e zK`buz`t*|y8c9?lt6kXa)(x=&If;l+epbQIxIm3zzA@UBmg_;Jl&13CQ-ypHpGH&c z>bbsF>Fb5l@M*G+cVKsfo8(r50j5~0k}nGr5AR0C?2B67ii)zFEQ z@jR*){X)+A=i2gN7lZ9(f>_&039pZFUOa&jp_?)=PKTc%nrdLj*>XUI)^#U7_l8!( zve^e;hV=m&;s8X>sa&^0?2W@y3b3e1u*lABf{LZ%WN!*c!YPAjC;*OMUi`!*3xi@WiTu0x{ytubee8|FZQSX8 z_DLktayg7PuegSa$^63(M%}R3;|_5pruQJm)6M}oenyksVWTM7!(T|VxLzWup!=E zs4V8By)34l1x~Roe0R>GMu$D^6uJ(ll?61-tL^_SodApZW2}45yJ{dk{Dm$5qN|HD z&|Hn!h%CNosepN@89Z3!A-wQ=#4^&zjjCOK#Lfhow9FL*y`VQ>v_Gm+fU_eAjA{EPWrDE<(! zyydb(3Q;(tE}Tl$;6xIDveVXgZh-LI0PQ*qiqQGdT4Q-MmRP+MxHS$_^$|lDkz!tX zNfnp*QTb=x#J5^h6Iiv)lUWEk%^<{D^wNae1wP@(3Lk6r>vKe;p6mamZ~(Q5@-%;Q zuwa6fKAV*i4vW3lX{l-nOM;8sZ&JTSe8N#1=*NX|bboO4l;i(^`hS#77uc<|ohO16 zs5?pzwXSFONEyf_VuLg>5^$oUCd7{e8`tNyVN0g2dwxMTcDNiX?A6^oc;8%{6%j^~ z3&+x63?0gX&lW(;`d?z(&qOW<<~mDgM@?AB@|aAiP+iu>koQaY8n53-T~>3&$c+-t z1H>pRl@JlO9@TTT9eA_Zc2QCQXvyoE>;~-FME7Imlg@z*vbNo90`st+CTzEQANfR% zDWBGS2>_02bOR4&DfL%7WhYAb{h1g&q4GXgX7Xm|k@0~cS?e48>FMy;(cC7;j!mcsLry2(!X8D0%!LLh zfh+@mBi)w(TBw|`kMn}LtxzU`d<}@tL+ap2sWQn`gr?o zXwGfQ^)r&3hEc_dvkpFhvg@3aMh(dQ;jc|kt7#G9orDMU<&R|%Mijz%J;W@S-U*4< z)pp3h-WcA0h*PXPc5BbQ4=Igw&zOA5r7pIk&~V}0j0a$pwD(CtResm6-COV6$4 zRROm}?sA<|? z3#Jsl;+OrrhYQZuIOzoYQ$9I8zp1f{-LE2XMXzrl#7ix%*7LI@t@NDc4SeskQ-Ljn zh4xco);tnxp0s;Clx0fnxlE-mZKHnQTnP>Coc$;2nw1w;ktm$T^T?YYKyc5_h+FoG z3zkAO${&a!izTn@cBby|@}3CU`Lg{xOvx*OG*?p}-$K-$DO;D2g1!t9Rrs z^S#0xm;Ua6_;HY4lc)EsYtLfzxuASzWc2o5qQ8=vlN6R6wTllahjAw-x;wUM(#{q| zh0@7~Xt`ItkjT|K|Ln|+=qRJZPZxy(yUdO$+)|mG9ik`UoW^N~$Yn!Zoio9N(Adi~ zLN;41^d+NGvPg!^fVehU`eTVOP<5b15i(5GqaZ`&b{hTLEiIhXOXj?`*vqw%iAnO_ z%}u1l6<%9Of86{%6T~LBs#g}2a@F~#TqYhQPIgcGRsNg4j{OJQ!reVvb6?U*II!xT zeJB&2kmt)@uF2ujf|W5YV%=|981uY9YQfg@q8&cSqs=*vYZSSR9>ve)Pvvt(Vr110 zH%o*x2#3|ELCLf-Bd!DMhDH-dJV?WVhK!{f#Ie~W+*D`}&YZ!;{qUb0RBE*Gea1B+ zAXOe}w&i_To_Iie_3@URM6#GJ69g^`RtQ@_gjRV{8t)u`q<%gFRfu6f}gea9{o(8t_RmarIGQtz>Ps>foSccrf0!jx*4z zlEAOgYJT!~eeVn4K*aVzDXg>pB0!3oxVYZuGdjdY3-Sc@5C;wt)6Emzq%6L%CQ{5~ zU?GIt17#}u8dBo4c1-?ibEc++?KQmuF(Ct80#MPfC=b7=J`BFR6~g~Q8iU&}GwRZ& zTKxzAe-@yWv|7Qm!Sh9!7P{63A`^W>R!~oR=v#Lv5&m^uyUkQ#Uz_8If3gxzj5uNC z;b(tlLRwArQv1O_McE(abB2}AnYR#$hI0g%QYzoRkTb_@#a*_ZXZ?L21+d%8`&I&D zU6|1qcz7T4s)3Qd`)IMvPgF>vq@FPS943BYr?~}&`*uz5fl;jH>pPiaFvZyRm8~*5 z9afNkCsRYb%}o>BgocoK&$m=GDT)@|(XhJChw^`|0(5&7LKO8Mi4;BW6>CsDgZxh6 zx&-T8_~PFe!+wAqV`V2ycND#(1C!ZovQ^p}-g(>L)kS zp@|7xcq=fwAgxr`l-_C0hCCK}9h%`O>XcYt2PEusPMv7*{?)8&t6KMp`X^l`6QZw> z`VJUT&Kvp&IdWqXs&;P?vx|)Q+d?EntkSlr7wXxduR#3+u56?ee0H1))fzauk#>|I za9=4jWgD=HAHnjjkC&X7?ez!HG`sh5rTxSN;JE(FyH_8Vq`=~OANv(*Mab}3omvQ> zhbTGHy=jxHzyEVD4~d46AE(PiBG9t#jta;d`|?pK@|S}DV*=NOf^nI+_+!~e<`<;amO2)fm3BOb_JaOSO|1~xuKNQE!vz}xc_ zU0s2LA+2K^;-v`q>o^WJWJKx&G{3JfiLrHP;)G(Gb4C$@(!XKX;XGnWe7ZGLMI}({ zwOq#vs;@Ib#Y>?|Vy&g$!vLKmAR&l0hP*KsdbD@><>R)v8oN?5c76yWSDyaQW3-3B zpP5{s6sgAkIhiTE{#pURrHQJWYzaMJUSv4&OHeDMd2Ro!@!aL8;U90%wtaBtY^C17@$woy=j%+V+Jg|&4L)(>n~aRDxX6VOK^DbCCIue@G zCu&V*UGq$}3oTDg<;8p~GY*Cf;*~{WRwxdQCiMBfC8xAB@o!RtEbN!A5`BBXLP2vH z9~X56WUHptHLio7s6Z(Nqg@G#QFUJ{Z$Ld%%#99XH=UZGl+c^IS7i_m2;Xhyp#qD% z0hF?CcD(k3hS8<1BR)OP#)%#n@iFyLRn-yN(%^e!OvDhcd!vVF&YvtLF5OB6m|QC8 zsKw}@^zRbakrv61V(?OPP*-&F8uwv|qFX$BiSG+dYm%plD3Y=lSUMQn7Z}7662(;zJzRm#6ea!#&{eWxnD3#pjL zQuBbKz!kVwgI}st6X7YP3Z*vM6StDadR*fI_}6GS^ZT=wSvZ&7_gT{-+&MYx(9%_G z1_Ft$+JC+od2)fnUukEf!}0p}2(G8k*h}CLXFDKBAn5$CnK~E^_NQa7vhUugH#nG? zW7EXD-hf{Mno`M#=x#NHcTwyuf)JGPLGFPCo}Qlel%+LG4r4)|k0kefKTDVK`;(ww z87IleiNJD}vf#^8T{<_kI{uip3}uc$NFq>iDdO5{T9Q~)o=Fxq@Z}5Kh5^@^BOijy3zDJlAkw-tJ!?Q$s~`8zr+T36p**Bp8l>)WI2& ztLwzoy5M)|e=>24E&tFC9n`}psF&iwf2+Lnsw#p6i9sJ*sUN*~x$r@kPo3Q%Kc%PN zOg4mXu$$5s+G~l8_gs%KukW?bx zXB~y6`j{EzQX3)=I3`lF$9X5^gMwAg(>x%TFvVl4z`Kl72V!XE&I9C-z8h{J0~Th@ za2s$HHZPdUfamAs>T39hxROVE$)ovw(EmC^W|?CqBuCKzwU>1OoB;9M<1~Pmy7>tY zRFjk^{g!XP4WwdY(8qVwI2k!dhH1??ff7CdQvC2~)hG+crLmo-XvU^O#g`F{o5yzX z8@=7v)|ylGmf>%Z9Ze?R!smrj0dkgqIJTEesR4biF;v;vlHtudb=F>2b$nK2-hl5X zOtFDLiUaxiCw_T^R{B4)YCag)j0ToDVvwc|Y`$alxZhbAw$UY{k&M3M@Q0 zkLo<-BfQm+%ZOArs4WkbhfU zJe6haq+tb%w%js@Zu~HacsWksO|`fFWWibeOC;_H3Jym?7yJMIF^BK*LTX2UX5dMN z;U$U0D4cx`w{Nd0RK83~<$q+Cp|dI=nXRq3ve2(v99-&0o?_)c&9J;O&5l@}E3tF+ zazhe>gEo>MsZNpE7j;DUK#&JNu+rH2sZ!c2K80@7J5 zT{2KqUnZUWB_jQRJ~+$0h=}}vl*L8R^$sBYL8BU7EEA%~j?Mf#sS0C4^L{Yz=bQOA zd2pP9tw2{ppVzTar<;aq@0sCl&nGlV z5hqANZ+tCb9mtCSz+4R)Jf{U^9e7P2eHB6Clj_IOb~z#qTCPA$Q_*KiIyo&}N}s)3 zcmO9hRq*8|%Yz$``bHZcwT!~v!4+bsQ(jx{3aQ<&Xw8>uFHXl8!Vwfgg+)FbGJm|T z6BJ{8mbG70lpL?H{Cyr7)>E*Q z$$XNp=qL}67C(d|E2Tke9U4Zkh`B5N^`tpwkM0ZgD2Ir`l_5eU(7Tex9ikw^^Oimo zG^dsolV5bG`n*N!ay=vESG!(?Qpa8=68#mcXuQ#3F<2v6tjC>+iD>~O99CAu)xXsV zkzh=D+uKcxww(Fz8NG`avu1LHDddr$e~{AWsJVUX83hEJ>6Ngvf=#PDiPXW`0sLNP z-g#DqOW|iFp{xe{Pt(1jv$KCfM^#H%-_wIqf^JSX@&od)E1eP*jIMfJu4|Uv1k#w# z8v0IV_C;9_J4itTD@K~kjSShgq|Eq(zWSb+z{lP8$IH}h7Y16WjP0kstqnWj3Ow7u z6ElkJJ%*7xcU-XGrEkKkrP-bPb;`r3*0Tnp_mK$WlQl*A=M0trp2Q}7E31tL3-_#> zTm$x2umeCxEu38ro*R2r$+gE;4jTOOc*a8VZd*2}_B~193l`S(NbDrueJ2?8q%6?p zhU<>nO`Y6nl852=0O?kvS72uIJ1ZJPNM;f?(VhvRcn5z8|E>LFo3~CVMD)9F3Em%e zpZy?VUyyuuSI*Di9s7)j2`ba&22ZMwk22Tol{zE4aTT>g^Z1*|0lKPdbG8d=8@Pb` z8M%|kSx$p>P`QHPa?rwMYoZ8TnQfoaA|Q_o?n4F2ii5LQ&cDYbu8cg)2XC(Pjb|NG zU7_rZ1XLrste$5jN3#pD_2tagCY5nZ?&cx?+<0RIeJ_upU-OfzK(s2HJ^?8!}?$w%s%nYB&SZ@u9JnZsvWv9fY2T--k={(D`+8 z>af>sShT)Hw;xrey4&;hT0V@n>}eoW36Az^ahLZd$*dxJjh>oJsyk71DAZMb*87<1 z2$hFhlMTbUV@Qtvab0tfPc5AAVaf|Si5lTGis&?*?m*OJbzY*1`y*PpTW@-eRxn-c z2I;le=~igZSQ)i#J@e{TtsWCwYt*2*PbDjIjcqIXGpnDDL$Fbj>@&OnhIOLw3N(MF z`748_kD5nxwzO>ulGkqPkb{@Q3ad=0l)14oZw9tLc||uKX}ZE@RZ~$v6CD9tz}SiK zq4?-=EQ+c^4^@4G(9$+=r^UJI>>u*-nTJ?*>&WgVa317}SoCI@gm25CmT|GAQui)S zivgA{295v5iK{`E21yOF8Ci)iwvPo9aV@N7OrD)a*FGHpc(zY!RSpwNUSz*N0vE@p zQGZZA#CtN@dHE@l_HcEzqWkH*FEh7dF>XW0|GZ=c63_&76iq z1`jgk>duDq?~mStCTc}BcW0SSV}_j27^_>7Psi&_{&4El!N@{6GiT_+Q!XnTo!v_U z&%iMBCmTfxdaYBNXs=W`Yf|;KXE=h3yXO-Yk4MN4IKF`B46^e9rSk6;{$Uo$+B!b| zM%>5mRPHDLL4>F4>8@9K{Eta@+dnbBh(QD?)Px8Dl+fRevkN^&(?fmVDwot8k1Q&8 z@To>~pJ!FhTsov0D{aR2jN*tin?{&Zngv{S!5&`|O1K zACYEqA_P^*=;#Q>YWgY_4L925b$lXk+=myNa^Qo$^mHbX@C(hbt}3UlOvC5)&k07i zlX;1l^DOB5loY=%(4pN8b!iV%-paiDWtr#jyito#q2uW>(xyUIb1AgnmD94Z6BdTp zS)w`H+xz*?xB(0U6$LmhhM~t3j&ETxsr?)7J1|v;A_FVA%Tl4ki=ZuJ1 zJ<)7>3S|>z^3qWqm>j)B0|L8t0ou(ix0ERRP#Z?23b)oI2ZMGPk`0--hq(3ZpnF>p8w0$|VWf5p15Gx>F`L}`Nosi|SZn%8((-!`9lJRpP zfl$^6JbZJb#J<#0$Q*m{s$N%Z25(USGR@$7O^6H8;pA2{PsY8uic)_JQ9)RG^ZJvJh0KW)Fu!Yh4I{ z3;Tq#mX>tie4r?qPfTWroU;5Lip%u8Vrr`8=~qWpU=%N@!JZJJ-^5CNEzG(9%K!$j zAZO3jrMteO11Kd{{Tc}4B-)h^(z^>K@+l51v!?%@IYB4Bh2IH)PjYq8t^y)CnG?NF zQD7uLYH4@YjB=Rb^N?G=b{?)Kzl2fEVIp28opR97+`ADU7Kh8y3fz|RnmJ*^*?rft z-d9pR&^_pjqsaC#?@p0unhjRozf$K@Mf{2RR0s#v`nvYbj-p;u*+W(``DoLNgc6{a z*Q2uU-6QkG4QMg22P^YTnf`~nT57t&?_B_bwWekj^ESD{WZ_ZN*N57OpXGt?cUbV6 z>mwn9q5 zj}VDl|3W%h(R_oACd~EIO!Ekz^LLLor7+z@uhtK~ux+7$9mm_ej6cu&xCe@Q?_Ev> z9BqH+Zg!TzpZy>`d`1Dv`u56H59&q~T>P?GPH7b@gzQ=}u_tUK#q?Kq(ptwC+gq1m zF@K$8#BbiWZTNVEp)*Tw-p;{8k8!ac3QfZofDyChE1?iq0A-Xo>fjI$^Opmvvk*F5 zK?jFl63O;*mq`d>t^t|JVQ{ejk{JqU$?J$-HjM!OdGj9InBq<$Yrf2mwW`e!opqlZV| z*|TmPzC|S`Zz{4xPcFI*!oHSGr^;ZAhMSZ9^lK@N?{Z>yHl%^we@!k~d5zaVuG9Oc zmt0S0MbqB7uPSm+3_4Jjikqo0a&?4RsgKS_3J=ZGq60=moG1nZR_E&21?JmM7A;$E zO3bk^CjfSWL*QwW?Tb7RLAEebsx@^u# zf+Jh>QIHwKk8A^f#>x{R(37C-1R#bWVR7{rDc~-fw?Mg7=Ut6kB0Z}wteF}=QHDm|{swbrImbpJZJ zNX8GLo@q-U=5ut}`&sgXV}S!_jkUNb6~2wM9|0rdf`83OCfd!vCtZ?JA!l(q;5eiR zri?97?hAidU>9#r_xbG67{~@w5w~Rmo4oILmM+i0W>E&g`b8GctndLThdC$p1If~4 z`V!a=4@E&@dC&ju4(pt+_y!6o_|yM8=h@2;_+GxS_ckr`f8#>A1ivyqWYbMWRiCPR z!Z(i)Xqsux@4{d-ZFrcL6|Nf7lHyX;5#JtAnI;oQBDxpl{M&?t{c{8mt!i?FwpVI#;CfY zgUJA3S>?J)&t~D5k_P$#Whl0CHT|_ZA-Isb?L|&kgzxafB4IE=EO5VF{im+M_4T9> z!H(bVLXdMpw4bwrJcPe?yFeqyIZYHCaS0#724|x<#h=7=KkBH(( zX?3ciG=1W@RHA8O{pMh$ml7)J=arDzEbj~ZWSrs&!)v@dYJsopABW9e{EtK9Bs7x{1}ob)xkIrBbwTm-T4e53eoE=)yfi zTiPri{weWrAqK~=`GDcC|8#fl(Vw23U~C{Ishf>_IY-B`8vU&SQ;4uZ7@zZjp$G_D7mz z`32fep^oWvSr?;y9}CbN!*Vw*SQkv!ywkIORUnN|;@modnoX1 zS-L?!__+oc(SWqe!c&P|3ZD_ilv|Em+j?Eb6#vo`d}Qpz$pvr->AKctn8SN*^jZM9 zUd~bfwJwgn@elwFv(BG-O~R$nzWq~-pHzR2AX4~WR5@*8>PALtJ75*#u@|A;K)&8g20^3Akz-enB*MHt%1cI~?& zb!n7bYE(?5Ok(Ns*@n=8@bcGIn_sX0@IrU@zY>LXSoG&eSOc&TrmcVG>|xVWK0(F; zM4uNw4tY9<+hmA|jPeFn1;&NS&-M12&Dc$7l**&vRs9}P{tbCflNLs`ODPd6`_u^s z_88v`i3ioZ<7O+*tl&{VtY`K*X5uF<*tjHyo!v;6rXwJTE8yq;2f3J#HxSIcct4wu z{Kf5di=5}fyE?1@DFe<2$x`;R%;++uG%WwCw?GbK55+oa(3fr=@_g6y6+}9|37Tps z`V&FS5$Ci5<*!v*k5F#4IOzp-x3!!xzn@2nTZ3=JM+75&gglEi5-hbypeGiz$oY5Y z$jIlBQB_RhuV$(0TBo1pv?Mkr+CWOK0}1yP3JkmA2@h&(=wgax&Dh$#G4>W(CJHM{ zbwa9F|55#Z0OHv~`=w}hYb>ltF0_SWo+-x-!}=a(`QMB^V8{p z5;?>!v3l<$B+GQU1%**t%mMgs7EVBkQ@QW=e^_(2a=fUJSazI%;YH0bi|`SUm5nhW zuDx)q-frOqaUZsspXRPjdAB(VY@Ww;3KBv%;FP_{eAcEAbT_slv`R3cIW86@c~%OliX-%XaCmUvVCWT8c1jAc>- ze5&Ugnzf?VZtu5=@LREf-$BL~felmDGohw{)o8*hpYO7r2<|6Mz&GZnQI@6Ws0X|t z*R}#i^7h(?DnZ)H_pIn`{G`o=_f$^~Z^IjoUcV5a%>i5LRaYq^KgfVGp^Snfm-8Gr zsD$()Wss@|rtgb8`?C#Im!rk0q&E*I$IfoK^V|i5H3(K;h+la7h^mu)G_=#Ar6m8 z93mMV{mB?rq321aS9Wg>ZsP0)XdYGB!joD}@j%TB zwX!qhl7yBu(lye+;H(V`X34~as>8y*Qv3Cc^p<@z$3*|D36J{kE4sE6gP=avj61zX(;?P zN#1Fit~z_=x*&-a{Y?1yFs^Yc-V%VuHh+t^!CRzeE$k2^Eu4CajS5Z@p&M;lCHp2J zAvOJocSSX}X8z;L*D8v>CPlu%e=wAk4ag0Hss9J_%KmGr zm7ZFAe&J+ZV~o0OpAPBx@0LeHg_zzqjr(5y9fL9`T(0hgq*MVPB(%>pS524G^H&Yw zR_Y(O5i9Hq?en-d7_wQ1hxYT!3#^kTC3^0D4KKO76g;O|^?m!~XQ>m&rnUFVJXum2albL#KrfB z{~6PT+GD1i618Cm1_nG}R0MRl_Sy1oosl)SIk&w36Wo#c{{R9({l3g^8Oz{V?0mlO zys7VBbs}#XdGFy#8|qG0@4e?fdy7_lJY7k7!*h3mKaFkAvHL399|O&5A5`{=4X)-h zvmm|`+YIhxB!czUK)#j>tMc3+1(tldBm$(f?To#vuQuwF!FM86-z1!nuo%}HM!5RX z;l8&f0;HYJT{VK^!4_0Olh9szDHO?&=ND?Bq2^Hg1$7ZO>s7 z(H@u&01!Hb!pUL;Gl9l0I`}XKItmf`WvbMi5p=+)O_2a-{bJo;Jdeu0G{TMCvW=D;iW9%%lZo}zXMU$txk?ms0 zi|D#x(tJzNcbb$+AVMH4Qo;BWCz|@uENiA7b~;VjAr98UBXKi7=)&CcUVBE;ry1~s zpacms5C8=ER>j~Hr#i3{Nud=t$mKJM3J`!#3Y)*aylC`?6g-D;G2#HU08d!Ds}@vK z5s-9HcEjCxl1@Odogxq@8ZP4_uh=u1W=dZv)zuN1AceuT?uSJ*NbR4KfHM{U8+C2z zT}hgJvQ7{JN(4{=03tskcM@5m>42mT#}4nk2!EQ7L*rv)gFOmuup=vgR5p>WO6YD* z8Z8j4Yatx~=o0`$#c|Dxg+fr!6gvnw%e5JX8}ME0rL94|EgG)0wNl*V37<4!XTG_HXdLm@%9Sp8Ms9D zb-#T-{4(nd6ASyOmNpQ70Dvf0ng$Nfn2!zbqrOaAz5&a_eP?XbkvY=wV-Ef-$5m~m zIuay2OW_=-bh-}wmd-z0+h zzhmese^8<}Wz?J0bU_ew_U7+`SI;yVqcT(P z#ZpYH$ILr=huXm-ox^ayTi8?~ulQ@xJKjz%?_sceHK)r=EoVJmwjqc!LeiW9YYo-A zG)OnNAyT$SJJr^_;SB_=2-Z2yn!HwXShA=-Cyebav%xy$JO=kUdfzgJOktdJjkgU5 zc~?iofQhH|sZ+PB$0jcCy%$05X1{u($$Y)L$M=1(B~U&~$D5|aA#5w0^7D@aAjeb6 zYJe8KJ_ow%-6m^2S0-SZYfouT*#Yl1uJ6^+uPzAhI?*}cpl4gnJ<|@bx@)j_^aQR( zB&HFs=_sprShE>{s>Gp^NR#TdL+IW4T}->-K02l&Y5=5pL8l11x9F5W<9Gh9H0R#* z%@fhSG%g!;<~v8mCFVxkZM}BWM9w;T<#G(0&rN1v3C%@-4C}=W=K4XpxV;?GvvE2W z<02B`Ic7@8wr}45vM+qtEoy-LEN`JZ(HuJ|J^!)coP=Cx8>jwAW}>l#hbV4R5SpD zbrP~hij4p1^+BhrE^2Ku4aYIqzTyLKJgsK7dTZB|aHna#mt;*Ee59OZMtZc*or!bI zZaA954LRNc0uaF9;0J)4r2=9$c6|qsj2EvaT zrK2Fk)oN&j;|@M=x}G!hFr|-%Yq%6)zD5gk1R~XyfCmB)BE&+$fr~_R7_efI3wy1b zgJ=zcDq2hCdMyHiB-cYaEY_-B=V}o%G8WV$F-Ib!PquI%s(f1dB6UQ|-#d|487ctA z%L(Jus1M$HkMcYoj;-lwxXc28D0`r$f&d^t{P?My&Qk3BQf?AeV$M#j_py<>9|B6r z+ME^qK>969$7G6hfXylPC14srFV|7x#FTkF@3aPpsGQe-mfAy7zl7k2rApJt8jC_x zkxOYZ82zIZwAIbGay|9=$d1_EwCc7=6^BEejsOD9T>19!oBHq7&_HCJ{a9On-v}Bn zFc`k_#kAcj{o4UwZgDKuo}M$O0Rb!%a8oYiS;`uKCIFSBkA23i$^jn#z@)9WQ#4~I z|Hzn_0!sjpZ(qyl<%kr8j9952WxS1npcx#!G4&Joo9>R~dX0n4nld<{&p-V19^>jHIfKMbWU0-z1*COZ@FSoR`*;d4~Xfaz9I^{hYiD?tH=eRiHX`CzyPxmV|8929b z9(b2;M$}C3R>+?N4R22IR+l!?ot%>QK_k z?uV>r+i7EHJ6nx7sF#9E^GmU;MZ2#y07z13(I3-AvTdteP3buRBKF4{fATuUnQN@m zDdEn~+`|BKJIT^_&k*D-hjfp&Fq@*e>}DHj3gKD0ICkM;Y4c7yPiZ?dzqys^QMo?H zEgWRrYpBnQd4u$>IsvmhJzOVIP>{x5xwzfUaUF&|LeSfbS+Vbri#Gj%O zAd=449h2)uf!1nhglb#SMc>YBIIp#jAaKD&Ye~0ad~2K5`}LZqKXMXdR`r_k{npyv zL9ZDbwc_Ou*_M`!xwlqr1a-Dl*R9LkJ}}qY60!gQ*`x@NII)L6HJ^RLKQl(5?zqQH z!R)Nn4oA*ijUJhs`~X38r|Z^Ik3_-(hsH6uj~8(Sv^APxy!whb}ktuArYO3q5A!0G`Y zRA8*J;L#x2VU__9b^1oSD|NE-$BX!;soStK(ZxYJWW-dQSB+%|A?9XjjH;(n;cF90 z9!j*Pf$P5>%l8crxIK6i8aH3Z01!HV#38IhbfZT8fb*7f1`ZLe0sx^Qlz|*eTQbl; zdHwBBG2pP=MrcrX5@T#PgPi^){~hBS&XEKb<^(99My32V5J8;$>UcLm#C2x^R2=l8 z6INe|HBbO#e?Zu=#fbQ3Ao8JUmCl;?U+R2lQEaQ9U`d9ILQx3UQ?dEYd^AyqzajSsU&gdVDzM>w{6j%m=$U18T z$PZ8Dc)FD1@lvkGi@sa(_#?Fzz$r<2CF!r|2yYJz)JNR-gsuvF*ng@4%sB}FWLpjb zD&02a_}5?bHvkaG7i*pH8Kkob-N{s5`CgZfHGw^oj*Za+^VGH)U?1TKQ3%`u{?82lx_Mfahn4geycsYTTO8UP6F zx#q|1mpI&kp5v_2h?o@o=PWU)Fe zQD^gF#d{5OYNdOpUP=oF44JgCd~X0Gznl8TRaT-;bLw=y%K{YQqO$Vq0U)j38sqGH zB$PB6d-lC}>JDj4JX8Zl>A;+v<~h=I@!ReIW-5wxoc6tU-?K7pKTB4kkM|{+t>n>q zT+(qK%*x3Ons-%5ZWZYUSH5cTvR4ghldO6gM4JZcgRrz*vr5STNH?-F^Y-M}y1V|W z*@Wh9fb2?_=lKqq<_=N1V~pcgMSDqq9b2z!Jsd?|S$=ElvUnZejU3;pqm?w9YM#zN zl|esaimadL+?Z=UL?fC0i)7%ehD@O^-u5$Nw(FR>07yD_4V>HBDd;jro$k1s?Zd6W zwlNGsoA~#!Gv?@&R{?G3_+q$j>!0ZPR(_iiAm1GTsSfciC-!;90FeKFdwD%tv2Yeq zW(jAA98)r2!2ojTA-;0l;&4yLD>gHGF?`5X4Uk;;w?6*ZJ2Q@Ajxb5xlbHs7J1drJ zX}Rd&sy5SLjXhxWPZ17!k9|NCqS64n-nb<2Rw44YWgMPqoWidCn&(W83}3D`Zv~= zPJTw42t6ddjr1#tIb$Iz zi65O`6P;DwECrVpY!?84SP2~MR&T=QwKE=Ow3Kq3MJ1r_2P067xYe>oQfuc}6?v(V zLbpBXE_FUoR2}*Ak&q2J^ewXNXg#9mz(zS^z@`UO2D4imsg!D(v6wZQB$ThGN|%k z^1{dubFxzhXherh;q$(H5{Gx$l;h7|6#&8epaT^Qw!azrC($Bq%X00lKz5kFBimv- z)@naZ&s4X1J93x}MSd+&L9Qt>Ads{{cUW{>L)SUzo5q@h5RtC0v68%BXb4Z^#&H@r zL&AwnLhVzIVvf$f##avXk|qQ|Ecyy#Nf9E=CK^4rlecd)N-^&KF$LD1DX?B&k!sB% z^q}g@U~#?1XhH)a^;J>$ecYrp25=`&=xwuA*NFbKr}(!og;XM$4nrq@n!&Ij@jN} z2-?LOM^ojvt{Bp^!q5>YHWDvvy?Myp6j)Qee)Rf|X_b$D@7SDcr#-e_)7dndduu+! z1HHX&?OOVtF#yrVd%8zwuhA83y9xmLPI8$|R*tiMb=#&gi`FjC+V*z?AaikwwZ)Wo z5Ba+XfK)ro8huvHd9BQ5&HYCOK-Mr#kG|dA8hgpz>$ql2-@ENQM~_tsAnX2-d97t} z?`H17tf@m9-vt1fdv$NBZSctqh$63e3jhKey#5*8ySnpf2J8yo{%FZNnDaeE8WL`e zrH;1i-@E>adjOC+U?I=6my+tew7^FJAT=-L6j(jZtIz7~+!O%$cmMF`+p7Q|>KIG~ zLMY&F#1?MV*Y*CC@9GfVD9;qFCQqFZ!;2F>B(X4WY;nT|X zpf~;}B-{F`69dEpes|Q;Y@kL0QfwjTI1bkES6nph2GV}P>FhU)-6~7Kh=B~XyCkAY z>P2DRZ#tM!klTb5T8ki_3P(<@dlKupl{{yb z$M@Ct?jN^mqd#sPr8*lqzHq$jEqw(+B*oIc+{6)YH7=OCNY>}|l{aH0_rbSeM`1^67b3US5vn z_2pDH*Np-o2YnBsVKhWs^;-b6mO2H) zQ(#HJF`t9!ONEZIe1+Z!{g-8PW-IC*J~0o&aTe@l24Y)UGu5^1*ZWU0p5EDWvimJ} z8-$I9S9&#a%6~?8|62b@>OY8m)P=x5Lod?yV7uYixB+lP$ze`l+nwmp_5;n9_EP;0 z1%e`)PKIqMumk`(N)3<-05RE0x)16?ItDn$9ZwaVd62zsRd(#A4ReTp)R8GmeH3E` z+?0`)cj3%z?dSFS<%7?V&Ul{zKwSXDBC)t$4r--n3X?PEKfj1!QqMhu5m1e!h@B!o zS_8xg$o-opitkB$b`br6FVK#%Uh@{5_1?lF76&!a-92G_U$6r&2u(Wk1GAi3_l(AJ&?u9 z!x@&~(zST6c6m8nZ|B2vQe117^4>9aSEl0;&g=+LXo{d$1Bews1PJP+t^J|RShG(n z6a->iDcK(jDR_rW*CN6KMaDK!ir=lSOvVQt=!|n~P1Aw&FL4HhL(NBSec_DK~+v$oFSe-dk>VXT{ zF(rm;JnXFfA&4hUIaZ-i{PdzZk)4gI9%>KW5W$w03cEX z9eMb9voexR@iuNl2nQe<3!sCFdwL_4Pu%cybyOL>@s1m>Dys2kPF!)ItMf&k$BlPt zSBzJ{2fOL5V2C+v-5Fy}i*&0FfN?kpc@V zfTfpSIL~(L;sLD9FK+Gm&T2thNBD#q9q@7ZffngS?CUyKGXHIb+J@vT5#La z6kWHwa@D`%mN*VP*K+*!f`Yl`2=~zs3^Gf7r2GJfu!18BjBM0tf4RJBUs~Wi-zHPy zONtZx#wIU(V(I0KE&vgOBQk%*CN7|k+|0-P6)e~y!a|Kn>-Zsbud-Y%(wGvyHxU^b`ywrsyVl_!Y?G5|#Sln4(=wWa`2<_j|# zaJ~d_kpc^p$kA{(7eIoi?VS9kmuZW;${H0X{{dyL@|7b9R!@o`3Hi}kxw0V^F5H;n80^bg;M4grIg(&z(JrXPW9^|guXk@I zgY_C{!Qlk*_$sYAtvtJgoFY&AK-GQs(puYFO3Sk1MFYFO9Z1#JSjQos`S3c_4|fo4 zAxqZH>TyzUXCJ{w-cDOOWUzi3>zLy_rRj8*?JPwug1&SNv5lEAVq+R|7x$8po|o|4 z87c_x^=f!-?U+c+Ij!NEC98_gL$wC#^Umx7zO})J03gXOGJWBs7+abNwK_P*>YO__ zt`^Xu_nNu&>~%Y{w8_GGFWt0MFAk~oF9QIvHJ@4IT8gp{y|q*3S5N_vfBhf->rIP@ zYpn{V)Pd-#gHpn_jl#%HjgFb8T5qm0wS*T)w@q4_GHuNU#gSPY8V-OcCJm<-_w1{o$MikcbtT%Ef<9(?9|yUi1CV@DBHAdY7RK=eIv3mXb?9I8;0bK zVl8mMLan^vYi+y0NZSvUfKN!BYvNs(^jD}eA!&l5WVepWIYj=*|7Ahdg#n#%@icul z-e;6-aJ59QF0=O3O+?bz;&71~Bh|*6oSRHZrcpT-b-)6)?zpw~0)AW+ec&u?b+6ZQ zdU-*?Tn#Oy9!&& z#0tL)5Tz-`1XMYc)9X=dE{Fg?Z!y)DM1ctSV}06~bbYl>5Lpp=gff|VIBD%0Gv8vNxvrm$mi#B{Q9k2jsk#yFTzM6 zg_wScMbc#-wfP{&T=i3>_Q`XpTD9p1$YZ7xUG!_?0IyA-b$DxNcEyWbhI~25450(; z)%MVEud6?SK0=gP20&_Pkh>c}5P%4=(T7thfnwQ4p+0Zc9T6Zm2S92`jM?Jw%l$F~ zATdqVUrEMI$tZ`zY9cxc5a*tE7U zz`OX2l0{(oj?Py;(zA7JKdEG4f>ul4IR2{CLu!;fGgTCm+Bl?F9gXGmTR5h<1TNif zDxDoI@;a&ovo|_!Q$&})qp5iXriNy#9AWL&Z5>nq$QviP?snZ$VlHB``DLBn zO74R`?x2_NnI2RcYX!9&>GE>hYJ&RS{>$$eQs_b2p>89a^o=Ohu;P}j<&u@`?&;Z^ zVp=s1DfjDAx{?rsS1g)RC$&=7Q%gFw(c_C=f<|lRGosI00Joj9>WkSS#X$To@93sA zRdW$^X6qo64fL~h(mIl}ww)i-?4Sn?D*JH#y514o5(AEpu^Z;94_w|`#=&>>Po>?-#S~+6CaXbh!Vy%uz zQ@>Al_Ep;0G!X$(QW12X=WurEjbRCSK#p{N8d=g9*WH}o^t^O*e5`ZE=!~`Qb?rNr z%I93ab2UKL3ikW8UvHz%?>>VTo?W3wr|F$X0g!+5AOGogzMO{uh!tBF2W*u)m9n5W zoZDy+I{1>Kk42re2>M=cqF5g_Jt$;F=Y2x}oW9cM-m=a6r6%58XD_a}H1X?VgBV$Ru0MVc3ZV2?O| zpPtkyB+(y5>VQ}T2xbBBqaLeH%6iQvw6wC89qX3SGg)0>En4<#{ynOlr5$e7VzF%v zvSXbGb93Y~#S*|ZINS+%Fa;Ex^T9pW?WSCONZ<{o5V?voQfU_HX7u$eQf#$4lw#>n z!de;noR41|xjAP)sZM7X!4Y0MPN{{A+arZfVqu*RA`k%bFd|7li=yHh*Le9DCI9_oTbJq;(B73x-yP?9$p9l=BVAJ@vjKpDG6NJv3*(F>@RBO9i$ky}uQS_dB z*yG0l03ZNKL_t(wi5;$O@~+=9ZzilvxA%IMH3X`xJJ2m_r!Eq8WafjlMm)< zM}OA=NgiEGSRYK>)jFkmH=m>%&Vmkx%4MxG#IaP+bJ}%HhD=Xn{jFT-ds;a1;#RYa zo@oO^HMmO9KjQsxTw#rCpe7S|NbDg1BDz-qkX_k7eJcCs1^}rHKc|pwU(m$_vUSuH z6n}LdL%z~ek8N;3qwF9;kzl?nGDPi>#@2BaPM2*9{`C<4T(}Ryfy%ivYF&j6wCVoAoZcw zZLHC?TDr3L(%P(*{P-mKmyV}43zo_r+T}Ik<%ndD>eqRp?C+KYqbTpX(F|HQ09)p* z9(CqcrhR6veP>6rqg4H51)esO_}%~rby&=`v5V5W_w3U*uGmUVSnK=_uC!n{bzUo- ztpTpWy151j&RBY=Fky^+(O;C#C0ONpCvMf&f&ngSGB8n0XD)g;4}RSPjb0wkRs92Y z?(KJ-&l{u`2JhzAy+rHTZJj~XD)o(f+FJT8XrEbbLG!A~+PVpq3EjNxuBeo;ZK$U_ zmu^`--tI+VEbTAPvm0r=jOt7F6t?*&0K|4*8}Rt*2l+#0?;%%EX6@581B~sZb+2pR zu@nGl*LS$n=e?zS$#ofvd`PQqglqMt-X1l@=wEEzW`gl%mVqV%@+Idw_We4l0}dA4HpLBaICu3{dt4|r!=eUv_%0bOBTl$Q z(z)gUh23b+H}W+qL4GPnNdiPH1(}Rx`}Cv^Urm1{PF;-v!SnJ?zt2uO$ohNAqGSMQ z)DCuTq~9SOVPLs)egJy3s=)r8jfmFLgVmw0nFGiM4Qv#dmzzfd&RCrs;X*I2Za0=`21U?R{+ z&LZH%IyW*Sou3sYmm=~q7A-)3KI!v6{P3l`zP{>zMT^Y`J>_`;jQFFG9ir6Di$T_6rmnOC8rmTdCYW?(fmX~A+NRsz5SI7zZ% zeQ9J6Ri)`1Wl;mMm97F1Yc-b83(&veG@^_H0D)|S9yazQze8s#`w5`Yl#NAzJS70+ zffI-z;pa_;u)0tLl)sF#rTR;P?HRcJ#EP`JQwf zqr}27TG9jROEAEk}F%mNu?Ciqk$`uj0ZnuUPtuS1Lcw+b;%84`Yn5?Hp+j zwuh@;Z6^{gFVx#;HZq#Ln&G1vIQdpA#Db=nRb1HY%`)5ajxsIi`y-klat~v!6q4J> zcdX6AM=ILP$W!f8YYccBe){F4n&*w>62O){731%@m9jfXo!Lz}pCr>s)4yko!Gs5- z8qr_9lxO2}OKX`glYRsPb^9EStiQXYc0Hb%+aTxoY;>V&z4luMK<1Zh;pR8CPB<{c zEu^mG^cTVakU!s!rznE%&Skq%&>D{J6w7-?a^$+fWX=Ii+ar#}{jNNJdM>BqYdLDF z8gu%jTfrQr>ym7Ib^#EIpxqiC13*kc>Rg;#nBq#0UU2-IQdMW!$~>2O$rwbf zbkW)q1|Vc7dMbA6x4vzm{D!CcL9EC;qZFhMj#pFtJiB7L$xZvSC@5Qe?a!_>C}@&y z5?kF2I>V8QhB3IzH=oQD1Hr1pr+%GRs8QG06)`LOJ9tHCBhf4Pl4*v-2~K`f$G)dG z%QXp7@nc=T@KaW$BzgOs!6h~fQM}rNfCA@pxhQyaR^UU)q)uzx-siy^eQRA+1!C-dGPgX@ExKJFz5_`DCkgjs3*Y!-uhTLrV$xq>tf^8s1E`@4t_Z4 z-9`wN0B}kRkZakIeI$4j*;TrliLu#g6w*e(ERWQ|JUmh+r&J@41KCuXp`MD(gP?;( zlZ1xD_-`61CVy+4klj`R2RINe7S(andLPf9KPmVjQ6MVgrjG~;

    Z3maKoQ0^}C7 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%0A!7p+gWU3+RY_10}V;+ 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%0AXa5qCfd+e@&+(t7|N_BAc1pye!oa00_pSvNi%9 zEd%6uJh0X)-fKWwl)YlO8PAnkM0p|@mHv}34;#DeLr03bbER;RqiGg4%ATP)&x2AY2PX*!ymd7GxkuU{R= z1OS4pv4{dCFV(CMMW^auQoG|Q0|X0U>sJ_SmObCfPyi8CDfB!!pt$oN<*qxNNtNPA zUOm(Z{0ccKK(ijO&^S8E+oe>E{npoQ_n{S_0XRT!1kVp&cAsZO_(GGqa;5`4_s=c! z%K#AQh{;Q+*&g)$uFV|eC!p9kQ}|^B3~OxSBCSvTyUqRyxj=@6ZYs`84$eOkcxlO! z$14YLtel?hf6HQdwrn+lv!P!FJv;HZzd24R!V*qJ+SWn<03ZNKL_t*034wvb5M?qk zTxRJt*?P*$)ST7FCHXi&!Vo^~K^)m6r^2TSAD8tBr&}BX!gPMW?6w2=ukkvm~sIogMx#-H>eIE-HGX|6xv+(S2@)`d2zp< z2v~?=4)hq}V!G4U%;8f<^ijXBNgnc`c%=r9^vd|7hSWUg69Cyy))BX^Wq|N4r3@_v zL~}+7yV1X7AeQq6RZP#rA(l0!3V@_6$L-noPvJNGcus;wey7g*R|7znBhUA9&3SjE z{P_I>AYjl>0AziI|8M{Z#mZdm`eA)x!pk}j07%-L^By4i$hp2Aowhyz0CCYcx51ZI z^E?1#iC#-5$aP+tUm?S%|M#3{E!dz2p-B8IpIy z>1=gb-UEO@_1L0y!P*&G%J+{)S^yBs0AUIv9o7EaCTa$U07b5b108*5yquIh-&}Lyz}EJv{>mamdjQ1u!X=z-_V3lrHL^d7 zv&-Iz%om%=>vU}(+VwRf)L+~wXMh6$6M}W#-$UqL3WI|;T1SI*2j{%sxn(TTvE21T zA?1t4;$({b8N8-l7tYUg5CmK%;nbP?BGCzblVeb6Bfq%ZVcAz~aD8i;Wsgrz8+THY zhw6c8Hvn=X+T!APHBCPu1H=K4Uw;h%M2-?Pd+x_9S4wLwwE#%=eZhWojsrb#$U+*(H4mV`4SyM2;l+@g&bdi7`&D8HYSizYkuEM5i2M@E%VU0q=ynn z*TT0TZ^#CHt;#Zs;gS(>jYTR==O*4eiSvB^&Zz?8v%{t2J;oT>s>=Lq01zvIb?sA? zJOK-5DNHLrX#8OrAeBnCkq+z;5+oCsTB>qhR zkd5Z`pCkjs#Z$AY^^fImPDu3>RN8Q{ZzYc2<0@Gk?8+DYh`A>v@TD#~T|azi$Q+bY z&GU-=4jTz3ZKuSdUmgUov~uc_)ZMOwsK+z&w;Fka75J9|KPV@jN z;nKtBwg8Anjuz*(Ycn`(#euz&Z4Mma7;c>nelH{J@4kF-XR`Idkb@A<O1}+cS>&OmHXwhSj%dhkC5Gr&_Q$hlgPhHNDk3;@Y0=MgzrauT8qK4PfaaJQ z9(>%0tss#(NG`p^66mne(w22;zVc)kG2GwYNkIO6V=vdu_H+8ztULj(j}pJbNFOc?JmBxhZ_6*rj;n zT<74E-Uw49bON2&Kfbk9#^{*<2>Cf2tD(J|pOBit2ZL;oF>6k* zbQaaaNktNeKGQ^Dhsp)ccRfXswQX6gA>P_Otr?SpJGfx^poUD1bh4*R3}=|0pwflM zV>Cv${y7g1_vroe1~Ags$#hWc`F;G1P6F(|;Zzo=KT{fu~}^v^0Xwx@8bV<>BDnW_Ld`a+Eq;tky@=W1?g zGh`{Y&ViOnZMJj$ZW1j31KAa^RMhz@kxB4Ix(Ox*bdUoe7t{1yN?<|uJA8r?Hdcbr zGeC+gb@^Ta$)sEWceS9^9suOTe(U9Es=Vc0GTXHEG%|SL$7X=Q!a4mjA3H6@!k)Os z|Ch!{0=H|=@7})U@@`0OFE7Yc_}mMxZ>XieyjrKE-4Yc^ts-k;OvRJ9W!fj#X;lyO z0zI^Nk>Xo3Kq|2*TLRpuAc&n2P>$9z0Zl$y)KryY0%R>{2^nD?9TKuq^2B8(<)>u_ zW-J2sxqUx77cBrFO%ITB2rs9(_?>bu9<_HZR(9aFuZu<4844KADZ#Ss4e!5706dvhf|RMBsjLvBIu1vGzvtjOA##Lrzs=F z;fC&;?6N<`yiIM6xp?LB?mXG^Y?^S4(;)Om77uCdX`@4~ zACn7!qm&{CJ`PqECl5>ZEOUf9@bK^epu^_X*-C}mV;=_pajSdQh$7lcGiLRKKxs5M z{p8HNy@Es2dK6fOg8^#Jn^dSMsZYKva-`Pw&mE}?zzeM)*B;1gmJHm4dH{f^=T0~v zOYaCo(We4wP0INw>X@{>izvXJBcPW6$mMi%bL-05Bet>GB2!HZqU*;Zwg*4Rz-2%> z6aoM_5&%I4$kVT1U0yT*h|!p3bzGDQ^i&z6AppXjHDsuL07x0LoWXS5^x0B94PL!m zNG&%-`Nj)J%5ao{)i4$LKIDK8FC9n?W6W>Nuftg<=W<@Ww3dSA#Ch5;`ZskJu8_{S zxxMj)vR)v*-&{@-$YC_3__6Y}e#d?Yj_VA@GFsmVW5qu=Cb(;&1Qw+^ty>?v0U%Z? z@0ytl505T0ypL66NG3cE)k--~0}v#uBwsp7k@RC0g~`lbPjnfH+BYp^)pa8&0SS`L zHUxm-ospx@f(_VP2GSEVXs$`RgO34t!?r<`xcz?uAk%bhnR%W8Vwpe{9>!RlFD$F> z4FE{4duBj!$LA;;Fj&{kfxLQ{Z8AU>EaQ{L=McGE*lg8S>>v7}86chVT-^I(4OIE9 z*@Ltf-5&8xI--n!F@EFv$zzuK)!))Q`3wMLG%!4K`Cza#%dpWqSyT5{WbB=gzpGzu zpiIsl|`QkR>XTV!=*_8IoKf|~$;%eULjmSw9$nz)`Af zv>*KbQ?%m|R0dW##n2d{Hiiu_$kbh5m@}_flFxg2Wb_;v;nlW)f8_e=%5A@<|C@-U z`726M=MSlq8k`ifj_|%kI+WvexrTPvNlk^zKL!BVOV=&STJ~fF&*Z#LYvC==KXJ`T zBW}T5Dct|@07wpK{_F+WHC&SSuhaVhkog!^N40vvd`(8Cc9lxihKo7vea{ZH;WBW; zejIVv*#O9fP4Z_2Kp@-RDF=GD!0>VN!&#@UXa2o&MzsY1DXL`liY=sQrRxUfnZ4zs z01$Kbc=ThgA`A#Pwq;PXjs*_5u}W~zsE&AOJpdrrx3}(0wp#1vI>9lB@30810)Qxb zXkG$K4(y7lf--Lx$QH0NM&icMWpUs_R>K7|KLmnglsUNY<=Gt0=ID5aWBhRGnH&xz z91wZ$2PS3@n4|vZpMQ4ewUuc4`pd6g?#tiL#_skV25P>*7u2bb@QEVnRqvBw&3*}x@fwTFMHw6KLJyiMf>{|TL8I&;qH#*88$AUl zSf3hmh@s&+vy5zsy$1+EJ06flEgu3mN32bU_4_&5`qr4k%>kC=PcP*~GNT4PA`owG zZ#|Rf@cQa|#j-!V?mV5fD9;9PhLcajk``*adNE>N-wIJcR{b?Lw7jmGM9ut_B}Tx@ zfvI5fdKaeJzj?_95D)p%Mjz;90OaZU$s@KenhcP(+))2^4RiQ8Al($XwbY6?LBB&2 z>e2(m0H3;hu%42s4!3{Y)N%1Y;6p5Yy3HN#@a7utKQCy&)> zw+sNw001z6)saS2M#QqL$5pC;eU}LkPCm$suQA{uMyrzII(LwkDlCz@YR9 z(E+;aMnce%P06)K!nvy8gOXiQL5?7rD5cD^5(q#Zh_N&oEYN9^T{pLPZX=lfhW@oc z36vZ(9#C(vOXFu{8?nJV{>HwpT&K?(iVlTe+21bs)OdNmzfQ`|difU1To0QIY1$v% z=}Y@@Y1=P;UU$yY3_!X1qm|tZfGoX#$ueKGgUW;Ydpq2``ML){0?6A(Fg$blII&DY zS3Fd@MGqGs;ExS}s80|T6|zIkvaG!mb5IfhG!|aT8K|x@Le_a8eI| z5D>T35IF17x%8b20XRREI!Nty8*RCLoRDWT$t1li#owv@wEJxvZ|Hcd+@&)dJ{k#@ zjjwq3WgiHD%;dz9^|(CfSvK9N`Tbx30_JLwH$V9Or$_<5=M|0YrL4n-7;eFLv(U*0 zoKz|sU%f2jA;&8K0vUE~C9n>b0b+gzM&^~r1fRuOVChV!A|IW`Ni+c04XxPc{blO8r!1kd7n=DqW~Z>wd%6BAZ!xt4-0^}cs<#j_>`#% zE1CEYDG$Ik+Kcw)(98g5NF!WK~zMkX>iG@!FrhIo3lZ zu*jRb3)beC!*oq%fOzv)m0sZyod8HQUX??;b73mtD%nOo5(>*WNN_n_-`t@D*5f0^ zDgY3a9Re^R7$6;AmMI~}hnxz<5;DU;_Rqx?o~6iCIZkOgHFtYCD*J-bpzsi(1eU*# zUWFb)|_$=xMKju$^FtSa!By9<-CDBv2e5s{O(%W3kp`WEa>>&9PP2PP@ zO>|%IKQe0%4cOHvPV7JYopAha*!s&+X7jN3SRazZ(X)u`plr{5 zzW?UgQqhdp0m%c(UO9aUA*xw!1s{t1;Ev9dLp>TY9yD$^xVb{2Sw5?DqfYXpswa&p?s0R&+RRz zFYatM00bEz%;st=pwtOwr0czCo9V@SlMoz9{7hEUm0-QXe_osp=~g07)09F;)Bfm%duy#vFr;rO}AgZ_~Y*H z0f5-hY#y!$40I+P0|22D6tgNoe$#Y*Em|dZTai5|zd6dbI;RZ zeFy-uL6|M=i*kBMM-PKDX8UXVdrn^26ZR7TIfJm$IjwyOaa3e>V>|LS%`FOYl5GXq zB!JVh8m;84WnH`cX1Pq2gjJ@H?P~+NZEvG568{qb;=2)hP+7VVNA^U3B%c6?Oq9-& z3I!roMQu;?^dwmTWar zuo|uN@w*JCJXB|>o)fmxZf$i5+Ex(V0FZ0+0LcuH_Bo9YMYbHz7fUK~c_d|SGlnP4 zPeS#Q5ozZ*b*MwvDA2Cp-W|7P{Xa86stw&)qb;wG7Hha9?_Z}sA^;MzZnDtod6ZY| zB+r&OrpoD6DsI^Uy2dj=E-u&$vm4|90143|HGkq|p8!Y_=Z^w_%=~5>m}!eVPpy&C zX2YY)C2MEudZ?X0nE=Rty*+xl4|Baq3BXC=j$D;&IRSvUgEBly$mF29i+?-=#7fne zqtf~*1a4g&6MPPx$8fmOsltOvPgr*tN{Jq>qfUBy5h53~amAt^2Mm{Ry3l!Hphh~e z;S5wM5db8wUNas*!`pOwcQf7H-AxY<=5VsISBl6$V|2fcj(k~XC{Kd_bm)?S2Q0?c z0Q2vafBOk3VrykUil^@y zh-o>kghAAf6y&WEji_}Dj~hKt1`3!{PX|}qjON&jO-U)QQY#o@@^OG6g>i-ei1VD$ z@DlHH=b-h2!JJ+V08s>R@d}1hI5?i!9_IYBtP+-y!yz2bF>|cyP;MD49%*>I@~jUl z=VUx)k>}=E$Kf1ck7s0+hP~iX{D-K*A!iJ;J0eob$35`uv@4&sQMnetBg>zKvpusQ zR01oWKG4WZc2ng%WoIdB6Ff<$#^t30khbrv43=epfCcCf;mAh-NEPfIrw53l{o3q7 z+xuUBVg|_D^z`-H0svyOE1*Y-gUr%pZ_{OzZ6N^S+uvO_l#^wTuW5(~`t6j1oZnj4 z;=pu}MSvuoI}L5Pr!oUgJR{k=#gelUBg$CnC0Z;}`vtQIlKCpw(8ZKW4s?4UN7nVH zXb$ z`fy$YIMQ%j?|tRFJ~KeR)4p8g!A}5Wl|;od`2;|=QcKtMC4{BF!0+oC@6;7}P#0hz z-^R7sd5b+j63FV$%GI9kXL@?9-TsX~@ypYWn+agHniNYf+3-Zp1N6TsPEwsBp8 zyUhVY00d3YEdzwtRVRRlT4od%d=x5{Rnw>P5c9&)74958So2b5SyWQeffp_)E0e{t zN;W{1ABqTQi|nd(g3Zz4pa%|9#`q{Tayk9{^PO*D^CMZqb2aEL!SBpUF~Eg}k}^O% z`k#(#FWtmL8Qo>sWV5At`&U_919hw%iuXVPg}toFjgIvpR{v@3i``CTb z(C=Wjg6IKWeDm7*)e)c1!#al3osu~tqPu$Uk_;>_rW*YaN{Gf5+X(RJg-LQMg>Bbx zwmQe`idS26mcO#B6L&b0ZdR`B?TJ8$Wf?f|6@D{o+wa+4v5b@suhFHE zm5?ec0Fa18&oVL?7#yx7#ay^G&*ax!*g7JYF9eS?KV|ONJ`MoHN?=uJRgMyZs1*be zs4`c;7)L8IMGOAx86ZFT{`U-!Z{OT$Vm&}I$Fnr-ZYG02+zHH5W(I)ZomK)1`~n8! zYzm-U4-iY*Li7q`IAnH-RxPQ606=(P;uO6+AAe7tN?=jrz|c3CCk|kj9w4GgqqFiL z1$r0&Ux*hVe6CTvxv}>8@eEfp$mjDj9(FK*y_zUTZ*Oj-tBtC^^jK{HsrzUs@t7SREbdQ@2(o;eq#;h3@G@*jPztU;z_vY?#f^Yrle;PZ3c zrLr(8I~c*&NvBweplfDoDkvhdJ`@qH`Go_pl&f?g*z}UJ2I;s|AcB|rQlz8!zHGz* zIv}kh+eC_>W}mP$m3YYijZ$2Aw!jtzYj}nygFY;qQ*s#h0xWX*Z5beTyXkAQ3u0|E zGbJ-_1O}%zs#$RYQrcDT0H7`dWW!DyJ6zUIPeslT@VVav0I77T^M)ysyjmT0D#Mod zZlTzcBwhb}HmyaF#WF3Zd9)z_{l~Y%o0f02q z=l+l_?dJpSXWITI%P%cJ2^k>K-;H*0%1ziSR+iU;kt~SB%2=`wpzm>~pE5uM;4}Q< z698#+f8#h0wmT(Q-p5JX@7@W3)FJmT8GzP%B}^~B7U%Jq0n(7B9zk1iT8%$iELq5f0TCn>Wt!oPXHvC zd&Dv;g#2v)5DscIwnZVhS334q%>4cl;Ipg?=J&6TX!U{>7fz%p%?&>t-drM%Q0ze$N*Z_bu5%*;2W|`>7jtr1T zI4WIrh62{XrWmUMfH3;qcMHqH(0S^?TI^qPakwIN_;m57IL(a*M6e=Df_2pCSZm6; zM6OnKYBEdU@^Z51i=#E3Jsv$e`044zQ&GKq7Ef64ji|Q-GEV#>Hd#lhtt_d5=GAE| z^~HI{o3dm(u!n^sTa>)7=A?On^Id-T$kON!$FVBa5mvUm=;#0lBBf#fV9Y8d(D1#S zyS)R3>wp8fl3+M@eufMrWVB>fi-8GpfNNd`*fn zurujg#L|%t#R!$N1glmi9E&nE!$&3n03ZNKL_t(nzYetd|Mw|n#n@)n!{9&w#Cm`{7YFL`&01(2Xlx)KaZ~?M165lg`LIyHRh`f=@C&M$dTRJtcplZ1O z$vl*~T-RFPSrPucRwdR%2yA^BEY(T7Nz2gz*a09z`yu%v0T8UY9PaJhS1pF&09%8N zxrPBmA)C%*ob}akUU_?CHU%=cRG<)1d3suzP(vb&{giFEGz;|W0RMt_w6lxcmkcH- zV(aAc`O?aH9bMm;JTVXl`YD~CDJQ768pAJjkupG((WX~wkIx;?++~vGHg4A7hYbw? zMfOGiDDk!NnKE>kB_}7T(@_0WK+g!?;J&-Pz4gxxG>SFz zcUUk%uJxs7*4W>S8drEk1U0Bcj*UxzV$t!9+~!OhJ&7#DDoD0)`;gE6OaMqnqsFNd zdstGqGV~Vet;nkZ9Ia#RR-*v@q4fSNC1Sv zQoaDpV&v~{W&;xdu}ozHLi}LQ{%)vpi@+4OTc6ENww`|oN-{vi^s+E`R&Y-2{CHE%mjo6RqpUpNxE zD=+(P01z2FgSigX#`(HLZ}`JxfGjP4uvJ~q^B|DD{I`E!VG`dB0P!<$^28qp07**D zR`DGy4m+S_oCOo3Tr@vuwCA65ERs3%)&SviB-<8V4gC`@*m4&xrbj5F(0$rToA^Gi zp3edqApicKZ(ioZdw^&FWYYqG__1B3T4vrHIq2FIjp2AXpu==^V@=SXystr)Ehrlz z%53n^!N^T_gekgS%~$CRvPke~5yA-i6rMed2Zx83aEeS3MUPF>3!5Aw1ID{FxZ^^N zu?t=U3-@z-E8z;W{Zw{&j7K{p7W8#>6fgP&(7ZE<=q#TK6fj(B2n&6elLNg z5+Thh6kJCcKCBNA)$zQX6j2@pp|29m<))r24@K*wgGf`4JG`-)gJ!Dk@+X`F!g(o+A zo7p|-poSz7*Z})L1iv$P;%qel@EkdyaX8bGtFftNfZRImq6vEVhWk=*V{L`z)O1pH zf^;@xdxVwMxcxF6EqZ;Lre|w5?WN3;GBbx4c`dSsqQ8XAiDQh3RwY@%;kv@7 z6h}SaX#TYyN~Rb%pHUuUnWA1Qa5bA(rfks1L1}+H-f=M%0AwM;qAEq-QvtvW01=H_ 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

    ;x=-2p=q01dsQD+-N^qVk5CVpj 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%0DxfiRsoP~ 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 z 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 DF<^mK literal 0 HcmV?d00001 diff --git a/bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/loadingChart.png b/bkmonitor/webpack/src/monitor-pc/static/images/png/new-page/loadingChart.png new file mode 100644 index 0000000000000000000000000000000000000000..401baa02845ebedec91f007253ba5f59f9dcd669 GIT binary patch literal 382 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 Tc=Ux&00000NkvXXu0mjfA52F4 literal 0 HcmV?d00001 diff --git a/bkmonitor/webpack/src/monitor-pc/store/modules/ai-whale.ts b/bkmonitor/webpack/src/monitor-pc/store/modules/ai-whale.ts new file mode 100644 index 0000000000..e816c4fc9f --- /dev/null +++ b/bkmonitor/webpack/src/monitor-pc/store/modules/ai-whale.ts @@ -0,0 +1,216 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云PaaS平台 (BlueKing PaaS) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License. + * + * License for 蓝鲸智云PaaS平台 (BlueKing PaaS): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +import { ChatHelper, type IMessage, type ISendData, MessageStatus, RoleType } from '@blueking/ai-blueking/vue2'; +import { getCookie, random } from 'monitor-common/utils'; +import { Action, Module, Mutation, VuexModule, getModule } from 'vuex-module-decorators'; + +import GlobalConfigMixin from '../../mixins/globalConfig'; +import store from '../store'; +const AI_USER_LIST = 'AI_USER_LIST'; + +// 定义模块 +@Module({ name: 'ai-whale', dynamic: true, namespaced: true, store }) +class AiWhaleStore extends VuexModule { + chartId = random(10); // 初始化 chartId，随机生成一个10位数 + chatHelper = null; // chatHelper 实例 + enableAiAssistant = false; // 初始化 enableAiAssistant 状态 + loading = false; // 加载状态 + + messages: IMessage[] = []; // 消息列表 + + showAIBlueking = false; // AI小鲸聊天框 + + // Mutation: 添加消息到 messages 列表 + @Mutation + addMessage(message: IMessage) { + this.messages.push(message); + } + + // Mutation: 处理发送消息 + @Mutation + handleAiBluekingSend(message: ISendData) { + // 记录当前消息记录 + // const chatHistory = [...this.messages]; + // 添加一条消息 + this.messages.push({ + role: RoleType.User, + content: message.content, + cite: message.cite, + }); + + // 根据参数构造输入内容 + const input = message.prompt + ? message.prompt // 如果有 prompt，直接使用 + : message.cite + ? `${message.content}: ${message.cite}` // 如果有 cite，拼接 content 和 cite + : message.content; + + // ai 消息，id是唯一标识当前流，调用 chatHelper.stop 的时候需要传入 + this.chatHelper.stream( + { + query: input, + type: 'nature', + polish: true, + stream: true, + bk_biz_id: window.bk_biz_id, + }, + this.chartId, + { + 'X-CSRFToken': window.csrf_token || getCookie(window.csrf_cookie_name), + 'X-Requested-With': 'XMLHttpRequest', + 'Source-App': window.source_app, + } + ); + } + + // Action: 初始化 Stream Chat Helper + @Action + initStreamChatHelper() { + // 聊天开始 + const handleStart = () => { + this.context.commit('setLoading', true); + this.context.commit('addMessage', { + role: RoleType.Assistant, + content: window.i18n.tc('内容正在生成中...'), + status: MessageStatus.Loading, + }); + }; + + // 接收消息 + const handleReceiveMessage = (message: string) => { + const currentMessage = this.messages.at(-1); + if (currentMessage.content === window.i18n.tc('内容正在生成中...')) { + // 如果是 loading 状态，直接覆盖 + this.context.commit('updateLastMessage', { content: message, status: MessageStatus.Loading }); + } else if (currentMessage.status === 'loading') { + // 如果是后续消息，就追加消息 + this.context.commit('updateLastMessage', { + content: currentMessage.content + message, + status: MessageStatus.Loading, + }); + } + }; + + // 聊天结束 + const handleEnd = () => { + const currentMessage = this.messages.at(-1); + if (currentMessage.content === window.i18n.tc('内容正在生成中...')) { + this.context.commit('updateLastMessage', { content: '聊天内容已中断', status: MessageStatus.Error }); + } else { + this.context.commit('updateLastMessage', { content: currentMessage.content, status: MessageStatus.Success }); + } + this.context.commit('setLoading', false); + }; + + // 错误处理 + const handleError = (message: string) => { + if (message.includes('user authentication failed')) { + // 未登录，跳转登录 + const loginUrl = new URL(process.env.BK_LOGIN_URL); + loginUrl.searchParams.append('c_url', location.origin); + window.location.href = loginUrl.href; + } else { + this.context.commit('updateLastMessage', { content: message, status: MessageStatus.Error }); + this.context.commit('setLoading', false); + } + }; + + // 初始化 chatHelper 实例 + const chatHelper = new ChatHelper( + `${window.site_url}rest/v2/ai_assistant/chat/chat_v2/`, + handleStart, + handleReceiveMessage, + handleEnd, + handleError + ); + + this.context.commit('setChatHelper', chatHelper); + } + + // Mutation: 设置 chatHelper 实例 + @Mutation + setChatHelper(chatHelper: any) { + this.chatHelper = chatHelper; + } + + // Mutation: 设置默认消息 + @Mutation + setDefaultMessage() { + this.messages = [ + { + content: `${window.i18n.tc('你好，我是AI小鲸，你可以向我提问蓝鲸监控产品使用相关的问题。')}
    ${window.i18n.tc('例如')}：    ${window.i18n.tc('监控策略如何使用？')}`, + role: RoleType.Assistant, + }, + ]; + } + + // Mutation: 设置 enableAiAssistant 的值 + @Mutation + setEnableAiAssistant(value: boolean) { + this.enableAiAssistant = value; + } + + // Action: 异步设置 enableAiAssistant + @Action + async setEnableAiAssistantAction() { + if (!window.enable_ai_assistant) { + this.context.commit('setEnableAiAssistant', false); + return; + } + + // 获取全局配置中的 AI 用户列表 + const globalConfigModal = new GlobalConfigMixin(); + + const list: string[] = await globalConfigModal.handleGetGlobalConfig(AI_USER_LIST); + + // 检查当前用户是否在 AI 用户列表中 + const isEnabled = list.includes(window.username); + + // 通过 Mutation 设置 enableAiAssistant 的值 + this.context.commit('setEnableAiAssistant', isEnabled); + } + + // Mutation: 设置加载状态 + @Mutation + setLoading(loading: boolean) { + this.loading = loading; + } + + @Mutation + setShowAIBlueking(value: boolean) { + this.showAIBlueking = value; + } + + // Mutation: 更新最后一条消息的内容和状态 + @Mutation + updateLastMessage({ content, status }: { content: string; status: MessageStatus }) { + const currentMessage = this.messages.at(-1); + currentMessage.content = content; + currentMessage.status = status; + } +} + +export default getModule(AiWhaleStore); diff --git a/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/caller-bar-chart/caller-bar-chart.tsx b/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/caller-bar-chart/caller-bar-chart.tsx index a2460d283d..b3f2150bcd 100644 --- a/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/caller-bar-chart/caller-bar-chart.tsx +++ b/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/caller-bar-chart/caller-bar-chart.tsx @@ -42,7 +42,7 @@ import type { CallOptions, IDataItem } from '../apm-service-caller-callee/type'; import './caller-bar-chart.scss'; -interface IPieEchartProps { +interface IBarEchartProps { panel: PanelModel; } @Component @@ -345,7 +345,7 @@ class CallerBarChart extends CommonSimpleChart { } export default ofType< - IPieEchartProps, + IBarEchartProps, { /** 图表鼠标右击事件的回调方法 */ onMenuClick?: (data: IDataItem) => void; diff --git a/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/profiling-graph/trend-chart/trend-chart.tsx b/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/profiling-graph/trend-chart/trend-chart.tsx index d184f70270..1f77f40941 100644 --- a/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/profiling-graph/trend-chart/trend-chart.tsx +++ b/bkmonitor/webpack/src/monitor-ui/chart-plugins/plugins/profiling-graph/trend-chart/trend-chart.tsx @@ -53,9 +53,9 @@ interface ITrendChartProps { } interface ITrendChartEvents { - onSeriesData(series: any[]): void; + (series: any[]): void; onOptionsLoaded(): void; - onLoading(loading: boolean): void; + onLoonSeriesDataading(loading: boolean): void; } @Component diff --git a/bkmonitor/webpack/src/trace/pages/alarm-shield/alarm-shield.tsx b/bkmonitor/webpack/src/trace/pages/alarm-shield/alarm-shield.tsx index 8b183e6392..6221a7473f 100644 --- a/bkmonitor/webpack/src/trace/pages/alarm-shield/alarm-shield.tsx +++ b/bkmonitor/webpack/src/trace/pages/alarm-shield/alarm-shield.tsx @@ -249,6 +249,11 @@ export default defineComponent({ value: [], id: 'id', }, + strategy_id: { + name: `${t('策略ID')}`, + value: [], + id: 'strategy_id', + }, }; const res = []; const map = backDisplayMap.value; @@ -746,7 +751,7 @@ export default defineComponent({ class='shield-search' data={this.searchData} modelValue={this.searchValues} - placeholder={this.t('输入屏蔽内容、ID')} + placeholder={this.t('输入屏蔽内容、ID、策略ID')} onUpdate:modelValue={v => this.handleSearchCondition(v)} />

    From fac8ce9b86fc7e7cb026d8df83c622083419324e Mon Sep 17 00:00:00 2001 From: chenguo Date: Fri, 17 Jan 2025 16:05:51 +0800 Subject: [PATCH 09/41] =?UTF-8?q?minor:=20token=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E4=B8=9A=E5=8A=A1=E6=A3=80=E7=B4=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/alarm_backends/management/commands/token.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bkmonitor/alarm_backends/management/commands/token.py b/bkmonitor/alarm_backends/management/commands/token.py index b60e92d134..b60d615c37 100644 --- a/bkmonitor/alarm_backends/management/commands/token.py +++ b/bkmonitor/alarm_backends/management/commands/token.py @@ -36,7 +36,7 @@ def handle(self, *args, **options): for chunked_s_ids in chunks(s_ids, 1000): chunked_strategy = StrategyCacheManager.get_strategy_by_ids(chunked_s_ids) strategies.extend(chunked_strategy) - target_bk_biz_id = options.get("bk_biz_id", 0) + target_bk_biz_id = int(options.get("bk_biz_id", 0)) list_all = options.get("all") group_key_dict = {} print("id\ttoken\tttl\ttable_id") From d8c5ab5326e89e76d6ae1540e9e73f80f9139f6f Mon Sep 17 00:00:00 2001 From: chenguo Date: Fri, 17 Jan 2025 16:08:07 +0800 Subject: [PATCH 10/41] =?UTF-8?q?minor:=20k8s=E5=9C=BA=E6=99=AFworkload?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/packages/monitor_web/k8s/resources.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bkmonitor/packages/monitor_web/k8s/resources.py b/bkmonitor/packages/monitor_web/k8s/resources.py index 8c5b170d85..b03509d489 100644 --- a/bkmonitor/packages/monitor_web/k8s/resources.py +++ b/bkmonitor/packages/monitor_web/k8s/resources.py @@ -434,17 +434,11 @@ def perform_request(self, validated_request_data): [resource_meta.filter.add(filter_obj) for filter_obj in tmp_filter_chain] promql_list.append(getattr(resource_meta, f"meta_prom_with_{column}")) [resource_meta.filter.remove(filter_obj) for filter_obj in tmp_filter_chain] - workload_name = wl.split(":")[-1] - # 初始化series_map - series_map[workload_name] = {"datapoints": [], "unit": unit} promql = " or ".join(promql_list) else: resource_meta.filter.add(load_resource_filter(resource_type, resource_list)) # 不用topk 因为有resource_list promql = getattr(resource_meta, f"meta_prom_with_{column}") - # 初始化series_map - # for resource_id in resource_list: - # series_map[resource_id] = {"datapoints": [], "unit": unit} interval = get_interval_number(start_time, end_time, interval=60) query_params = { "bk_biz_id": bk_biz_id, From 049fa95aee798302f70e7d2e2d5e5b39f6f2e607 Mon Sep 17 00:00:00 2001 From: tang202388 <141982444+tang202388@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:10:57 +0800 Subject: [PATCH 11/41] =?UTF-8?q?feat:=20=E3=80=90=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E8=BF=9B=E7=A8=8B=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E9=87=87=E9=9B=86=E6=94=AF=E6=8C=81cmdb=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=20--story=3D120861923=20(#4795)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/api/node_man/default.py | 2 + .../handlers/dynamic_group_handler.py | 5 +- .../collecting/resources/backend.py | 8 +++ .../collecting/resources/toolkit.py | 8 +++ .../monitor_web/export_import/resources.py | 60 ++++++++++++------- .../packages/monitor_web/models/collecting.py | 1 + 6 files changed, 58 insertions(+), 26 deletions(-) diff --git a/bkmonitor/api/node_man/default.py b/bkmonitor/api/node_man/default.py index aae01a9a0b..24d513367c 100644 --- a/bkmonitor/api/node_man/default.py +++ b/bkmonitor/api/node_man/default.py @@ -305,6 +305,7 @@ class ScopeParams(serializers.Serializer): TargetNodeType.INSTANCE, TargetNodeType.SET_TEMPLATE, TargetNodeType.SERVICE_TEMPLATE, + TargetNodeType.DYNAMIC_GROUP, ], ) nodes = serializers.ListField(required=True, label="节点列表") @@ -341,6 +342,7 @@ class ScopeParams(serializers.Serializer): TargetNodeType.TOPO, TargetNodeType.SET_TEMPLATE, TargetNodeType.SERVICE_TEMPLATE, + TargetNodeType.DYNAMIC_GROUP, ], ) nodes = serializers.ListField(required=True, label="节点列表") diff --git a/bkmonitor/bkm_ipchooser/handlers/dynamic_group_handler.py b/bkmonitor/bkm_ipchooser/handlers/dynamic_group_handler.py index 13b4d457ae..2f19f621b2 100644 --- a/bkmonitor/bkm_ipchooser/handlers/dynamic_group_handler.py +++ b/bkmonitor/bkm_ipchooser/handlers/dynamic_group_handler.py @@ -51,9 +51,8 @@ def _format_dynamic_groups(cls, groups: List[Dict]) -> List[Dict]: "name": group["name"], "meta": cls.meta, "last_time": group["last_time"], - # TODO: 当需要支持动态分组为集群时, 去掉这个注释 - # "object_id": group["bk_obj_id"], - # "object_name": constants.ObjectType.get_member_value__alias_map().get(group["bk_obj_id"]), + "bk_obj_id": group["bk_obj_id"], + "bk_obj_name": constants.ObjectType.get_member_value__alias_map().get(group["bk_obj_id"]), } for group in groups # 仅返回主机动态分组 diff --git a/bkmonitor/packages/monitor_web/collecting/resources/backend.py b/bkmonitor/packages/monitor_web/collecting/resources/backend.py index 924c27cb74..baa101c04a 100644 --- a/bkmonitor/packages/monitor_web/collecting/resources/backend.py +++ b/bkmonitor/packages/monitor_web/collecting/resources/backend.py @@ -892,6 +892,10 @@ def validate(self, attrs): # 校验主机实例 elif target_type == (TargetObjectType.HOST, TargetNodeType.INSTANCE): for node in attrs["target_nodes"]: + if "bk_target_ip" in node and "bk_target_cloud_id" in node: + node["ip"] = node.pop("bk_target_ip") + node["bk_cloud_id"] = node.pop("bk_target_cloud_id") + if not ("ip" in node and "bk_cloud_id" in node) and "bk_host_id" not in node: raise serializers.ValidationError("target_nodes needs ip, bk_cloud_id or bk_host_id") # 校验服务模板、集群模板 @@ -908,6 +912,10 @@ def validate(self, attrs): for node in attrs["target_nodes"]: if "bcs_cluster_id" not in node: raise serializers.ValidationError("target_nodes needs bcs_cluster_id") + elif attrs["target_node_type"] == TargetNodeType.DYNAMIC_GROUP: + for node in attrs["target_nodes"]: + if not ("bk_inst_id" in node and "bk_obj_id" in node): + raise serializers.ValidationError("target_nodes needs bk_inst_id, bk_obj_id") else: raise serializers.ValidationError( "{} {} is not supported".format(attrs["target_object_type"], attrs["target_node_type"]) diff --git a/bkmonitor/packages/monitor_web/collecting/resources/toolkit.py b/bkmonitor/packages/monitor_web/collecting/resources/toolkit.py index 245b2c4568..5178ab4a2e 100644 --- a/bkmonitor/packages/monitor_web/collecting/resources/toolkit.py +++ b/bkmonitor/packages/monitor_web/collecting/resources/toolkit.py @@ -514,6 +514,12 @@ def get_host_ids(validated_request_data): bk_obj_id=validated_request_data["target_node_type"], template_ids=template_ids, ) + elif validated_request_data["target_node_type"] == TargetNodeType.DYNAMIC_GROUP: + hosts = api.cmdb.execute_dynamic_group( + bk_biz_id=validated_request_data["bk_biz_id"], + id=validated_request_data["target_nodes"][0]["bk_inst_id"], + bk_obj_id=validated_request_data["target_nodes"][0]["bk_obj_id"], + ) bk_host_ids = [h.bk_host_id for h in hosts] return bk_host_ids[:500] @@ -532,6 +538,8 @@ def perform_request(self, validated_request_data): bk_host_ids = [node["bk_host_id"] for node in target_nodes] elif target_nodes[0].get("ip"): bk_host_ids = self.get_host_ids(validated_request_data) + elif target_nodes[0].get("bk_inst_id"): + bk_host_ids = self.get_host_ids(validated_request_data) # 无法获取对应目标，跳过版本校验 if not bk_host_ids: return {"result": result, "plugin_version": plugin_versions, "invalid_host": invalid_host} diff --git a/bkmonitor/packages/monitor_web/export_import/resources.py b/bkmonitor/packages/monitor_web/export_import/resources.py index 8535c42cab..906ac229aa 100644 --- a/bkmonitor/packages/monitor_web/export_import/resources.py +++ b/bkmonitor/packages/monitor_web/export_import/resources.py @@ -20,6 +20,7 @@ import tarfile import uuid from collections import defaultdict +from concurrent.futures import ThreadPoolExecutor from uuid import uuid4 from django.conf import settings @@ -46,7 +47,6 @@ ImportHistoryNotExistError, UploadPackageError, ) -from monitor_web.collecting.deploy import get_collect_installer from monitor_web.commons.cc.utils import CmdbUtil from monitor_web.commons.file_manager import ExportImportManager from monitor_web.commons.report.resources import send_frontend_report_event @@ -64,7 +64,6 @@ from monitor_web.models import ( CollectConfigMeta, CollectorPluginMeta, - DeploymentConfigVersion, ImportDetail, ImportHistory, ImportParse, @@ -1045,7 +1044,17 @@ def perform_request(self, validated_request_data): TargetFieldType.service_set_template: TargetObjectType.SERVICE, TargetFieldType.host_service_template: TargetObjectType.HOST, TargetFieldType.host_set_template: TargetObjectType.HOST, + TargetFieldType.dynamic_group: TargetObjectType.HOST, } + taget_node_type_map = { + TargetFieldType.host_target_ip: TargetNodeType.INSTANCE, + TargetFieldType.service_service_template: TargetNodeType.SERVICE_TEMPLATE, + TargetFieldType.host_service_template: TargetNodeType.SERVICE_TEMPLATE, + TargetFieldType.service_set_template: TargetNodeType.SET_TEMPLATE, + TargetFieldType.host_set_template: TargetNodeType.SET_TEMPLATE, + TargetFieldType.dynamic_group: TargetNodeType.DYNAMIC_GROUP, + } + bk_biz_id = validated_request_data["bk_biz_id"] history_id = validated_request_data["import_history_id"] target = validated_request_data["target"] @@ -1062,18 +1071,6 @@ def perform_request(self, validated_request_data): if field_target_map[target_field] != target_type: raise AddTargetError({"msg": _("所选目标与配置需求目标不一致")}) - collect_target = copy.deepcopy(target[0][0]["value"]) - target_node_type = TargetNodeType.TOPO - if target[0][0]["field"] == TargetFieldType.host_target_ip: - target_node_type = TargetNodeType.INSTANCE - collect_target = [{"ip": x["bk_target_ip"], "bk_cloud_id": x["bk_target_cloud_id"]} for x in collect_target] - elif target[0][0]["field"] in [TargetFieldType.service_service_template, TargetFieldType.host_service_template]: - # 适配服务模板 - target_node_type = TargetNodeType.SERVICE_TEMPLATE - elif target[0][0]["field"] in [TargetFieldType.service_set_template, TargetFieldType.host_set_template]: - # 适配集群模板 - target_node_type = TargetNodeType.SET_TEMPLATE - strategy_config_ids = [ int(config.config_id) for config in ImportDetail.objects.filter( @@ -1087,21 +1084,38 @@ def perform_request(self, validated_request_data): ) ] # 添加采集配置目标 + target_node_type = taget_node_type_map.get(target_field, TargetNodeType.TOPO) + params_list = [] for instance in CollectConfigMeta.objects.filter(id__in=collect_config_ids): - deploy_config = DeploymentConfigVersion.objects.get(id=instance.deployment_config_id) - deployment_config_params = { - "plugin_version": instance.plugin.packaged_release_version, + params = { + "bk_biz_id": bk_biz_id, + "id": instance.id, + "name": instance.name, + "collect_type": instance.collect_type, + "plugin_id": instance.plugin.plugin_id, + "target_object_type": instance.target_object_type, "target_node_type": target_node_type, - "params": deploy_config.params, - "target_nodes": collect_target, - "remote_collecting_host": deploy_config.remote_collecting_host, + "target_nodes": target[0][0]["value"], + "params": instance.deployment_config.params, + "remote_collecting_host": instance.deployment_config.remote_collecting_host, + "label": instance.label, } - installer = get_collect_installer(instance) - installer.install(deployment_config_params) + if target_node_type != TargetNodeType.DYNAMIC_GROUP: + params["target_object_type"] = instance.target_object_type + params_list.append(params) + + with ThreadPoolExecutor(max_workers=5) as executor: + for params in params_list: + executor.submit(resource.collecting.save_collect_config, **params) # 添加策略配置目标 + strategy_target = copy.deepcopy(target) + for target_list in strategy_target: + for target_detail in target_list: + if target_detail["field"] == TargetFieldType.dynamic_group: + target_detail["value"] = [{"dynamic_group_id": x["bk_inst_id"]} for x in target_detail["value"]] resource.strategies.update_partial_strategy_v2( - bk_biz_id=bk_biz_id, ids=strategy_config_ids, edit_data={"target": target} + bk_biz_id=bk_biz_id, ids=strategy_config_ids, edit_data={"target": strategy_target} ) StrategyModel.objects.filter(id__in=strategy_config_ids).update(is_enabled=True) diff --git a/bkmonitor/packages/monitor_web/models/collecting.py b/bkmonitor/packages/monitor_web/models/collecting.py index 491217f118..f9b28783db 100644 --- a/bkmonitor/packages/monitor_web/models/collecting.py +++ b/bkmonitor/packages/monitor_web/models/collecting.py @@ -281,6 +281,7 @@ class DeploymentConfigVersion(OperateRecordModelBase): (TargetNodeType.SERVICE_TEMPLATE, _lazy("服务模板")), (TargetNodeType.SET_TEMPLATE, _lazy("集群模板")), (TargetNodeType.CLUSTER, _lazy("集群")), + (TargetNodeType.DYNAMIC_GROUP, _lazy("动态分组")), ) plugin_version = models.ForeignKey( From 740331a1ff87a6c6f1802fdfa5dcbcb6ac64427b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E5=AE=A2?= <945186289@qq.com> Date: Fri, 17 Jan 2025 16:12:41 +0800 Subject: [PATCH 12/41] =?UTF-8?q?feat:=20sg=20=E7=8E=AF=E5=A2=83=E7=A6=BB?= =?UTF-8?q?=E5=B2=B8=E8=B4=A6=E5=8F=B7=E6=94=AF=E6=8C=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B8=A0=E9=81=93=20--story=3D119720848=20(#?= =?UTF-8?q?4750)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/api/cmsi/default.py | 16 +- bkmonitor/tests/api/cmsi/test_send_mail.py | 202 +++++++++++++++++++++ 2 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 bkmonitor/tests/api/cmsi/test_send_mail.py diff --git a/bkmonitor/api/cmsi/default.py b/bkmonitor/api/cmsi/default.py index 0048a46b60..cf2c010a4d 100644 --- a/bkmonitor/api/cmsi/default.py +++ b/bkmonitor/api/cmsi/default.py @@ -90,7 +90,6 @@ def send_request(self, validated_request_data: Dict, receivers: List[str]): # s try: super(CMSIBaseResource, self).perform_request(validated_request_data) - response_data["message_detail"] = self.message_detail return response_data except BKAPIError as e: @@ -109,8 +108,6 @@ def send_request(self, validated_request_data: Dict, receivers: List[str]): # s response_data["username_check"]["invalid"] = invalid # 失败原因 response_data["message"] = str(e) - # 记录失败的具体原因 {username: reason}， 仅失败才有 - response_data["message_detail"] = self.message_detail return response_data @@ -141,7 +138,7 @@ def get_external_receiver_info(cls, receivers_username: List[str]) -> Dict[str, ``` """ fields = "email,phone" - param = {"usernames": receivers_username, "fields": fields} + param = {"usernames": ",".join(receivers_username), "fields": fields} receivers_info = api.bk_login.get_user_sensitive_info(**param)["data"] @@ -418,6 +415,13 @@ def perform_request(self, validated_request_data: Dict[str, Union[List[str], any else: response = external_send_response + # 更新 message_detail + if self.message_detail: + if response: + response["message_detail"].update(self.message_detail) + else: + default_response_data["message_detail"].update(self.message_detail) + return response or default_response_data def get_receivers_with_external_users(self, external_users: List[str]) -> List[str]: @@ -437,7 +441,7 @@ def get_receivers_with_external_users(self, external_users: List[str]) -> List[s if username not in receivers_info: not_exist_usernames.append(username) continue - if not receivers_info[username]["mail"]: + if not receivers_info[username]["email"]: not_email_usernames.append(username) continue exist_usernames.append(username) @@ -447,7 +451,7 @@ def get_receivers_with_external_users(self, external_users: List[str]) -> List[s # 提前获取失败原因为 "邮箱不存在" 的用户，并且不会对他们进行发送 self.rich_message_detail_with_usernames(not_email_usernames, "user email not exists") # 获取最终的 receivers - return [receivers_info[username]["mail"] for username in exist_usernames] + return [receivers_info[username]["email"] for username in exist_usernames] def rich_message_detail_with_usernames(self, usernames: List[str], message_detail): """ diff --git a/bkmonitor/tests/api/cmsi/test_send_mail.py b/bkmonitor/tests/api/cmsi/test_send_mail.py new file mode 100644 index 0000000000..e14b57da7b --- /dev/null +++ b/bkmonitor/tests/api/cmsi/test_send_mail.py @@ -0,0 +1,202 @@ +import mock + +from api.cmsi.default import SendMail + + +class TestSendMail: + def test_external_exist(self): + """一个外部用户存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai", + "title": "this is title", + "content": "this is content", + } + + external_receiver_info = {"jiananzhang_bkci@tai": {"email": "jiananzhang00@gmail.com", "phone": ""}} + request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch("api.cmsi.default.SendMail.send_request", mock.Mock(return_value=request_response)): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + + def test_external_users_partially_exist(self): + """两个外部用户，一个存在，一个不存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai,jiananzhang_bkci1@tai", + "title": "this is title", + "content": "this is content", + } + + external_receiver_info = {"jiananzhang_bkci@tai": {"email": "jiananzhang00@gmail.com", "phone": ""}} + external_send_request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, # 在调用父类的send_request中，会将self.message_detail赋值给response_data 然后返回 + } + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch("api.cmsi.default.SendMail.send_request", mock.Mock(return_value=external_send_request_response)): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {"jiananzhang_bkci1@tai": "user not exists"}, + } + + def test_external_users_none_exist(self): + """一个外部用户 不存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai", + "title": "this is title", + "content": "this is content", + } + + external_receiver_info = {} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {"jiananzhang_bkci@tai": "user not exists"}, + } + + def test_external_users_email_none_exist(self): + """一个外部用户邮箱不存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai", + "title": "this is title", + "content": "this is content", + } + + external_receiver_info = {"jiananzhang_bkci@tai": {"email": "", "phone": ""}} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {"jiananzhang_bkci@tai": "user email not exists"}, + } + + # 以下为一个内部用户+一个外部用户的情况 + def test_all_exist(self): + """内外部用户都存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai,jiananzhang_bkci", + "title": "this is title", + "content": "this is content", + } + + internal_send_request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + external_send_request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + external_receiver_info = {"jiananzhang_bkci@tai": {"email": "jiananzhang00@gmail.com", "phone": ""}} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch( + "api.cmsi.default.SendMail.send_request", + mock.Mock(side_effect=[internal_send_request_response, external_send_request_response]), + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + + def test_only_external_user_none_exist(self): + """内部用户存在，外部用户不存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai,jiananzhang_bkci", + "title": "this is title", + "content": "this is content", + } + + internal_send_request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + + external_receiver_info = {} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch( + "api.cmsi.default.SendMail.send_request", mock.Mock(side_effect=[internal_send_request_response]) + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {"jiananzhang_bkci@tai": "user not exists"}, + } + + def test_internal_user_error(self): + """内部用户报错，外部用户存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai,jiananzhang_bkci", + "title": "this is title", + "content": "this is content", + } + + internal_send_request_response = { + "username_check": {"invalid": ["jiananzhang_bkci"]}, + "message": "发送失败", + "message_detail": {}, + } + external_send_request_response = { + "username_check": {"invalid": []}, + "message": "发送成功", + "message_detail": {}, + } + external_receiver_info = {"jiananzhang_bkci@tai": {"email": "jiananzhang00@gmail.com", "phone": ""}} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch( + "api.cmsi.default.SendMail.send_request", + mock.Mock(side_effect=[internal_send_request_response, external_send_request_response]), + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": ["jiananzhang_bkci"]}, + "message": "发送失败", + "message_detail": {}, + } + + def test_all_users_none_exist(self): + """内部用户报错，外部用户不存在""" + validated_request_data = { + "receiver__username": "jiananzhang_bkci@tai,jiananzhang_bkci", + "title": "this is title", + "content": "this is content", + } + + internal_send_request_response = { + "username_check": {"invalid": ["jiananzhang_bkci"]}, + "message": "发送失败", + "message_detail": {}, + } + + external_receiver_info = {} + with mock.patch( + "api.cmsi.default.SendMail.get_external_receiver_info", mock.Mock(return_value=external_receiver_info) + ), mock.patch( + "api.cmsi.default.SendMail.send_request", mock.Mock(side_effect=[internal_send_request_response]) + ): + assert SendMail()(validated_request_data) == { + "username_check": {"invalid": ["jiananzhang_bkci"]}, + "message": "发送失败", + "message_detail": {"jiananzhang_bkci@tai": "user not exists"}, + } From da14140ec9aad59e111b722a097f69ce5442d644 Mon Sep 17 00:00:00 2001 From: WuFantaotao <88392262+WuFantaotao@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:14:03 +0800 Subject: [PATCH 13/41] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B0=83=E7=94=A8ApmApplication.get=5Fapplication?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E7=B1=BB=20--bug=3D137081071=20(#47?= =?UTF-8?q?84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/apm/core/discover/base.py | 8 +++- .../apm/core/handlers/discover_handler.py | 7 +++- bkmonitor/apm/models/topo.py | 6 ++- bkmonitor/apm/resources.py | 42 ++++++++++++------- 4 files changed, 44 insertions(+), 19 deletions(-) diff --git a/bkmonitor/apm/core/discover/base.py b/bkmonitor/apm/core/discover/base.py index 450cf7653b..a8c9c63258 100644 --- a/bkmonitor/apm/core/discover/base.py +++ b/bkmonitor/apm/core/discover/base.py @@ -19,6 +19,7 @@ from typing import List, NamedTuple, Tuple, Union from django.conf import settings +from django.utils.translation import gettext_lazy as _ from opentelemetry.semconv.resource import ResourceAttributes from apm import constants @@ -28,6 +29,7 @@ from apm.utils.es_search import limits from bkmonitor.utils.thread_backend import ThreadPool from constants.apm import OtlpKey, SpanKind, TelemetryDataType +from core.drf_resource.exceptions import CustomException logger = logging.getLogger("apm") @@ -127,7 +129,10 @@ def __init__(self, bk_biz_id, app_name): @property def application(self): - return ApmApplication.get_application(self.bk_biz_id, self.app_name) + app = ApmApplication.objects.filter(bk_biz_id=self.bk_biz_id, app_name=self.app_name).first() + if not app: + raise CustomException(_("业务下的应用: {} 不存在").format(self.app_name)) + return app def _get_key_pair(self, key: str): pair = key.split(".", 1) @@ -146,7 +151,6 @@ def get_rules(self, _type=DiscoverRuleType.CATEGORY.value): other_rules = [] for rule in rule_instances: - # [!!!] predicate_key 可能为单个也可能为多个 # 注意这里类型可能是 string 或者 list # 目前只有 k8s 规则存在多个 diff --git a/bkmonitor/apm/core/handlers/discover_handler.py b/bkmonitor/apm/core/handlers/discover_handler.py index 789a68bc20..134cd85505 100644 --- a/bkmonitor/apm/core/handlers/discover_handler.py +++ b/bkmonitor/apm/core/handlers/discover_handler.py @@ -11,8 +11,10 @@ import datetime import pytz +from django.utils.translation import gettext_lazy as _ from apm.models import ApmApplication, HostInstance +from core.drf_resource.exceptions import CustomException class DiscoverHandler: @@ -33,8 +35,9 @@ def get_host_instance(cls, bk_biz_id, ip, bk_cloud_id): @classmethod def get_app_retention(cls, bk_biz_id, app_name): - - app = ApmApplication.get_application(bk_biz_id, app_name) + app = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not app: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) return app.trace_datasource.retention @classmethod diff --git a/bkmonitor/apm/models/topo.py b/bkmonitor/apm/models/topo.py index e10c8d86b9..7a6a390617 100644 --- a/bkmonitor/apm/models/topo.py +++ b/bkmonitor/apm/models/topo.py @@ -11,11 +11,13 @@ import datetime from django.db import models +from django.utils.translation import gettext_lazy as _ from apm.constants import DiscoverRuleType from bkmonitor.utils.cache import CacheType, using_cache from bkmonitor.utils.db import JsonField from constants.apm import SpanKind +from core.drf_resource.exceptions import CustomException class TopoBase(models.Model): @@ -37,7 +39,9 @@ class Meta: def clear_expired(cls, bk_biz_id, app_name): from apm.models import ApmApplication - application = ApmApplication.get_application(bk_biz_id, app_name) + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) last = datetime.datetime.now() - datetime.timedelta(application.trace_datasource.retention) filter_params = { "bk_biz_id": bk_biz_id, diff --git a/bkmonitor/apm/resources.py b/bkmonitor/apm/resources.py index ee8687e5a2..901623e993 100644 --- a/bkmonitor/apm/resources.py +++ b/bkmonitor/apm/resources.py @@ -72,6 +72,7 @@ TraceWaterFallDisplayKey, ) from core.drf_resource import Resource, api +from core.drf_resource.exceptions import CustomException from metadata import models from metadata.models import DataSource @@ -383,7 +384,9 @@ def perform_request(self, validated_request_data): bk_biz_id = validated_request_data["bk_biz_id"] app_name = validated_request_data["app_name"] - ApmApplication.get_application(bk_biz_id, app_name) + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) service_configs = validated_request_data.get("service_configs", []) instance_configs = validated_request_data.get("instance_configs", []) @@ -505,7 +508,9 @@ def perform_request(self, validated_request_data): bk_biz_id = validated_request_data["bk_biz_id"] app_name = validated_request_data["app_name"] - ApmApplication.get_application(bk_biz_id, app_name) + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) service_configs = validated_request_data.get("service_configs", []) instance_configs = validated_request_data.get("instance_configs", []) @@ -824,9 +829,12 @@ class RequestSerializer(serializers.Serializer): group_keys = serializers.ListField(required=False, label="聚和字段", default=[]) def perform_request(self, validated_request_data): - application = ApmApplication.get_application( - bk_biz_id=validated_request_data["bk_biz_id"], app_name=validated_request_data["app_name"] - ) + bk_biz_id = validated_request_data["bk_biz_id"] + app_name = validated_request_data["app_name"] + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) + param = { "start_time": validated_request_data["start_time"], "end_time": validated_request_data["end_time"], @@ -897,9 +905,11 @@ class RequestSerializer(serializers.Serializer): category = serializers.CharField(required=False, label="类别") def perform_request(self, validated_request_data): - application = ApmApplication.get_application( - bk_biz_id=validated_request_data["bk_biz_id"], app_name=validated_request_data["app_name"] - ) + bk_biz_id = validated_request_data["bk_biz_id"] + app_name = validated_request_data["app_name"] + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) return application.trace_datasource.query_event( start_time=validated_request_data["start_time"], @@ -1069,9 +1079,11 @@ class RequestSerializer(serializers.Serializer): app_name = serializers.CharField(label="应用名称", max_length=50) def perform_request(self, validated_request_data): - application = ApmApplication.get_application( - bk_biz_id=validated_request_data["bk_biz_id"], app_name=validated_request_data["app_name"] - ) + bk_biz_id = validated_request_data["bk_biz_id"] + app_name = validated_request_data["app_name"] + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) return application.trace_datasource.fields() @@ -1082,9 +1094,11 @@ class RequestSerializer(serializers.Serializer): field_list = serializers.ListField(label="字段列表") def perform_request(self, validated_request_data): - application = ApmApplication.get_application( - bk_biz_id=validated_request_data["bk_biz_id"], app_name=validated_request_data["app_name"] - ) + bk_biz_id = validated_request_data["bk_biz_id"] + app_name = validated_request_data["app_name"] + application = ApmApplication.objects.filter(bk_biz_id=bk_biz_id, app_name=app_name).first() + if not application: + raise CustomException(_("业务下的应用: {} 不存在").format(app_name)) return application.metric_datasource.update_fields(validated_request_data["field_list"]) From 7d8d0f76b2a038d7706018f4d3644c726d30385b Mon Sep 17 00:00:00 2001 From: WuFantaotao <88392262+WuFantaotao@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:15:03 +0800 Subject: [PATCH 14/41] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3topo=5Fhandler.d?= =?UTF-8?q?iscover()=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20--bug=3D1370789?= =?UTF-8?q?03=20(#4783)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/apm/core/discover/base.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bkmonitor/apm/core/discover/base.py b/bkmonitor/apm/core/discover/base.py index a8c9c63258..bb9c7e4306 100644 --- a/bkmonitor/apm/core/discover/base.py +++ b/bkmonitor/apm/core/discover/base.py @@ -397,7 +397,14 @@ def discover(self): trace_id_count = 0 span_count = 0 filter_span_count = 0 - max_result_count, per_trace_size, index_name = self._get_trace_task_splits() + try: + max_result_count, per_trace_size, index_name = self._get_trace_task_splits() + except Exception as e: + logger.error( + f"[TopoHandler] 业务id: {self.bk_biz_id}和应用名: {self.app_name}" + f"构建的TopoHandler对象在discover方法内发生异常, error({e})" + ) + return for round_index, trace_ids in enumerate(self.list_trace_ids(index_name)): if not trace_ids: From 18e795bfb56d5e5659029c43ed6856786c317ff0 Mon Sep 17 00:00:00 2001 From: goodGai <106252008+goodGai@users.noreply.github.com> Date: Fri, 17 Jan 2025 20:44:35 +0800 Subject: [PATCH 15/41] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4=20(#4866?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 国际化相关问题调整 2. 业务选择器组件调整 --- .../monitor-pc/components/biz-select/list.tsx | 44 +++++++------- .../webpack/src/monitor-pc/lang/new-home.ts | 8 +-- .../webpack/src/monitor-pc/lang/route.ts | 1 + .../components/add-alarm-chart-dialog.tsx | 4 +- .../components/header-setting-modal.scss | 1 - .../new-home/components/home-biz-list.tsx | 60 ++----------------- .../new-home/components/quick-access.scss | 2 + .../components/recent-alarm-events.tsx | 4 +- .../components/recent-favorites-list.scss | 9 ++- .../components/recent-favorites-list.tsx | 2 +- .../components/recent-favorites-tab.scss | 6 +- .../components/recent-favorites-tab.tsx | 14 ++--- 12 files changed, 60 insertions(+), 95 deletions(-) diff --git a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx index 3d93556d68..8d6b2892ca 100644 --- a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx +++ b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx @@ -26,10 +26,9 @@ import { Component, Emit, Prop, Mixins } from 'vue-property-decorator'; import { Component as tsc } from 'vue-tsx-support'; -import store from '../../store/store'; - import { SPACE_TYPE_MAP } from '../../common/constant'; import UserConfigMixin from '../../mixins/userStoreConfig'; +import store from '../../store/store'; import type { ThemeType } from './biz-select'; @@ -39,6 +38,7 @@ interface IProps { list: IListItem[]; checked?: number; theme?: ThemeType; + canSetDefaultSpace?: boolean; } interface IEvents { onSelected: number; @@ -72,6 +72,8 @@ const DEFAULT_BIZ_ID = 'DEFAULT_BIZ_ID'; export default class List extends Mixins(UserConfigMixin, tsc) { /** 选中的id */ @Prop({ type: Number }) checked: number; + /** 可设置默认空间 */ + @Prop({ default: true, type: Boolean }) canSetDefaultSpace: boolean; /** 列表数据 */ @Prop({ default: () => [], type: Array }) list: IListItem[]; /** 主题 */ @@ -171,7 +173,7 @@ export default class List extends Mixins(UserConfigMixin, tsc) > ({child.space_type_id === ETagsType.BKCC ? `#${child.id}` : child.space_id || child.space_code}) - {this.defaultBizId && Number(this.defaultBizId) === child.id && ( + {this.canSetDefaultSpace && this.defaultBizId && Number(this.defaultBizId) === child.id && ( {this.$tc('默认')} @@ -190,23 +192,25 @@ export default class List extends Mixins(UserConfigMixin, tsc) ))} )} -
    - {this.defaultBizId && Number(this.defaultBizId) === child.id ? ( -
    this.handleDefaultBizIdDialog(e, child, false)} - > - {this.$tc('取消默认')} -
    - ) : ( -
    this.handleDefaultBizIdDialog(e, child, true)} - > - {this.$tc('设为默认')} -
    - )} -
    + {this.canSetDefaultSpace && ( +
    + {this.defaultBizId && Number(this.defaultBizId) === child.id ? ( +
    this.handleDefaultBizIdDialog(e, child, false)} + > + {this.$tc('取消默认')} +
    + ) : ( +
    this.handleDefaultBizIdDialog(e, child, true)} + > + {this.$tc('设为默认')} +
    + )} +
    + )} ))} diff --git a/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts b/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts index 1031c0ddc8..233700abf0 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/new-home.ts @@ -28,7 +28,7 @@ export default { // 规范： 动词-主体-结果 如 新建应用成功 New application successful // 规范： 仅首字母大写 容器服务: 'Container service', - 日志检索: 'Log retrieval', + 日志检索: 'Logs', 关联的告警: 'Related Alarms', 关联的屏蔽策略: 'Associated blocking policy', '有问题就问 AI 小鲸': 'If you have any questions, ask Xiaojing', @@ -38,10 +38,10 @@ export default { 暂无快捷入口: 'No quick entry', 快捷入口管理: 'Quick entry management', 最近告警事件: 'Recent warning events', - '业务：{0}': 'Business: {0}', + '业务：{0}': 'Space: {0}', '删除后，该tab下的视图也会一起删除': 'After deletion, the views under the tab will also be deleted.', '确定删除该视图？': 'Are you sure you want to delete this view?', - '确定删除该业务视图？': 'Are you sure you want to delete this business view?', + '确定删除该业务视图？': 'Are you sure you want to delete this space view?', 新增图表: 'New charts', 修改图表: 'Modify chart', 图表名称: 'Chart name', @@ -51,7 +51,7 @@ export default { '请输入图表名称，默认为策略名称': 'Please enter a chart name, the default is the strategy name', '当前还未配置业务，快点击添加业务按钮新增图表': 'There is no service configured yet. Click the Add Service button to add a new chart.', - 删除该业务: 'Delete this business', + 删除该业务: 'Delete this space', 添加业务: 'Add a service', '请输入 IP / Trace ID / 容器集群 / 告警ID / 策略名 进行搜索': 'Please enter IP / Trace ID / container cluster / alarm ID / policy name to search', diff --git a/bkmonitor/webpack/src/monitor-pc/lang/route.ts b/bkmonitor/webpack/src/monitor-pc/lang/route.ts index c547739dc9..3c304689cc 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/route.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/route.ts @@ -33,6 +33,7 @@ export default { 'route-告警事件': 'Alarms', 'route-指标检索': 'Metrics', 'route-日志检索': 'Logs', + 'route-服务': 'Apm service', 'route-事件检索': 'Events', 'route-Tracing 检索': 'Traces', 'route-综合拨测': 'Synthetics', diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx index b5a7513e60..65ad082873 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/add-alarm-chart-dialog.tsx @@ -342,7 +342,9 @@ export default class AddAlarmChartDialog extends tsc
    - {this.getStrategyStatus(item.is_deleted, item.shield_info?.is_shielded, item.is_enabled)} + {this.$tc( + this.getStrategyStatus(item.is_deleted, item.shield_info?.is_shielded, item.is_enabled) + )} {this.isSelected(item.id) && }
    diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss index d6518bf718..9d43232151 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/header-setting-modal.scss @@ -163,7 +163,6 @@ background-color: white; .content-header { - width: 120px; height: 28px; font-family: MicrosoftYaHei; font-size: 20px; diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx index 88887fda10..f0b04b870e 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx @@ -39,29 +39,14 @@ import './home-biz-list.scss'; /** 业务组件常用的业务缓存key */ const BIZ_SELECTOR_COMMON_IDS = 'BIZ_SELECTOR_COMMON_IDS'; -/** 业务组件常用业务缓存最大个数 */ -const BIZ_SELECTOR_COMMON_MAX = 5; -const BIZ_COLOR_LIST = [ - '#7250A9', - '#3563BE', - '#3799BA', - '#4FB17F', - '#86AF4A', - '#E9AE1D', - '#EB9258', - '#D36C68', - '#BC4FB3', -]; interface IProps { zIndex?: number; bizList: ISpaceItem[]; - isShrink?: boolean; theme?: ThemeType; minWidth?: number; stickyList?: string[]; isShowCommon?: boolean; - canAddBusiness?: boolean; } export type ThemeType = 'dark' | 'light'; interface IEvents { @@ -75,12 +60,10 @@ interface IEvents { @Component export default class HomeBizSelect extends tsc { @Prop({ default: () => [], type: Array }) bizList: ISpaceItem[]; - @Prop({ default: false, type: Boolean }) isShrink: boolean; @Prop({ default: true, type: Boolean }) isShowCommon: boolean; @Prop({ default: null, type: Number }) zIndex: number; @Prop({ default: 200, type: Number }) minWidth: number; @Prop({ default: () => [], type: Array }) stickyList: string[]; - @Prop({ default: true, type: Boolean }) canAddBusiness: boolean; @Prop({ default: 'light', type: String, @@ -91,7 +74,6 @@ export default class HomeBizSelect extends tsc { @Ref() homePopoverRef: any; @Ref('typeList') typeListRef: HTMLDivElement; - localValue: number = null; showBizList = false; keyword = ''; @@ -101,7 +83,6 @@ export default class HomeBizSelect extends tsc { commonListIds: number[] = []; spaceTypeIdList: { id: string; name: string; styles: any }[] = []; searchTypeId = ''; - bizBgColor = ''; bizListFilter = []; @@ -112,11 +93,11 @@ export default class HomeBizSelect extends tsc { limit: number; data: IListItem[]; } = { - current: 1, - count: 0, - limit: 20, - data: [], - }; + current: 1, + count: 0, + limit: 20, + data: [], + }; typeWrapInfo = { showBtn: false, @@ -127,7 +108,6 @@ export default class HomeBizSelect extends tsc { firstCodeBgColor = ''; created() { - this.bizBgColor = this.$store.getters.bizBgColor || this.getRandomColor(); const spaceTypeMap: Record = {}; for (const item of this.bizList) { spaceTypeMap[item.space_type_id] = 1; @@ -156,7 +136,6 @@ export default class HomeBizSelect extends tsc { @Emit('change') handleBizChange(id: number) { this.homePopoverRef.instance.hide(); - this.handleCacheBizId(id); return id; } @@ -296,29 +275,6 @@ export default class HomeBizSelect extends tsc { } } - getRandomColor() { - const color = BIZ_COLOR_LIST[Math.floor(Math.random() * BIZ_COLOR_LIST.length)]; - this.$store.commit('app/SET_BIZ_BGCOLOR', color); - return color; - } - - handleCacheBizId(id: number) { - const leng = this.commonListIds.length; - const isExist = this.commonListIds.includes(id); - let newIds = [...this.commonListIds]; - if (isExist) { - newIds = newIds.filter(item => item !== id); - newIds.unshift(id); - } else { - newIds.unshift(id); - if (leng >= BIZ_SELECTOR_COMMON_MAX) { - newIds.length = BIZ_SELECTOR_COMMON_MAX; - } - } - this.commonListIds = newIds; - this.storage.set(BIZ_SELECTOR_COMMON_IDS, this.commonListIds); - } - handleSetListWidth() { this.bizListFilter = this.getBizListFilter(); const react = this.$el.getBoundingClientRect(); @@ -335,10 +291,6 @@ export default class HomeBizSelect extends tsc { this.typeListWrapNextPreShowChange(); } - handleOpenSpaceManager() { - this.handleSearchBlur(); - } - handleSearchBlur() { setTimeout(() => { const popover = this.homePopoverRef; @@ -501,7 +453,7 @@ export default class HomeBizSelect extends tsc { onScroll={this.handleScroll} > { let detail = this.$t('业务：{0}', { 0: this.businessTab.filter(item => item.bk_biz_id === this.currentDelId)[0]?.bk_biz_name, }); + let width = 680; let tips = this.$t('删除后，该tab下的视图也会一起删除'); let info = this.$t('确定删除该业务视图？'); let handleDelFunction = this.delTaskByIndex; @@ -350,11 +351,12 @@ export default class RecentAlarmEvents extends tsc { info = this.$t('确定删除该视图？'); this.alarmGraphBizId = this.activeTabId; this.isAppendMode = true; + width = 580; handleDelFunction = this.handleSaveAlarmGraphConfig; } return ( ) : ( )} - {EFunctionNameType[functionName]} + {this.$tc(`route-${EFunctionNameType[functionName]}`)} {/* 更多 */} ) : ( diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss index 1cdf6c9dfe..c7ae571348 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.scss @@ -79,15 +79,15 @@ /* 通过传递参数来动态控制每个 div 的宽度 */ .single-col .category { - min-width: 100%; + width: 100%; } .double-col .category { - min-width: 50%; + width: 50%; } .triple-col .category { - min-width: 32%; + width: 32%; } .has-line { diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx index 0f57f25f3a..0fc528b226 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-tab.tsx @@ -40,12 +40,12 @@ import './recent-favorites-tab.scss'; // 模块名称映射 const modeNameMap = { - [window.i18n.tc('仪表盘')]: 'dashboard', - [window.i18n.tc('服务')]: 'apm_service', - [window.i18n.tc('日志检索')]: 'log_retrieve', - [window.i18n.tc('服务拨测')]: '-', - [window.i18n.tc('主机监控')]: '-', - [window.i18n.tc('容器服务')]: '-', + 仪表盘: 'dashboard', + 服务: 'apm_service', + 日志检索: 'log_retrieve', + 服务拨测: '-', + 主机监控: '-', + 容器服务: '-', }; interface Category { @@ -195,7 +195,7 @@ export default class RecentFavoritesTab extends Mixins(UserConfigMixin) { } value={modeNameMap[item.name]} > - {item.name} + {this.$tc(item.name)} From 0b4169197c6a638c1c17d05b6de9efda135f5032 Mon Sep 17 00:00:00 2001 From: NeoLing Date: Mon, 20 Jan 2025 10:18:04 +0800 Subject: [PATCH 16/41] =?UTF-8?q?perf:=20error=5Flist=E4=BC=98=E5=8C=96,?= =?UTF-8?q?=20es=E6=9F=A5=E8=AF=A2=E7=B4=A2=E5=BC=95=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20(#4826)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bkmonitor/apm/utils/es_search.py | 134 +++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/bkmonitor/apm/utils/es_search.py b/bkmonitor/apm/utils/es_search.py index 3005372905..53612d5104 100644 --- a/bkmonitor/apm/utils/es_search.py +++ b/bkmonitor/apm/utils/es_search.py @@ -8,13 +8,18 @@ an "AS IS" BASIS, 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. """ +import re import time from functools import wraps from threading import Semaphore +from typing import Any, List +import arrow +from dateutil.rrule import DAILY, MONTHLY, rrule from elasticsearch.helpers.errors import ScanError from elasticsearch_dsl import Search from elasticsearch_dsl.connections import get_connection +from elasticsearch_dsl.search import ProxyDescriptor, QueryProxy from common.log import logger @@ -80,7 +85,39 @@ def _scan( ) +class EsQueryProxy(QueryProxy): + def __call__(self, *args, **kwargs): + filters = kwargs.get("filter", []) + if filters: + for _filter in filters: + if hasattr(_filter, "end_time"): + gt_time = getattr(_filter.end_time, "gt", None) or getattr(_filter.end_time, "gte", None) + lt_time = getattr(_filter.end_time, "lt", None) or getattr(_filter.end_time, "lte", None) + optimizer = QueryIndexOptimizer( + indices=self._search._index, + start_timestamp=gt_time, + end_timestamp=lt_time, + use_time_range=bool(gt_time), + ) + self._search.fix_index(optimizer.index) + break + s = super().__call__(*args, **kwargs) + return s + + class EsSearch(Search): + query = ProxyDescriptor("es_query") + post_filter = ProxyDescriptor("es_post_filter") + + def __init__(self, **kwargs): + super().__init__(**kwargs) + self._es_query_proxy = EsQueryProxy(self, "query") + self._es_post_filter_proxy = EsQueryProxy(self, "post_filter") + + def fix_index(self, indices: List[str]): + if indices: + self._index = indices + def scan(self): es = get_connection(self._using) @@ -116,3 +153,100 @@ def wrapper(*args, **kwargs): def limits(calls, period): return RateLimiter(calls, period) + + +class QueryIndexOptimizer(object): + def __init__( + self, + indices: list, + start_timestamp: int = None, + end_timestamp: int = None, + time_zone: str = "GMT", + use_time_range: bool = True, + ): + self._index: str = "" + if not indices or use_time_range is False: + return + + start_time = arrow.get(int(start_timestamp / 1000000)) if start_timestamp else None + end_time = arrow.get(int(end_timestamp / 1000000)) if end_timestamp else None + filtered_indices = self.index_filter(indices, start_time, end_time, time_zone) + + if filtered_indices: + self._index = ",".join(filtered_indices) + + @property + def index(self): + return [self._index] if self._index else None + + def index_filter(self, indices, start_time: arrow.Arrow, end_time: arrow.Arrow, time_zone: str) -> List[str]: + # BkData索引集优化 + indices_list = set() + for indices_str in indices: + for _index in indices_str.split(","): + indices_list.add(_index) + index_filters = self.index_time_filters(start_time, end_time, time_zone) + final_index_list = [_index for _index in indices_list if self.check_index_date(_index, index_filters)] + return final_index_list + + def index_time_filters(self, date_start: arrow.Arrow, date_end: arrow.Arrow, time_zone: str): + now = arrow.now(time_zone) + date_start = date_start.to(time_zone) + date_end = date_end.to(time_zone) if date_end else now + if date_end > now: + date_end = now + + date_day_list: List[Any] = list( + rrule(DAILY, interval=1, dtstart=date_start.floor("day").datetime, until=date_end.ceil("day").datetime) + ) + + date_month_list: List[Any] = list( + rrule( + MONTHLY, interval=1, dtstart=date_start.floor("month").datetime, until=date_end.ceil("month").datetime + ) + ) + + return self._generate_filter_list(date_day_list, date_month_list) + + @classmethod + def _generate_filter_list(cls, date_day_list, date_month_list): + date_filter_template = r"^.*_bkapm_trace_.+_{}_\d+$" + month_filter_template = r"^.*_bkapm_trace_.+_{}.*_\d+$" + + filter_mapping = {} + if len(date_day_list) == 1: + for x in date_day_list: + pattern = date_filter_template.format(x.strftime("%Y%m%d")) + if pattern not in filter_mapping: + filter_mapping[pattern] = re.compile(pattern) + elif len(date_day_list) > 1 and len(date_month_list) == 1: + if len(date_day_list) > 14: + for x in date_month_list: + pattern = month_filter_template.format(x.strftime("%Y%m")) + if pattern not in filter_mapping: + filter_mapping[pattern] = re.compile(pattern) + else: + for x in date_day_list: + pattern = date_filter_template.format(x.strftime("%Y%m%d")) + if pattern not in filter_mapping: + filter_mapping[pattern] = re.compile(pattern) + elif len(date_day_list) > 1 and len(date_month_list) > 1: + if len(date_month_list) <= 6: + for x in date_month_list: + pattern = month_filter_template.format(x.strftime("%Y%m")) + if pattern not in filter_mapping: + filter_mapping[pattern] = re.compile(pattern) + else: + for x in date_month_list[-6::1]: + pattern = month_filter_template.format(x.strftime("%Y%m")) + if pattern not in filter_mapping: + filter_mapping[pattern] = re.compile(pattern) + return list(filter_mapping.values()) + + @classmethod + def check_index_date(cls, index, index_filters): + # 从索引名称中提取日期部分 + for filter_pattern in index_filters: + if filter_pattern.match(index): + return True + return False From 4fd6b816cd3f82bc9728b6210863b9079fa2b7ab Mon Sep 17 00:00:00 2001 From: yzygyin <168320989+yzygyin@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:50:27 +0800 Subject: [PATCH 17/41] =?UTF-8?q?fix:=20=E3=80=90=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E3=80=91=E5=9B=BE=E8=A1=A8=E5=88=97=E6=B2=A1=E6=9C=89=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=BC=93=E5=AD=98=E7=9A=84=E5=88=97=E6=95=B0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=20--bug=3D137315225=20(#4868)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/monitor-k8s/components/common-page-new.tsx | 3 ++- .../pages/monitor-k8s/components/common-page.tsx | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-page-new.tsx b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-page-new.tsx index dfb04780fa..d6b1c4bdb7 100644 --- a/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-page-new.tsx +++ b/bkmonitor/webpack/src/monitor-pc/pages/monitor-k8s/components/common-page-new.tsx @@ -631,7 +631,8 @@ export default class CommonPageNew extends tsc async initData() { this.localSceneType = this.sceneType; this.loading = true; - this.columns = +localStorage.getItem(DASHBOARD_PANEL_COLUMN_KEY) || 2; + const storedValue = localStorage.getItem(DASHBOARD_PANEL_COLUMN_KEY); + this.columns = storedValue === '0' ? 0 : +storedValue || 2; this.filtersReady = false; this.selectorReady = false; await this.$nextTick(); @@ -1141,9 +1142,11 @@ export default class CommonPage extends tsc /** 变量数据请求完毕 */ handleFilterVarDataReady(list: FilterDictType[]) { /** 统计filter参与过滤的数量 */ - this.filterCount = list.reduce((len, cur) => { - Object.entries(cur).every(item => (Array.isArray(item[1]) ? !!item[1].length : item[1] !== '')) && (len += 1); - return len; + this.filterCount = list.reduce((accumulator, cur) => { + const allPropertiesValid = Object.entries(cur).every(([, value]) => + Array.isArray(value) ? value.length > 0 : value !== '' + ); + return allPropertiesValid ? accumulator + 1 : accumulator; }, 0); this.variables = this.handleGetVariables(list); this.handleUpdateViewOptions(); From 998baeeba12b71db47a67db1cd12c773c770ddbc Mon Sep 17 00:00:00 2001 From: EmilyMei <447693773@qq.com> Date: Mon, 20 Jan 2025 15:29:05 +0800 Subject: [PATCH 18/41] =?UTF-8?q?feat:=20=E6=95=85=E9=9A=9C=E5=88=86?= =?UTF-8?q?=E6=9E=90=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20(#4871)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webpack/src/monitor-pc/lang/content.ts | 2 + .../failure-handle/filter-search-main.tsx | 22 ++++----- .../failure/failure-tags/failure-tags.tsx | 5 +- .../failure-topo/failure-topo-tooltips.tsx | 16 +++++-- .../charts/failure-chart/TagDisplay.tsx | 47 +++++++++++++++++-- .../charts/failure-chart/failure-chart.scss | 3 ++ .../charts/failure-chart/failure-chart.tsx | 24 +++------- 7 files changed, 78 insertions(+), 41 deletions(-) diff --git a/bkmonitor/webpack/src/monitor-pc/lang/content.ts b/bkmonitor/webpack/src/monitor-pc/lang/content.ts index d192efba2f..735b1fe67a 100644 --- a/bkmonitor/webpack/src/monitor-pc/lang/content.ts +++ b/bkmonitor/webpack/src/monitor-pc/lang/content.ts @@ -288,4 +288,6 @@ export default { '关联日志方法：\n1. 开启应用的日志上报开关，开启后会自动关联对应的索引集\n2. 在服务配置 - 关联日志出关联对应索引集\n3. 在 Span 中增加 IP 地址，将会自动关联此主机对应的采集项': 'Associated log method:\n1. Turn on the log reporting switch of the application, which will automatically associate the corresponding index set\n2. In service configuration - associate log out and associate the corresponding index set\n3. Add IP address in Span, will automatically associate the corresponding collection item of this host', 暂不支持: 'Not supported yet', + 在拓扑图中高亮该节点: 'Highlight the node in the topology map', + '点击前往：主机详情页/服务详情页': 'Click to go to: Host details page/Service details page', }; diff --git a/bkmonitor/webpack/src/trace/pages/failure/failure-handle/filter-search-main.tsx b/bkmonitor/webpack/src/trace/pages/failure/failure-handle/filter-search-main.tsx index 7cf94da804..f7b6f4e4c3 100644 --- a/bkmonitor/webpack/src/trace/pages/failure/failure-handle/filter-search-main.tsx +++ b/bkmonitor/webpack/src/trace/pages/failure/failure-handle/filter-search-main.tsx @@ -86,7 +86,7 @@ export default defineComponent({ const inputStatus = ref('success'); const isErr = ref(false); const selectRef = ref(); - const trigger = ref('default') + const trigger = ref('default'); const handleBiz = (data: any) => { const list = JSON.parse(JSON.stringify(spaceFilter.value)); spaceFilter.value.push(data.bk_biz_id); @@ -103,7 +103,7 @@ export default defineComponent({ ); watch( () => isErr.value, - (val) => { + val => { trigger.value = val ? 'manual' : 'default'; } ); @@ -122,7 +122,7 @@ export default defineComponent({ const list = (window.space_list || []).filter(item => currentBizList.value.includes(item.bk_biz_id)); return getSpaceList(list || []); }); - const changeSpace = (space: string) => { + const changeSpace = (space: string) => { isErr.value = !space.length; emit('changeSpace', space, isErr.value); }; @@ -140,6 +140,7 @@ export default defineComponent({ tags, isCheck: false, show: true, + spaceName: `${item.name} (#${item.bk_biz_id})`, }; list.push(newItem); }); @@ -189,7 +190,7 @@ export default defineComponent({ inputStatus, isErr, selectRef, - trigger + trigger, }; }, render() { @@ -197,12 +198,9 @@ export default defineComponent({