IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Minor cleanup (#27112)

Browse Source
This commit is contained in:
Ryan McKinley 2020-08-20 14:37:49 -07:00 committed by GitHub
parent a2a6b9448f
commit 0fb7ee05d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/developers/plugins/plugin.schema.json
View File

@ -8,8 +8,8 @@
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"$schema": { "$schema": {
"type": "string", "type": "string",
"description": "Schema definition for the plugin.json file" "description": "Schema definition for the plugin.json file"
}, },
"id": { "id": {
"type": "string", "type": "string",

3
packages/grafana-data/src/types/datasource.ts
View File

@ -538,8 +538,11 @@ export interface DataSourceSelectItem {
export interface AnnotationQueryRequest<MoreOptions = {}> { export interface AnnotationQueryRequest<MoreOptions = {}> {
range: TimeRange; range: TimeRange;
rangeRaw: RawTimeRange; rangeRaw: RawTimeRange;
// Should be DataModel but cannot import that here from the main app. Needs to be moved to package first. // Should be DataModel but cannot import that here from the main app. Needs to be moved to package first.
dashboard: any; dashboard: any;
// The annotation query, typically extends DataQuery
annotation: { annotation: {
datasource: string; datasource: string;
enable: boolean; enable: boolean;

4
packages/grafana-e2e/src/flows/addDashboard.ts
View File

@ -8,7 +8,7 @@ export interface AddDashboardConfig {
timeRange: DashboardTimeRangeConfig; timeRange: DashboardTimeRangeConfig;
timezone: string; timezone: string;
title: string; title: string;
variables: Partial<AddVariableConfig>[]; variables: Array<Partial<AddVariableConfig>>;
} }
export interface AddVariableConfig { export interface AddVariableConfig {
@ -145,7 +145,7 @@ const addVariable = (config: Partial<AddVariableConfig>, isFirst: boolean): any
return fullConfig; return fullConfig;
}; };
const addVariables = (configs: Partial<AddVariableConfig>[]): any => { const addVariables = (configs: Array<Partial<AddVariableConfig>>): any => {
if (configs.length > 0) { if (configs.length > 0) {
e2e.pages.Dashboard.Settings.General.sectionItems('Variables').click(); e2e.pages.Dashboard.Settings.General.sectionItems('Variables').click();
} }