diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx
index 67a5e4a2190..6287fcc8e64 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx
@@ -21,6 +21,12 @@ standardFieldConfigEditorRegistry.setInit(getStandardFieldConfigs);
const mockStore = configureMockStore();
const OptionsPaneSelector = selectors.components.PanelEditor.OptionsPane;
+jest.mock('react-router-dom', () => ({
+ ...(jest.requireActual('react-router-dom') as any),
+ useLocation: () => ({
+ pathname: 'localhost:3000/example/path',
+ }),
+}));
class OptionsPaneOptionsTestScenario {
onFieldConfigsChange = jest.fn();
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index 44f89fa57e6..7f9995eef85 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -309,12 +309,17 @@ export class PanelChrome extends PureComponent {
this.props.panel.updateFieldConfig(config);
};
- onPanelError = (message: string) => {
- if (this.state.errorMessage !== message) {
- this.setState({ errorMessage: message });
+ onPanelError = (error: Error) => {
+ const errorMessage = error.message || DEFAULT_PLUGIN_ERROR;
+ if (this.state.errorMessage !== errorMessage) {
+ this.setState({ errorMessage });
}
};
+ onPanelErrorRecover = () => {
+ this.setState({ errorMessage: undefined });
+ };
+
onAnnotationCreate = async (event: AnnotationEventUIModel) => {
const isRegion = event.from !== event.to;
const anno = {
@@ -458,7 +463,7 @@ export class PanelChrome extends PureComponent {
}
render() {
- const { dashboard, panel, isViewing, isEditing, width, height } = this.props;
+ const { dashboard, panel, isViewing, isEditing, width, height, plugin } = this.props;
const { errorMessage, data } = this.state;
const { transparent } = panel;
@@ -489,10 +494,13 @@ export class PanelChrome extends PureComponent {
alertState={alertState}
data={data}
/>
-
+
{({ error }) => {
if (error) {
- this.onPanelError(error.message || DEFAULT_PLUGIN_ERROR);
return null;
}
return this.renderPanel(width, height);
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index d9e44cbaa47..9deb905f8a0 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -22,6 +22,7 @@ import { Logs } from './Logs';
import { LogsCrossFadeTransition } from './utils/LogsCrossFadeTransition';
import { LiveTailControls } from './useLiveTailControls';
import { getFieldLinksForExplore } from './utils/links';
+import { config } from 'app/core/config';
interface LogsContainerProps extends PropsFromRedux {
width: number;
@@ -150,7 +151,11 @@ export class LogsContainer extends PureComponent {
getFieldLinks={this.getFieldLinks}
addResultsToCache={() => addResultsToCache(exploreId)}
clearCache={() => clearCache(exploreId)}
- loadingLogsVolumeAvailable={hasLogsVolumeSupport(datasourceInstance) && !!logsVolumeDataProvider}
+ loadingLogsVolumeAvailable={
+ hasLogsVolumeSupport(datasourceInstance) &&
+ !!logsVolumeDataProvider &&
+ !config.featureToggles.autoLoadFullRangeLogsVolume
+ }
onClickLoadLogsVolume={() => loadLogsVolumeData(exploreId)}
/>
diff --git a/public/app/features/explore/SecondaryActions.test.tsx b/public/app/features/explore/SecondaryActions.test.tsx
index 6b55113f6d8..1b49db65815 100644
--- a/public/app/features/explore/SecondaryActions.test.tsx
+++ b/public/app/features/explore/SecondaryActions.test.tsx
@@ -3,6 +3,19 @@ import { noop } from 'lodash';
import { shallow } from 'enzyme';
import { SecondaryActions } from './SecondaryActions';
+import { config } from '@grafana/runtime';
+
+jest.mock('@grafana/runtime', () => ({
+ ...((jest.requireActual('@grafana/runtime') as unknown) as object),
+ config: {
+ ...((jest.requireActual('@grafana/runtime') as unknown) as any).config,
+ featureToggles: {
+ fullRangeLogsVolume: true,
+ autoLoadFullRangeLogsVolume: false,
+ },
+ },
+}));
+
const addQueryRowButtonSelector = '[aria-label="Add row button"]';
const richHistoryButtonSelector = '[aria-label="Rich history button"]';
const queryInspectorButtonSelector = '[aria-label="Query inspector button"]';
@@ -66,4 +79,8 @@ describe('SecondaryActions', () => {
wrapper.find(queryInspectorButtonSelector).simulate('click');
expect(onClickQueryInspector).toBeCalled();
});
+
+ it('does not render load logs volume button when auto loading is enabled', () => {
+ config.featureToggles.autoLoadFullRangeLogsVolume = true;
+ });
});
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index 8d501fffc1c..c578e599dcb 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -33,6 +33,7 @@ import { reducerTester } from '../../../../test/core/redux/reducerTester';
import { configureStore } from '../../../store/configureStore';
import { setTimeSrv } from '../../dashboard/services/TimeSrv';
import Mock = jest.Mock;
+import { config } from '@grafana/runtime';
jest.mock('@grafana/runtime', () => ({
...((jest.requireActual('@grafana/runtime') as unknown) as object),
@@ -40,6 +41,7 @@ jest.mock('@grafana/runtime', () => ({
...((jest.requireActual('@grafana/runtime') as unknown) as any).config,
featureToggles: {
fullRangeLogsVolume: true,
+ autoLoadFullRangeLogsVolume: false,
},
},
}));
@@ -322,6 +324,7 @@ describe('reducer', () => {
describe('logs volume', () => {
let dispatch: ThunkDispatch,
getState: () => StoreState,
+ unsubscribes: Function[],
mockLogsVolumeDataProvider: () => Observable;
beforeEach(() => {
@@ -352,11 +355,9 @@ describe('reducer', () => {
dispatch = store.dispatch;
getState = store.getState;
- });
- it('should cancel any unfinished logs volume queries', async () => {
setupQueryResponse(getState());
- let unsubscribes: Function[] = [];
+ unsubscribes = [];
mockLogsVolumeDataProvider = () => {
return ({
@@ -369,7 +370,9 @@ describe('reducer', () => {
},
} as unknown) as Observable;
};
+ });
+ it('should cancel any unfinished logs volume queries', async () => {
await dispatch(runQueries(ExploreId.left));
// no subscriptions created yet
expect(unsubscribes).toHaveLength(0);
@@ -391,5 +394,11 @@ describe('reducer', () => {
expect(unsubscribes[0]).toBeCalled();
expect(unsubscribes[1]).not.toBeCalled();
});
+
+ it('should load logs volume after running the query', async () => {
+ config.featureToggles.autoLoadFullRangeLogsVolume = true;
+ await dispatch(runQueries(ExploreId.left));
+ expect(unsubscribes).toHaveLength(1);
+ });
});
});
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 306d3d446cf..d6028ece374 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -485,6 +485,9 @@ export const runQueries = (
const { logsVolumeData, absoluteRange } = getState().explore[exploreId]!;
if (!canReuseLogsVolumeData(logsVolumeData, queries, absoluteRange)) {
dispatch(cleanLogsVolumeAction({ exploreId }));
+ if (config.featureToggles.autoLoadFullRangeLogsVolume) {
+ dispatch(loadLogsVolumeData(exploreId));
+ }
}
} else {
dispatch(
diff --git a/public/app/features/panel/components/PanelRenderer.tsx b/public/app/features/panel/components/PanelRenderer.tsx
index c1358f94139..72ceb49bafd 100644
--- a/public/app/features/panel/components/PanelRenderer.tsx
+++ b/public/app/features/panel/components/PanelRenderer.tsx
@@ -5,7 +5,7 @@ import { appEvents } from 'app/core/core';
import { useAsync } from 'react-use';
import { getPanelOptionsWithDefaults, OptionDefaults } from '../../dashboard/state/getPanelOptionsWithDefaults';
import { importPanelPlugin } from '../../plugins/importPanelPlugin';
-import { useTheme2 } from '@grafana/ui';
+import { ErrorBoundaryAlert, useTheme2 } from '@grafana/ui';
const defaultFieldConfig = { defaults: {}, overrides: [] };
@@ -51,24 +51,26 @@ export function PanelRenderer
(pr
const PanelComponent = plugin.panel;
return (
- {{ .Name }}: {{ .Value }} {{ .Name }}: {{ .Value }}
-
diff --git a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
index c91b0fb3436..acd086f25fe 100644
--- a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.tsx
@@ -17,8 +17,6 @@ import { FixedSizeList } from 'react-window';
import { GrafanaTheme } from '@grafana/data';
// Hard limit on labels to render
-const MAX_LABEL_COUNT = 10000;
-const MAX_VALUE_COUNT = 50000;
const EMPTY_SELECTOR = '{}';
const METRIC_LABEL = '__name__';
const LIST_ITEM_SIZE = 25;
@@ -321,12 +319,6 @@ export class UnthemedPrometheusMetricsBrowser extends React.Component
+
+ );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+ rule: css`
+ margin-bottom: ${theme.spacing(1)};
+ `,
+ row: css`
+ display: flex;
+ margin-bottom: 4px;
+ `,
+ inline: css`
+ margin-bottom: 0;
+ margin-left: 4px;
+ `,
+ color: css`
+ align-items: center;
+ margin-bottom: 0;
+ margin-right: 4px;
+ `,
+ button: css`
+ margin-left: 4px;
+ `,
+});
diff --git a/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts b/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
index 309086d590c..f5507acf912 100644
--- a/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
+++ b/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
@@ -7,15 +7,16 @@ import { Feature } from 'ol';
import { Geometry } from 'ol/geom';
import { getGeoMapStyle } from '../../utils/getGeoMapStyle';
import { checkFeatureMatchesStyleRule } from '../../utils/checkFeatureMatchesStyleRule';
-import { FeatureStyleConfig } from '../../types';
+import { ComparisonOperation, FeatureStyleConfig } from '../../types';
import { Stroke, Style } from 'ol/style';
import { FeatureLike } from 'ol/Feature';
+import { GeomapStyleRulesEditor } from '../../editor/GeomapStyleRulesEditor';
export interface GeoJSONMapperConfig {
// URL for a geojson file
src?: string;
// Styles that can be applied
- styles?: FeatureStyleConfig[];
+ styles: FeatureStyleConfig[];
}
const defaultOptions: GeoJSONMapperConfig = {
@@ -23,6 +24,16 @@ const defaultOptions: GeoJSONMapperConfig = {
styles: [],
};
+export const DEFAULT_STYLE_RULE: FeatureStyleConfig = {
+ fillColor: '#1F60C4',
+ strokeWidth: 1,
+ rule: {
+ property: '',
+ operation: ComparisonOperation.EQ,
+ value: '',
+ },
+};
+
export const geojsonMapper: MapLayerRegistryItem
+
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html
index 25b4ef8b034..b5459da967c 100644
--- a/public/emails/invited_to_org.html
+++ b/public/emails/invited_to_org.html
@@ -257,7 +257,7 @@ text-decoration: underline;
-
+
-
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html
index 89f465a8446..171d9bc13ef 100644
--- a/public/emails/new_user_invite.html
+++ b/public/emails/new_user_invite.html
@@ -258,7 +258,7 @@ text-decoration: underline;
-
+
{{ end }}
+
-
+
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html
index 1eaae4fef27..7d952b80f69 100644
--- a/public/emails/ng_alert_notification.html
+++ b/public/emails/ng_alert_notification.html
@@ -211,21 +211,21 @@ text-decoration: underline;
{{ end }}
{{ range .Annotations.SortedPairs }}
-
-
Labels:
-
-
+
+ Labels:
+
{{ range .Labels.SortedPairs }}
-
@@ -307,7 +307,7 @@ text-decoration: underline;
+
{{ if .SilenceURL }}
@@ -286,7 +286,7 @@ text-decoration: underline;
Firing
-
+
{{ .Labels.alertname }}
Resolved
-
+
{{ .Labels.alertname }}
@@ -322,15 +322,16 @@ text-decoration: underline;
+
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html
index 697928655ed..5e8ce659a73 100644
--- a/public/emails/reset_password.html
+++ b/public/emails/reset_password.html
@@ -252,7 +252,7 @@ text-decoration: underline;
-
+
diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html
index dab02e572e6..f95729c1acf 100644
--- a/public/emails/signup_started.html
+++ b/public/emails/signup_started.html
@@ -256,7 +256,7 @@ text-decoration: underline;
-
+
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html
index 921c96faae3..d71077453b5 100644
--- a/public/emails/welcome_on_signup.html
+++ b/public/emails/welcome_on_signup.html
@@ -258,7 +258,7 @@ text-decoration: underline;
-
+
diff --git a/public/test/jest-shim.ts b/public/test/jest-shim.ts
index 1343887f8b6..5b01becaaae 100644
--- a/public/test/jest-shim.ts
+++ b/public/test/jest-shim.ts
@@ -1,5 +1,3 @@
-declare var global: NodeJS.Global;
-
(global as any).requestAnimationFrame = (callback: any) => {
setTimeout(callback, 0);
};
diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star
index 50c651d8f01..e741a767832 100644
--- a/scripts/drone/pipelines/main.star
+++ b/scripts/drone/pipelines/main.star
@@ -61,6 +61,8 @@ def get_steps(edition, is_downstream=False):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
+ postgres_integration_tests_step(),
+ mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_plugins_step(edition=edition, sign=True),
@@ -90,8 +92,6 @@ def get_steps(edition, is_downstream=False):
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=publish),
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=publish),
- postgres_integration_tests_step(),
- mysql_integration_tests_step(),
])
if include_enterprise2:
diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star
index fdaa852afac..f5519773509 100644
--- a/scripts/drone/pipelines/pr.star
+++ b/scripts/drone/pipelines/pr.star
@@ -53,6 +53,8 @@ def pr_pipelines(edition):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
+ postgres_integration_tests_step(),
+ mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition),
@@ -82,8 +84,6 @@ def pr_pipelines(edition):
build_docs_website_step(),
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64',]),
- postgres_integration_tests_step(),
- mysql_integration_tests_step(),
])
if include_enterprise2:
diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star
index 40590d9f0f0..72739465133 100644
--- a/scripts/drone/pipelines/release.star
+++ b/scripts/drone/pipelines/release.star
@@ -89,6 +89,8 @@ def get_steps(edition, ver_mode):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
+ postgres_integration_tests_step(),
+ mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition, sign=True),
@@ -113,8 +115,6 @@ def get_steps(edition, ver_mode):
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
- postgres_integration_tests_step(),
- mysql_integration_tests_step(),
])
build_storybook = build_storybook_step(edition=edition, ver_mode=ver_mode)
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index e76344c7345..2887f4a77a9 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -681,8 +681,7 @@ def postgres_integration_tests_step():
'name': 'postgres-integration-tests',
'image': build_image,
'depends_on': [
- 'test-backend',
- 'test-frontend',
+ 'initialize',
],
'environment': {
'PGPASSWORD': 'grafanatest',
@@ -706,8 +705,7 @@ def mysql_integration_tests_step():
'name': 'mysql-integration-tests',
'image': build_image,
'depends_on': [
- 'test-backend',
- 'test-frontend',
+ 'initialize',
],
'environment': {
'GRAFANA_TEST_DB': 'mysql',
@@ -795,8 +793,6 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
dependencies = [
'end-to-end-tests' + enterprise2_suffix(edition),
- 'mysql-integration-tests',
- 'postgres-integration-tests',
]
if edition in ('enterprise', 'enterprise2'):
diff --git a/yarn.lock b/yarn.lock
index 8b24e22fe10..b1458067172 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2383,7 +2383,7 @@ __metadata:
"@types/jquery": 3.3.38
"@types/lodash": 4.14.123
"@types/marked": 1.1.0
- "@types/node": 10.14.1
+ "@types/node": 14.17.27
"@types/papaparse": 5.2.0
"@types/react": 17.0.30
"@types/rollup-plugin-visualizer": 4.2.1
@@ -2413,7 +2413,7 @@ __metadata:
"@grafana/tsconfig": ^1.0.0-rc1
"@rollup/plugin-commonjs": 16.0.0
"@rollup/plugin-node-resolve": 10.0.0
- "@types/node": 13.7.7
+ "@types/node": 14.17.27
"@types/rollup-plugin-visualizer": 4.2.1
"@types/systemjs": ^0.20.6
commander: 5.0.0
@@ -2440,7 +2440,7 @@ __metadata:
"@mochajs/json-file-reporter": ^1.2.0
"@rollup/plugin-commonjs": 16.0.0
"@rollup/plugin-node-resolve": 10.0.0
- "@types/node": 13.7.7
+ "@types/node": 14.17.27
"@types/rollup-plugin-visualizer": 4.2.1
blink-diff: 1.0.13
commander: 5.0.0
@@ -2573,7 +2573,7 @@ __metadata:
"@types/fs-extra": ^9.0.13
"@types/inquirer": ^6.0.3
"@types/jest": 26.0.15
- "@types/node": ^12.0.4
+ "@types/node": ^14.0.0
"@types/prettier": ^2.4.0
"@types/react-dev-utils": ^9.0.4
"@types/rimraf": ^3.0.0
@@ -2684,7 +2684,7 @@ __metadata:
"@types/jquery": 3.3.38
"@types/lodash": 4.14.123
"@types/mock-raf": 1.0.2
- "@types/node": 10.14.1
+ "@types/node": 14.17.27
"@types/papaparse": 5.2.0
"@types/react": 17.0.30
"@types/react-beautiful-dnd": 13.1.1
@@ -7767,13 +7767,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:10.14.1":
- version: 10.14.1
- resolution: "@types/node@npm:10.14.1"
- checksum: be0881716c81f6355035fe64fa16d6830e3f27f1e657738c46dd5605d6c4248681ceb64f8df738bf3e2107df608c4a057668dd618fa32e5697be3959fa056c4c
- languageName: node
- linkType: hard
-
"@types/node@npm:12.20.24":
version: 12.20.24
resolution: "@types/node@npm:12.20.24"
@@ -7781,24 +7774,10 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:13.7.0":
- version: 13.7.0
- resolution: "@types/node@npm:13.7.0"
- checksum: ccc4eb30fd225dfdbf15307704b4acdb34fe57b13ff0942b1122723fe27b218d8d30915d7ff61f63e58a8213304ec3bd58bbb9cb0bcf13e687e57f5b25af6ec6
- languageName: node
- linkType: hard
-
-"@types/node@npm:13.7.7":
- version: 13.7.7
- resolution: "@types/node@npm:13.7.7"
- checksum: 834f382e965ddf6eb8aed11a949e48254cdcd7b29fa41e226c1b3d54f820e0e09cebb78db7ad20e6c18d688b7337b4376c6e08b598f49ac985ec6b07c524931a
- languageName: node
- linkType: hard
-
-"@types/node@npm:^12.0.4":
- version: 12.20.28
- resolution: "@types/node@npm:12.20.28"
- checksum: 09811db5eabb02062cc04ab887cf20dcae87e904ccbe4d1767ebd8c88ab31eeea9c62f6c94b16f52230a4e2f1ab0d8a411e3b3cb744c7d0e6fbc4fa5f0f25ba8
+"@types/node@npm:14.17.27, @types/node@npm:^14.0.0":
+ version: 14.17.27
+ resolution: "@types/node@npm:14.17.27"
+ checksum: 4f7eeaa329f4b2b9ff4bb0bb4582ad92e328a4e66f62d5b96ac4e3b51210ed092bb56726c30643beb860f6df633a29e08ed94adad2d573c85b4794d0bf0bbc06
languageName: node
linkType: hard
@@ -17673,7 +17652,7 @@ fsevents@~2.1.2:
"@types/logfmt": ^1.2.1
"@types/lru-cache": ^5.1.0
"@types/mousetrap": 1.6.3
- "@types/node": 13.7.0
+ "@types/node": 14.17.27
"@types/ol": ^6.5.1
"@types/papaparse": 5.2.0
"@types/pluralize": ^0.0.29