diff --git a/Dockerfile b/Dockerfile index 35e120a..b5591e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,11 @@ RUN pnpm i \ && mkdir -p build/alert \ && mkdir -p build/event \ && mkdir -p build/timeseries \ +&& mkdir -p build/trace \ && mv src/alert/dist/* build/alert \ && mv src/event/dist/* build/event \ -&& mv src/timeseries/dist/* build/timeseries +&& mv src/timeseries/dist/* build/timeseries \ +&& mv src/trace/dist/* build/trace RUN tar -czvf frontend.tar.gz build diff --git a/src/trace/LICENSE b/src/trace/LICENSE index 9c8f3ea..60ebb76 100644 --- a/src/trace/LICENSE +++ b/src/trace/LICENSE @@ -2,180 +2,180 @@ Version 2.0, January 2004 http://www.apache.org/licenses/ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "{}" @@ -186,16 +186,16 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} +Copyright {yyyy} {name of copyright owner} - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on 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. \ No newline at end of file +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on 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. diff --git a/src/trace/src/CheatSheet.tsx b/src/trace/src/CheatSheet.tsx deleted file mode 100644 index 7aab8f9..0000000 --- a/src/trace/src/CheatSheet.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import { css } from '@emotion/css'; -import type { GrafanaTheme2 } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; -import React from 'react'; - -export default function CheatSheet() { - const styles = useStyles2(getStyles); - return ( - <> -

Cheat Sheet

-

- This cheat sheet provides a quick overview of the query types that are available. For more details about the - data source, check out{' '} - - the documentation - - . -

- -
- - - ); -} - -const getStyles = (theme: GrafanaTheme2) => ({ - anchorTag: css` - color: ${theme.colors.text.link}; - `, - unorderedList: css` - list-style-type: none; - `, -}); diff --git a/src/trace/src/components/QueryEditor.tsx b/src/trace/src/components/QueryEditor.tsx index 47c27de..a0cc507 100644 --- a/src/trace/src/components/QueryEditor.tsx +++ b/src/trace/src/components/QueryEditor.tsx @@ -1,11 +1,9 @@ import { css } from '@emotion/css'; -import { type QueryEditorProps, type SelectableValue } from '@grafana/data'; +import type { QueryEditorProps, SelectableValue } from '@grafana/data'; import { - FileDropzone, HorizontalGroup, InlineField, InlineFieldRow, - Modal, QueryField, RadioButtonGroup, Select, @@ -23,11 +21,9 @@ import { getTemplateSrv } from '@grafana/runtime'; type Props = QueryEditorProps; export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props) { - const [uploadModalOpen, setUploadModalOpen] = useState(false); const [appLoading, setAppLoading] = useState(false); const [appOptions, setAppOptions] = useState>>(); - const theme = useTheme2(); const styles = useStyles2(getStyles); useEffect(() => { @@ -60,11 +56,11 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props) }, }); }, [datasource]); + // trace_id查询图表 const onChangeQuery = (value: string) => { const nextQuery: TraceQuery = { ...query, query: value }; onChange(nextQuery); }; - const renderEditorBody = () => { switch (query.queryType) { case 'search': @@ -100,26 +96,6 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props) return ( <> - setUploadModalOpen(false)} - > -
- { - datasource.uploadedJson = result; - onChange({ - ...query, - queryType: 'upload', - }); - setUploadModalOpen(false); - onRunQuery(); - }} - /> -
-
- {/* */} @@ -177,7 +144,7 @@ export function QueryEditor({ datasource, query, onChange, onRunQuery }: Props) onChange={v => { onChange({ ...query, - app_name: v?.value!, + app_name: v?.value, service: query.app_name !== v?.value ? [] : query.service, spans: query.app_name !== v?.value ? [] : query.spans, }); diff --git a/src/trace/src/components/SearchForm.tsx b/src/trace/src/components/SearchForm.tsx index f5b5105..7e46579 100644 --- a/src/trace/src/components/SearchForm.tsx +++ b/src/trace/src/components/SearchForm.tsx @@ -1,16 +1,13 @@ import { css } from '@emotion/css'; -import { type SelectableValue, toOption } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; +import type { SelectableValue } from '@grafana/data'; import { fuzzyMatch, InlineField, InlineFieldRow, Input, Select } from '@grafana/ui'; -// import { notifyApp } from 'grafana/app/core/actions'; -// import { createErrorNotification } from 'grafana/app/core/copy/appNotification'; -// import { dispatch } from 'grafana/app/store/store'; import React, { useCallback, useEffect, useState } from 'react'; import type TraceDatasource from '../datasource'; import type { TraceQuery } from '../types'; import { transformToLogfmt } from '../util'; import { t } from 'common/utils/utils'; +import { getTemplateSrv } from '@grafana/runtime'; const durationPlaceholder = 'e.g. 1.2s, 100ms, 500us'; @@ -40,16 +37,15 @@ export function SearchForm({ datasource, query, onChange }: Props) { setIsLoading(prevValue => ({ ...prevValue, [loaderOfType]: true })); try { - const values = await datasource.loadOptions(query.app_name!, field); + if (!query.app_name) return []; + const values = await datasource.loadOptions(query.app_name, field); if (!values?.length) { return [{ label: `No ${loaderOfType} found`, value: `No ${loaderOfType} found` }]; } - const options: SelectableValue[] = values.sort().map(option => ({ label: option.text, value: option.value, })); - const filteredOptions = options.filter(item => (item.value ? fuzzyMatch(item.value, keyword).found : false)); return filteredOptions; } catch (error) { @@ -65,28 +61,26 @@ export function SearchForm({ datasource, query, onChange }: Props) { ); useEffect(() => { - const getOperations = async () => { + const getSpans = async () => { const spansOptions = await loadOptions('spans', 'span_name'); - // if (query.spans && getTemplateSrv().containsTemplate(query.spans)) { - // spans.push(toOption(query.spans)); - // } setOperationOptions([...spansOptions]); }; - if (query.app_name) { - getOperations(); - } + query.app_name && getSpans(); }, [datasource, query.app_name, loadOptions]); useEffect(() => { const getServices = async () => { const serviceOptions = await loadOptions('services', 'resource.service.name'); - // if (query.service && getTemplateSrv().containsTemplate(query.service)) { - // spans.push(toOption(query.service)); - // } + if (query.service?.length && getTemplateSrv().containsTemplate()) { + for (const service of query.service) { + serviceOptions.push({ + label: service, + value: service, + }); + } + } setServiceOptions([...serviceOptions]); }; - if (query.app_name) { - getServices(); - } + query.app_name && getServices(); }, [datasource, query.app_name, loadOptions]); return (
@@ -210,7 +204,7 @@ export function SearchForm({ datasource, query, onChange }: Props) { onChange({ ...query, diff --git a/src/trace/src/configuration/ConfigEditor.tsx b/src/trace/src/configuration/ConfigEditor.tsx index 9f65259..9f9435e 100644 --- a/src/trace/src/configuration/ConfigEditor.tsx +++ b/src/trace/src/configuration/ConfigEditor.tsx @@ -24,12 +24,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 React from 'react'; import type { DataSourcePluginOptionsEditorProps } from '@grafana/data'; import { LegacyForms, TagsInput } from '@grafana/ui'; -import React, { useState } from 'react'; import type { QueryOption, SecureOption } from '../types/config'; import { t } from 'common/utils/utils'; +import { css } from '@emotion/css'; const { FormField, Input, Switch } = LegacyForms; @@ -37,44 +38,7 @@ export const ConfigEditor: React.FC { - const [useToken, setUseToken] = useState(options?.jsonData?.useToken ?? false); - - const handleChange = (type: string, e: React.FocusEvent) => { - onOptionsChange({ - ...options, - jsonData: { - ...options.jsonData, - [type]: e.target.value.trim(), - }, - }); - }; - - const handleTokenChange = (e: React.FocusEvent) => { - onOptionsChange({ - ...options, - secureJsonData: { - ...options.secureJsonData, - token: e.target.value.trim(), - }, - }); - }; - - const handleUseTokenChange = (e: React.SyntheticEvent) => { - const newUseToken = (e.target as any).checked; - setUseToken(newUseToken); - onOptionsChange({ - ...options, - jsonData: { - ...options.jsonData, - useToken: newUseToken, - }, - }); - }; - - const tagProps = { - style: { width: '500px' }, - }; - + const style = getStyles(); return ( <>

BlueKing Monitor API Details

@@ -90,7 +54,15 @@ export const ConfigEditor: React.FC handleChange('baseUrl', e)} + onBlur={e => { + onOptionsChange({ + ...options, + jsonData: { + ...options.jsonData, + baseUrl: e.target.value.trim(), + }, + }); + }} /> } label='Base Url' @@ -105,9 +77,17 @@ export const ConfigEditor: React.FC handleUseTokenChange(e)} + onChange={e => { + onOptionsChange({ + ...options, + jsonData: { + ...options.jsonData, + useToken: !!e.target?.checked, + }, + }); + }} /> } label={t('是否启用token')} @@ -115,13 +95,13 @@ export const ConfigEditor: React.FC
- {useToken && ( + {options?.jsonData?.useToken && ( <>
@@ -151,7 +131,15 @@ export const ConfigEditor: React.FC handleChange('bizId', e)} + onBlur={e => { + onOptionsChange({ + ...options, + jsonData: { + ...options.jsonData, + bizId: e.target.value.trim(), + }, + }); + }} /> } label='业务ID' @@ -173,7 +161,15 @@ export const ConfigEditor: React.FC { + onOptionsChange({ + ...options, + secureJsonData: { + ...options.secureJsonData, + token: e.target.value.trim(), + }, + }); + }} /> } label='Token' @@ -187,3 +183,9 @@ export const ConfigEditor: React.FC ); }; + +const getStyles = () => ({ + tagContainer: css({ + width: '100%', + }), +}); diff --git a/src/trace/src/module.ts b/src/trace/src/module.ts index 4401e14..fd7d58e 100644 --- a/src/trace/src/module.ts +++ b/src/trace/src/module.ts @@ -1,11 +1,7 @@ import { DataSourcePlugin } from '@grafana/data'; -import CheatSheet from './CheatSheet'; import { QueryEditor } from './components/QueryEditor'; import { ConfigEditor } from './configuration/ConfigEditor'; import TraceDatasource from './datasource'; -export const plugin = new DataSourcePlugin(TraceDatasource) - .setConfigEditor(ConfigEditor) - .setQueryEditor(QueryEditor) - .setQueryEditorHelp(CheatSheet); +export const plugin = new DataSourcePlugin(TraceDatasource).setConfigEditor(ConfigEditor).setQueryEditor(QueryEditor); diff --git a/src/trace/src/types/trace.ts b/src/trace/src/types/trace.ts index 5210741..6d363fc 100644 --- a/src/trace/src/types/trace.ts +++ b/src/trace/src/types/trace.ts @@ -16,7 +16,7 @@ * All timestamps are in microseconds */ -// TODO: Everett Tech Debt: Fix KeyValuePair types +// TODO: Fix KeyValuePair types export type TraceKeyValuePair = { key: string; type?: string; diff --git a/src/trace/src/util.ts b/src/trace/src/util.ts index 14ad936..cbaf0d3 100644 --- a/src/trace/src/util.ts +++ b/src/trace/src/util.ts @@ -1,5 +1,5 @@ import logfmt from 'logfmt'; -import { FilterParam } from './types'; +import type { FilterParam } from './types'; export function convertTagsFilters< T extends string | undefined | Record, >(tags: T) { diff --git a/src/trace/src/utils/get-config.tsx b/src/trace/src/utils/get-config.tsx index 814e2ce..056762e 100644 --- a/src/trace/src/utils/get-config.tsx +++ b/src/trace/src/utils/get-config.tsx @@ -1,17 +1,3 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on 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 { get as _get } from 'lodash'; export const FALLBACK_DAG_MAX_NUM_SERVICES = 100; @@ -37,11 +23,10 @@ export const defaultConfig = Object.defineProperty( }, // fields that should be individually merged vs wholesale replaced '__mergeFields', - { value: ['dependencies', 'search', 'tracking'] } + { value: ['dependencies', 'search', 'tracking'] }, ); /** * Merge the embedded config from the query service (if present) with the - * default config from `../../constants/default-config`. */ export default function getConfig() { return defaultConfig;