opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 11:02:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Build URL params and include requestId (#65742)

Browse Source 
* add requestId and ds_type to datasource request url
This commit is contained in:
Galen Kistler
2023-04-06 14:43:10 -05:00
committed by GitHub
parent 3725463c43
commit 38482c90bf
8 changed files with 79 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e2e/dashboards-suite/dashboard-public-create.spec.ts
View File

@ -8,7 +8,11 @@ e2e.scenario({
skipScenario: false,
scenario: () => {
// Opening a dashboard without template variables
e2e().intercept('POST', '/api/ds/query').as('query');
e2e()
.intercept({
pathname: '/api/ds/query',
})
.as('query');
e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
e2e().wait('@query');
@ -65,7 +69,12 @@ e2e.scenario({
skipScenario: false,
scenario: () => {
// Opening a dashboard without template variables
e2e().intercept('POST', '/api/ds/query').as('query');
e2e()
.intercept({
method: 'POST',
pathname: '/api/ds/query',
})
.as('query');
e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
e2e().wait('@query');
@ -109,7 +118,12 @@ e2e.scenario({
skipScenario: false,
scenario: () => {
// Opening a dashboard without template variables
e2e().intercept('/api/ds/query').as('query');
e2e()
.intercept({
method: 'POST',
pathname: '/api/ds/query',
})
.as('query');
e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
e2e().wait('@query');

6
e2e/dashboards-suite/load-options-from-url.spec.ts
View File

@ -9,7 +9,7 @@ describe('Variables - Load options from Url', () => {
e2e()
.intercept({
method: 'POST',
url: '/api/ds/query',
pathname: '/api/ds/query*',
})
.as('query');
@ -61,7 +61,7 @@ describe('Variables - Load options from Url', () => {
e2e()
.intercept({
method: 'POST',
url: '/api/ds/query',
pathname: '/api/ds/query',
})
.as('query');
@ -124,7 +124,7 @@ describe('Variables - Load options from Url', () => {
e2e()
.intercept({
method: 'POST',
url: '/api/ds/query',
pathname: '/api/ds/query',
})
.as('query');

8
e2e/dashboards-suite/set-options-from-ui.spec.ts
View File

@ -61,7 +61,11 @@ describe('Variables - Set options from ui', () => {
it('adding a value that is not part of dependents options should add the new values dependant options', () => {
e2e.flows.login('admin', 'admin');
e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=A&var-server=AA&var-pod=AAA` });
e2e().intercept('/api/ds/query').as('query');
e2e()
.intercept({
pathname: '/api/ds/query',
})
.as('query');
e2e().wait('@query');
@ -119,7 +123,7 @@ describe('Variables - Set options from ui', () => {
e2e.flows.openDashboard({
uid: `${PAGE_UNDER_TEST}?orgId=1&var-datacenter=A&var-datacenter=B&var-server=AA&var-server=BB&var-pod=AAA&var-pod=BBB`,
});
e2e().intercept('/api/ds/query').as('query');
e2e().intercept({ pathname: '/api/ds/query' }).as('query');
e2e().wait('@query');

6
e2e/panels-suite/panelEdit_base.spec.ts
View File

@ -9,7 +9,11 @@ e2e.scenario({
addScenarioDashBoard: false,
skipScenario: false,
scenario: () => {
e2e().intercept('/api/ds/query').as('query');
e2e()
.intercept({
pathname: '/api/ds/query',
})
.as('query');
e2e.flows.openDashboard({ uid: 'TkZXxlNG3' });
e2e().wait('@query');

10
e2e/sql-suite/mysql.spec.ts
View File

@ -11,7 +11,12 @@ describe('MySQL datasource', () => {
it('code editor autocomplete should handle table name escaping/quoting', () => {
e2e.flows.login('admin', 'admin');
e2e().intercept('POST', '**/api/ds/query', (req) => {
e2e().intercept(
'POST',
{
pathname: '/api/ds/query',
},
(req) => {
if (req.body.queries[0].refId === 'datasets') {
req.alias = 'datasets';
req.reply({
@ -28,7 +33,8 @@ describe('MySQL datasource', () => {
body: fieldsResponse,
});
}
});
}
);
e2e.pages.Explore.visit();

9
e2e/various-suite/exemplars.spec.ts
View File

@ -32,7 +32,11 @@ describe('Exemplars', () => {
});
it('should be able to navigate to configured data source', () => {
e2e().intercept('/api/ds/query', (req) => {
e2e().intercept(
{
pathname: '/api/ds/query',
},
(req) => {
const datasourceType = req.body.queries[0].datasource.type;
if (datasourceType === 'prometheus') {
req.reply({ fixture: 'exemplars-query-response.json' });
@ -41,7 +45,8 @@ describe('Exemplars', () => {
} else {
req.reply({});
}
});
}
);
e2e.pages.Explore.visit();

6
packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts
View File

@ -98,7 +98,7 @@ describe('DataSourceWithBackend', () => {
"hideFromInspector": false,
"method": "POST",
"requestId": undefined,
"url": "/api/ds/query",
"url": "/api/ds/query?ds_type=dummy",
}
`);
});
@ -153,7 +153,7 @@ describe('DataSourceWithBackend', () => {
"hideFromInspector": false,
"method": "POST",
"requestId": undefined,
"url": "/api/ds/query?expression=true",
"url": "/api/ds/query?ds_type=dummy&expression=true",
}
`);
});
@ -222,7 +222,7 @@ describe('DataSourceWithBackend', () => {
"hideFromInspector": true,
"method": "POST",
"requestId": undefined,
"url": "/api/ds/query",
"url": "/api/ds/query?ds_type=dummy",
}
`);
});

10
packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
View File

@ -202,10 +202,16 @@ class DataSourceWithBackend<
headers[PluginRequestHeaders.PluginID] = Array.from(pluginIDs).join(', ');
headers[PluginRequestHeaders.DatasourceUID] = Array.from(dsUIDs).join(', ');
let url = '/api/ds/query';
let url = '/api/ds/query?ds_type=' + this.type;
if (hasExpr) {
headers[PluginRequestHeaders.FromExpression] = 'true';
url += '?expression=true';
url += '&expression=true';
}
// Appending request ID to url to facilitate client-side performance metrics. See #65244 for more context.
if (requestId) {
url += `&requestId=${requestId}`;
}
if (request.dashboardUID) {