diff --git a/web/config/router.config.js b/web/config/router.config.js index faf8c20d..e70f7d7c 100644 --- a/web/config/router.config.js +++ b/web/config/router.config.js @@ -138,20 +138,12 @@ export default [ routes: [ { path: '/search/template', - redirect: '/search/template/summary', - }, - { - path: '/search/template/summary', - component: './SearchManage/template/Summary', + redirect: '/search/template/template', }, { path: '/search/template/template', component: './SearchManage/template/SearchTemplate', }, - { - path: '/search/template/param', - component: './SearchManage/template/Param', - }, { path: '/search/template/history', component: './SearchManage/template/History', @@ -170,10 +162,6 @@ export default [ path: '/search/alias/index', component: './SearchManage/alias/AliasManage', }, - { - path: '/search/alias/param', - component: './SearchManage/alias/Param', - }, { path: '/search/alias/rule', component: './SearchManage/alias/Rule', @@ -215,33 +203,33 @@ export default [ component: './SearchManage/analyzer/AnalyzerTest', } ] - }, { - path: '/search/nlp', - name: 'nlp', - component: './SearchManage/nlp/NLP', - routes: [ - { - path: '/search/nlp', - redirect: '/search/nlp/query', - }, - { - path: '/search/nlp/query', - component: './SearchManage/nlp/Query', - }, - { - path: '/search/nlp/intention', - component: './SearchManage/nlp/Intention', - }, - { - path: '/search/nlp/knowledge', - component: './SearchManage/nlp/Knowledge', - }, - { - path: '/search/nlp/text', - component: './SearchManage/nlp/Text', - } - ] - }, + }//, { + // path: '/search/nlp', + // name: 'nlp', + // component: './SearchManage/nlp/NLP', + // routes: [ + // { + // path: '/search/nlp', + // redirect: '/search/nlp/query', + // }, + // { + // path: '/search/nlp/query', + // component: './SearchManage/nlp/Query', + // }, + // { + // path: '/search/nlp/intention', + // component: './SearchManage/nlp/Intention', + // }, + // { + // path: '/search/nlp/knowledge', + // component: './SearchManage/nlp/Knowledge', + // }, + // { + // path: '/search/nlp/text', + // component: './SearchManage/nlp/Text', + // } + //] + //}, ] }, diff --git a/web/src/pages/SearchManage/alias/AliasManage.js b/web/src/pages/SearchManage/alias/AliasManage.js index c35f98e5..2940dddf 100644 --- a/web/src/pages/SearchManage/alias/AliasManage.js +++ b/web/src/pages/SearchManage/alias/AliasManage.js @@ -110,13 +110,174 @@ class AliasManage extends PureComponent { formValues: {}, updateFormValues: {}, }; - datasource = `[{"health":"green","status":"open","index":"blogs_fixed","uuid":"Q6zngGf9QVaWqpV0lF-0nw","pri":"1","rep":"1","docs.count":"1594","docs.deleted":"594","store.size":"17.9mb","pri.store.size":"8.9mb"},{"health":"red","status":"open","index":"elastic_qa","uuid":"_qkVlQ5LRoOKffV-nFj8Uw","pri":"1","rep":"1","docs.count":null,"docs.deleted":null,"store.size":null,"pri.store.size":null},{"health":"green","status":"open","index":".kibana-event-log-7.9.0-000001","uuid":"fgTtyl62Tc6F1ddJfPwqHA","pri":"1","rep":"1","docs.count":"20","docs.deleted":"0","store.size":"25kb","pri.store.size":"12.5kb"},{"health":"green","status":"open","index":"blogs","uuid":"Mb2n4wnNQSKqSToI_QO0Yg","pri":"1","rep":"1","docs.count":"1594","docs.deleted":"0","store.size":"11mb","pri.store.size":"5.5mb"},{"health":"green","status":"open","index":".kibana-event-log-7.9.0-000002","uuid":"8GpbwnDXR2KJUsw6srLnWw","pri":"1","rep":"1","docs.count":"9","docs.deleted":"0","store.size":"96.9kb","pri.store.size":"48.4kb"},{"health":"green","status":"open","index":".apm-agent-configuration","uuid":"vIaV9k2VS-W48oUOe2xNWA","pri":"1","rep":"1","docs.count":"0","docs.deleted":"0","store.size":"416b","pri.store.size":"208b"},{"health":"green","status":"open","index":"logs_server1","uuid":"u56jv2AyR2KOkruOfxIAnA","pri":"1","rep":"1","docs.count":"5386","docs.deleted":"0","store.size":"5.1mb","pri.store.size":"2.5mb"},{"health":"green","status":"open","index":".kibana_1","uuid":"dBCrfVblRPGVlYAIlP_Duw","pri":"1","rep":"1","docs.count":"3187","docs.deleted":"50","store.size":"24.8mb","pri.store.size":"12.4mb"},{"health":"green","status":"open","index":".tasks","uuid":"3RafayGeSNiqglO2BHof9Q","pri":"1","rep":"1","docs.count":"3","docs.deleted":"0","store.size":"39.9kb","pri.store.size":"19.9kb"},{"health":"green","status":"open","index":"filebeat-7.9.0-elastic_qa","uuid":"tktSYU14S3CrsrJb0ybpSQ","pri":"1","rep":"1","docs.count":"3009880","docs.deleted":"0","store.size":"1.6gb","pri.store.size":"850.1mb"},{"health":"green","status":"open","index":"analysis_test","uuid":"6ZHEAW1ST_qfg7mo4Bva4w","pri":"1","rep":"1","docs.count":"0","docs.deleted":"0","store.size":"416b","pri.store.size":"208b"},{"health":"green","status":"open","index":".apm-custom-link","uuid":"Y4N2TeVERrGacEGwY-NPAQ","pri":"1","rep":"1","docs.count":"0","docs.deleted":"0","store.size":"416b","pri.store.size":"208b"},{"health":"green","status":"open","index":"kibana_sample_data_ecommerce","uuid":"4FIWJKhGSr6bE72R0xEQyA","pri":"1","rep":"1","docs.count":"4675","docs.deleted":"0","store.size":"9.2mb","pri.store.size":"4.6mb"},{"health":"green","status":"open","index":".kibana_task_manager_1","uuid":"9afyndU_Q26oqOiEIoqRJw","pri":"1","rep":"1","docs.count":"6","docs.deleted":"2","store.size":"378.8kb","pri.store.size":"12.5kb"},{"health":"green","status":"open","index":".async-search","uuid":"2VbJgnN7SsqC-DWN64yXUQ","pri":"1","rep":"1","docs.count":"0","docs.deleted":"0","store.size":"3.9kb","pri.store.size":"3.7kb"}]`; + datasource = `[ + { + "health": "green", + "status": "blog", + "index": "blogs_fixed", + "uuid": "Q6zngGf9QVaWqpV0lF-0nw", + "pri": "1", + "rep": "1", + "docs.count": "1594", + "docs.deleted": "594", + "store.size": "17.9mb", + "pri.store.size": "8.9mb" + }, + { + "health": "red", + "status": "elastic", + "index": "elastic_qa", + "uuid": "_qkVlQ5LRoOKffV-nFj8Uw", + "pri": "1", + "rep": "1", + "docs.count": null, + "docs.deleted": null, + "store.size": null, + "pri.store.size": null + }, + { + "health": "green", + "status": "kibana", + "index": ".kibana-event-log-7.9.0-000001", + "uuid": "fgTtyl62Tc6F1ddJfPwqHA", + "pri": "1", + "rep": "1", + "docs.count": "20", + "docs.deleted": "0", + "store.size": "25kb", + "pri.store.size": "12.5kb" + }, + { + "health": "green", + "status": "blog", + "index": "blogs", + "uuid": "Mb2n4wnNQSKqSToI_QO0Yg", + "pri": "1", + "rep": "1", + "docs.count": "1594", + "docs.deleted": "0", + "store.size": "11mb", + "pri.store.size": "5.5mb" + }, + { + "health": "green", + "status": "kibana", + "index": ".kibana-event-log-7.9.0-000002", + "uuid": "8GpbwnDXR2KJUsw6srLnWw", + "pri": "1", + "rep": "1", + "docs.count": "9", + "docs.deleted": "0", + "store.size": "96.9kb", + "pri.store.size": "48.4kb" + }, + { + "health": "green", + "status": "apm", + "index": ".apm-agent-configuration", + "uuid": "vIaV9k2VS-W48oUOe2xNWA", + "pri": "1", + "rep": "1", + "docs.count": "0", + "docs.deleted": "0", + "store.size": "416b", + "pri.store.size": "208b" + }, + { + "health": "green", + "status": "logs", + "index": "logs_server1", + "uuid": "u56jv2AyR2KOkruOfxIAnA", + "pri": "1", + "rep": "1", + "docs.count": "5386", + "docs.deleted": "0", + "store.size": "5.1mb", + "pri.store.size": "2.5mb" + }, + { + "health": "green", + "status": "kibana", + "index": ".kibana_1", + "uuid": "dBCrfVblRPGVlYAIlP_Duw", + "pri": "1", + "rep": "1", + "docs.count": "3187", + "docs.deleted": "50", + "store.size": "24.8mb", + "pri.store.size": "12.4mb" + }, + { + "health": "green", + "status": "tasks", + "index": ".tasks", + "uuid": "3RafayGeSNiqglO2BHof9Q", + "pri": "1", + "rep": "1", + "docs.count": "3", + "docs.deleted": "0", + "store.size": "39.9kb", + "pri.store.size": "19.9kb" + }, + { + "health": "green", + "status": "filebeat", + "index": "filebeat-7.9.0-elastic_qa", + "uuid": "tktSYU14S3CrsrJb0ybpSQ", + "pri": "1", + "rep": "1", + "docs.count": "3009880", + "docs.deleted": "0", + "store.size": "1.6gb", + "pri.store.size": "850.1mb" + }, + { + "health": "green", + "status": "analysis", + "index": "analysis_test", + "uuid": "6ZHEAW1ST_qfg7mo4Bva4w", + "pri": "1", + "rep": "1", + "docs.count": "0", + "docs.deleted": "0", + "store.size": "416b", + "pri.store.size": "208b" + }, + { + "health": "green", + "status": "open", + "index": ".apm-custom-link", + "uuid": "Y4N2TeVERrGacEGwY-NPAQ", + "pri": "1", + "rep": "1", + "docs.count": "0", + "docs.deleted": "0", + "store.size": "416b", + "pri.store.size": "208b" + }, + { + "health": "green", + "status": "open", + "index": "kibana_sample_data_ecommerce", + "uuid": "4FIWJKhGSr6bE72R0xEQyA", + "pri": "1", + "rep": "1", + "docs.count": "4675", + "docs.deleted": "0", + "store.size": "9.2mb", + "pri.store.size": "4.6mb" + } +]`; columns = [ { title: '索引名称', dataIndex: 'index', }, + { + title: '别名', + dataIndex: 'status', + }, { title: '文档数', dataIndex: 'docs.count', diff --git a/web/src/pages/SearchManage/alias/alias.js b/web/src/pages/SearchManage/alias/alias.js index 2a76fc34..80da1793 100644 --- a/web/src/pages/SearchManage/alias/alias.js +++ b/web/src/pages/SearchManage/alias/alias.js @@ -11,12 +11,6 @@ class Indices extends Component { case 'index': router.push(`${match.url}/index`); break; - case 'param': - router.push(`${match.url}/param`); - break; - case 'rule': - router.push(`${match.url}/rule`); - break; default: break; } @@ -26,14 +20,6 @@ class Indices extends Component { { key: 'index', tab: '索引别名管理', - }, - { - key: 'param', - tab: '字段别名管理', - }, - { - key: 'rule', - tab: 'index pattern 对应规则', } ]; diff --git a/web/src/pages/SearchManage/analyzer/Manage.js b/web/src/pages/SearchManage/analyzer/Manage.js index 636c0c16..ea753f1b 100644 --- a/web/src/pages/SearchManage/analyzer/Manage.js +++ b/web/src/pages/SearchManage/analyzer/Manage.js @@ -141,51 +141,51 @@ class Manage extends PureComponent { [ { "name" : "filebeat-7.9.1", - "index_patterns" : "[filebeat-7.9.1-*]", - "order" : "1", - "version" : null, + "index_patterns" : "[Analyzer1,Analyzer2]", + "order" : "2020-01-11 10:00:00", + "version" : 99, "composed_of" : "" }, { "name" : "apm-7.9.1-span", - "index_patterns" : "[apm-7.9.1-span*]", - "order" : "2", - "version" : null, + "index_patterns" : "[Analyzer1,Analyzer4]", + "order" : "2020-11-12 10:10:00", + "version" : 87, "composed_of" : "" }, { "name" : ".lists-default", - "index_patterns" : "[.lists-default-*]", - "order" : "0", - "version" : null, + "index_patterns" : "[Analyzer1,Analyzer3,Analyzer4]", + "order" : "2020-03-12 09:00:00", + "version" : 30, "composed_of" : "" }, { "name" : ".monitoring-es", - "index_patterns" : "[.monitoring-es-7-*]", - "order" : "0", - "version" : "7000199", + "index_patterns" : "[Analyzer1,Analyzer3,Analyzer4]", + "order" : "2020-02-12 10:00:00", + "version" : "67", "composed_of" : "" }, { "name" : ".monitoring-beats", - "index_patterns" : "[.monitoring-beats-7-*]", - "order" : "0", - "version" : "7000199", + "index_patterns" : "[Analyzer1,Analyzer3,Analyzer4]", + "order" : "2020-05-21 10:09:00", + "version" : "34", "composed_of" : "" }]`; columns = [ { - title: '分词器名称', + title: '索引名称', dataIndex: 'name', }, { - title: '模式', + title: '分词器名称', dataIndex: 'index_patterns', }, { - title: 'order', + title: '创建时间', dataIndex: 'order' }, { diff --git a/web/src/pages/SearchManage/dict/Professional.js b/web/src/pages/SearchManage/dict/Professional.js index f8f20c6c..37b8ba92 100644 --- a/web/src/pages/SearchManage/dict/Professional.js +++ b/web/src/pages/SearchManage/dict/Professional.js @@ -15,16 +15,18 @@ import { TimePicker, Select, Popover, + Avatar } from 'antd'; +import Link from 'umi/link'; import StandardTable from '@/components/StandardTable'; import PageHeaderWrapper from '@/components/PageHeaderWrapper'; -import styles from '../../List/TableList.less'; +import styles from './Professional.less'; const FormItem = Form.Item; const { TextArea } = Input; const fieldLabels = { - keyword_type: '关键词分类' + keyword_type: '词典标签' }; const CreateForm = Form.create()(props => { @@ -333,8 +335,8 @@ class Professional extends PureComponent {