diff --git a/www/grafana6/Makefile b/www/grafana6/Makefile
index 53dce85cc4ee..62667013c412 100644
--- a/www/grafana6/Makefile
+++ b/www/grafana6/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	grafana
-PORTVERSION=	6.3.5
+PORTVERSION=	6.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
-MASTER_SITES+=	https://s3-us-west-2.amazonaws.com/grafana-releases/release/:public
+MASTER_SITES+=	https://dl.grafana.com/oss/release/:public
 PKGNAMESUFFIX=	${PORTVERSION:C/([0-9]).*/\1/1}
 DISTFILES=	grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX}:public
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/grafana6/distinfo b/www/grafana6/distinfo
index 62b6a0f28644..83bc6a79e62a 100644
--- a/www/grafana6/distinfo
+++ b/www/grafana6/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1568018550
-SHA256 (grafana-6.3.5.linux-amd64.tar.gz) = 0104bfe14444cea2fa3f021b9a75fc78f66434f2ca8f3d0bdd422d108ce682e7
-SIZE (grafana-6.3.5.linux-amd64.tar.gz) = 58756804
-SHA256 (grafana-grafana-v6.3.5_GH0.tar.gz) = 193974115bf868272dbff08e53fdc0c97af3a07a24758390178ce53e5c9e179b
-SIZE (grafana-grafana-v6.3.5_GH0.tar.gz) = 13490877
+TIMESTAMP = 1569939031
+SHA256 (grafana-6.4.0.linux-amd64.tar.gz) = 16b3b9f3be173fe290b0404d6d0473b5edb9979eb57faf469aaa3d7970e4cac3
+SIZE (grafana-6.4.0.linux-amd64.tar.gz) = 59632787
+SHA256 (grafana-grafana-v6.4.0_GH0.tar.gz) = a72adfa7900cdd09def73435e9c68e8760240798984731e2513537a91769830c
+SIZE (grafana-grafana-v6.4.0_GH0.tar.gz) = 13799663
diff --git a/www/grafana6/pkg-plist b/www/grafana6/pkg-plist
index 24ba955dce02..40fef37fe245 100644
--- a/www/grafana6/pkg-plist
+++ b/www/grafana6/pkg-plist
@@ -17,11 +17,15 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/AppNotifications/AppNotificationList.tsx
 %%DATADIR%%/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
 %%DATADIR%%/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
-%%DATADIR%%/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
 %%DATADIR%%/public/app/core/components/FilterInput/FilterInput.tsx
 %%DATADIR%%/public/app/core/components/Footer/Footer.tsx
-%%DATADIR%%/public/app/core/components/JSONFormatter/JSONFormatter.tsx
 %%DATADIR%%/public/app/core/components/LayoutSelector/LayoutSelector.tsx
+%%DATADIR%%/public/app/core/components/Login/ChangePassword.tsx
+%%DATADIR%%/public/app/core/components/Login/LoginCtrl.tsx
+%%DATADIR%%/public/app/core/components/Login/LoginForm.tsx
+%%DATADIR%%/public/app/core/components/Login/LoginPage.tsx
+%%DATADIR%%/public/app/core/components/Login/LoginServiceButtons.tsx
+%%DATADIR%%/public/app/core/components/Login/UserSignup.tsx
 %%DATADIR%%/public/app/core/components/OrgActionBar/OrgActionBar.test.tsx
 %%DATADIR%%/public/app/core/components/OrgActionBar/OrgActionBar.tsx
 %%DATADIR%%/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
@@ -37,6 +41,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/PermissionList/PermissionListItem.tsx
 %%DATADIR%%/public/app/core/components/PermissionList/PermissionsInfo.tsx
 %%DATADIR%%/public/app/core/components/PluginHelp/PluginHelp.tsx
+%%DATADIR%%/public/app/core/components/SafeDynamicImport.tsx
+%%DATADIR%%/public/app/core/components/Select/DashboardPicker.tsx
 %%DATADIR%%/public/app/core/components/Select/DataSourcePicker.tsx
 %%DATADIR%%/public/app/core/components/Select/MetricSelect.tsx
 %%DATADIR%%/public/app/core/components/Select/TeamPicker.test.tsx
@@ -50,8 +56,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/TagFilter/TagFilter.tsx
 %%DATADIR%%/public/app/core/components/TagFilter/TagOption.tsx
 %%DATADIR%%/public/app/core/components/TagFilter/TagValue.tsx
-%%DATADIR%%/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx
 %%DATADIR%%/public/app/core/components/WithFeatureToggle.tsx
+%%DATADIR%%/public/app/core/components/code_editor/brace.d.ts
 %%DATADIR%%/public/app/core/components/code_editor/code_editor.ts
 %%DATADIR%%/public/app/core/components/code_editor/theme-grafana-dark.js
 %%DATADIR%%/public/app/core/components/colorpicker/spectrum_picker.ts
@@ -60,8 +66,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/help/help.html
 %%DATADIR%%/public/app/core/components/help/help.ts
 %%DATADIR%%/public/app/core/components/info_popover.ts
-%%DATADIR%%/public/app/core/components/json_explorer/helpers.ts
-%%DATADIR%%/public/app/core/components/json_explorer/json_explorer.ts
 %%DATADIR%%/public/app/core/components/jsontree/jsontree.ts
 %%DATADIR%%/public/app/core/components/layout_selector/layout_selector.ts
 %%DATADIR%%/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -108,7 +112,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/controllers/error_ctrl.ts
 %%DATADIR%%/public/app/core/controllers/invited_ctrl.ts
 %%DATADIR%%/public/app/core/controllers/json_editor_ctrl.ts
-%%DATADIR%%/public/app/core/controllers/login_ctrl.ts
 %%DATADIR%%/public/app/core/controllers/reset_password_ctrl.ts
 %%DATADIR%%/public/app/core/controllers/signup_ctrl.ts
 %%DATADIR%%/public/app/core/copy/appNotification.ts
@@ -217,7 +220,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/utils/scrollbar.ts
 %%DATADIR%%/public/app/core/utils/sort_by_keys.ts
 %%DATADIR%%/public/app/core/utils/tags.ts
-%%DATADIR%%/public/app/core/utils/text.test.ts
 %%DATADIR%%/public/app/core/utils/text.ts
 %%DATADIR%%/public/app/core/utils/ticks.ts
 %%DATADIR%%/public/app/core/utils/timePicker.test.ts
@@ -229,11 +231,24 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/admin/AdminEditUserCtrl.ts
 %%DATADIR%%/public/app/features/admin/AdminListOrgsCtrl.ts
 %%DATADIR%%/public/app/features/admin/AdminListUsersCtrl.ts
+%%DATADIR%%/public/app/features/admin/DisabledUserInfo.tsx
 %%DATADIR%%/public/app/features/admin/ServerStats.test.tsx
 %%DATADIR%%/public/app/features/admin/ServerStats.tsx
 %%DATADIR%%/public/app/features/admin/StyleGuideCtrl.ts
+%%DATADIR%%/public/app/features/admin/UserInfo.tsx
+%%DATADIR%%/public/app/features/admin/UserSessions.tsx
+%%DATADIR%%/public/app/features/admin/UserSyncInfo.tsx
 %%DATADIR%%/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
 %%DATADIR%%/public/app/features/admin/index.ts
+%%DATADIR%%/public/app/features/admin/ldap/LdapConnectionStatus.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapPage.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapSyncInfo.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserGroups.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserInfo.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserMappingInfo.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserPage.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserPermissions.tsx
+%%DATADIR%%/public/app/features/admin/ldap/LdapUserTeams.tsx
 %%DATADIR%%/public/app/features/admin/partials/admin_home.html
 %%DATADIR%%/public/app/features/admin/partials/edit_org.html
 %%DATADIR%%/public/app/features/admin/partials/edit_user.html
@@ -243,7 +258,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/admin/partials/stats.html
 %%DATADIR%%/public/app/features/admin/partials/styleguide.html
 %%DATADIR%%/public/app/features/admin/partials/users.html
+%%DATADIR%%/public/app/features/admin/state/actions.ts
 %%DATADIR%%/public/app/features/admin/state/apis.ts
+%%DATADIR%%/public/app/features/admin/state/reducers.test.ts
+%%DATADIR%%/public/app/features/admin/state/reducers.ts
 %%DATADIR%%/public/app/features/alerting/AlertRuleItem.test.tsx
 %%DATADIR%%/public/app/features/alerting/AlertRuleItem.tsx
 %%DATADIR%%/public/app/features/alerting/AlertRuleList.test.tsx
@@ -258,6 +276,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/__snapshots__/AlertRuleItem.test.tsx.snap
 %%DATADIR%%/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
 %%DATADIR%%/public/app/features/alerting/__snapshots__/TestRuleResult.test.tsx.snap
+%%DATADIR%%/public/app/features/alerting/getAlertingValidationMessage.test.ts
+%%DATADIR%%/public/app/features/alerting/getAlertingValidationMessage.ts
 %%DATADIR%%/public/app/features/alerting/partials/alert_howto.html
 %%DATADIR%%/public/app/features/alerting/partials/alert_tab.html
 %%DATADIR%%/public/app/features/alerting/partials/notification_edit.html
@@ -371,7 +391,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
-%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelPluginError.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelResizer.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap
 %%DATADIR%%/public/app/features/dashboard/index.ts
@@ -388,6 +408,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx
 %%DATADIR%%/public/app/features/dashboard/panel_editor/VizTypePicker.tsx
 %%DATADIR%%/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx
+%%DATADIR%%/public/app/features/dashboard/panel_editor/state/actions.test.ts
+%%DATADIR%%/public/app/features/dashboard/panel_editor/state/actions.ts
+%%DATADIR%%/public/app/features/dashboard/panel_editor/state/reducers.test.ts
+%%DATADIR%%/public/app/features/dashboard/panel_editor/state/reducers.ts
 %%DATADIR%%/public/app/features/dashboard/services/ChangeTracker.test.ts
 %%DATADIR%%/public/app/features/dashboard/services/ChangeTracker.ts
 %%DATADIR%%/public/app/features/dashboard/services/DashboardLoaderSrv.ts
@@ -404,14 +428,14 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/state/PanelModel.ts
 %%DATADIR%%/public/app/features/dashboard/state/PanelQueryRunner.test.ts
 %%DATADIR%%/public/app/features/dashboard/state/PanelQueryRunner.ts
-%%DATADIR%%/public/app/features/dashboard/state/PanelQueryState.test.ts
-%%DATADIR%%/public/app/features/dashboard/state/PanelQueryState.ts
 %%DATADIR%%/public/app/features/dashboard/state/actions.ts
 %%DATADIR%%/public/app/features/dashboard/state/index.ts
 %%DATADIR%%/public/app/features/dashboard/state/initDashboard.test.ts
 %%DATADIR%%/public/app/features/dashboard/state/initDashboard.ts
 %%DATADIR%%/public/app/features/dashboard/state/reducers.test.ts
 %%DATADIR%%/public/app/features/dashboard/state/reducers.ts
+%%DATADIR%%/public/app/features/dashboard/state/runRequest.test.ts
+%%DATADIR%%/public/app/features/dashboard/state/runRequest.ts
 %%DATADIR%%/public/app/features/dashboard/utils/getPanelMenu.ts
 %%DATADIR%%/public/app/features/dashboard/utils/panel.test.ts
 %%DATADIR%%/public/app/features/dashboard/utils/panel.ts
@@ -458,35 +482,26 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/explore/AdHocFilterField.test.tsx
 %%DATADIR%%/public/app/features/explore/AdHocFilterField.tsx
 %%DATADIR%%/public/app/features/explore/ElapsedTime.tsx
-%%DATADIR%%/public/app/features/explore/Error.tsx
-%%DATADIR%%/public/app/features/explore/ErrorBoundary.tsx
 %%DATADIR%%/public/app/features/explore/ErrorContainer.tsx
 %%DATADIR%%/public/app/features/explore/Explore.tsx
+%%DATADIR%%/public/app/features/explore/ExploreGraphPanel.tsx
 %%DATADIR%%/public/app/features/explore/ExploreTimeControls.tsx
 %%DATADIR%%/public/app/features/explore/ExploreToolbar.tsx
-%%DATADIR%%/public/app/features/explore/Graph.test.tsx
-%%DATADIR%%/public/app/features/explore/Graph.tsx
-%%DATADIR%%/public/app/features/explore/GraphContainer.tsx
 %%DATADIR%%/public/app/features/explore/JSONViewer.tsx
 %%DATADIR%%/public/app/features/explore/LiveLogs.tsx
-%%DATADIR%%/public/app/features/explore/LogLabel.tsx
-%%DATADIR%%/public/app/features/explore/LogLabelStats.tsx
-%%DATADIR%%/public/app/features/explore/LogLabels.tsx
-%%DATADIR%%/public/app/features/explore/LogMessageAnsi.test.tsx
-%%DATADIR%%/public/app/features/explore/LogMessageAnsi.tsx
-%%DATADIR%%/public/app/features/explore/LogRow.tsx
-%%DATADIR%%/public/app/features/explore/LogRowContext.tsx
-%%DATADIR%%/public/app/features/explore/LogRowContextProvider.tsx
+%%DATADIR%%/public/app/features/explore/LiveTailButton.tsx
 %%DATADIR%%/public/app/features/explore/Logs.tsx
 %%DATADIR%%/public/app/features/explore/LogsContainer.tsx
 %%DATADIR%%/public/app/features/explore/NoDataSourceCallToAction.tsx
-%%DATADIR%%/public/app/features/explore/Panel.tsx
 %%DATADIR%%/public/app/features/explore/QueryEditor.tsx
 %%DATADIR%%/public/app/features/explore/QueryField.test.tsx
 %%DATADIR%%/public/app/features/explore/QueryField.tsx
 %%DATADIR%%/public/app/features/explore/QueryRow.tsx
 %%DATADIR%%/public/app/features/explore/QueryRows.tsx
+%%DATADIR%%/public/app/features/explore/QueryStatus.test.tsx
 %%DATADIR%%/public/app/features/explore/QueryStatus.tsx
+%%DATADIR%%/public/app/features/explore/ResponsiveButton.tsx
+%%DATADIR%%/public/app/features/explore/RunButton.tsx
 %%DATADIR%%/public/app/features/explore/Table.tsx
 %%DATADIR%%/public/app/features/explore/TableContainer.tsx
 %%DATADIR%%/public/app/features/explore/Typeahead.tsx
@@ -494,34 +509,26 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/explore/TypeaheadItem.tsx
 %%DATADIR%%/public/app/features/explore/Wrapper.tsx
 %%DATADIR%%/public/app/features/explore/__mocks__/mockData.ts
-%%DATADIR%%/public/app/features/explore/__snapshots__/Graph.test.tsx.snap
-%%DATADIR%%/public/app/features/explore/slate-plugins/braces.test.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/braces.test.tsx
 %%DATADIR%%/public/app/features/explore/slate-plugins/braces.ts
-%%DATADIR%%/public/app/features/explore/slate-plugins/clear.test.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/clear.test.tsx
 %%DATADIR%%/public/app/features/explore/slate-plugins/clear.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/clipboard.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/indentation.ts
 %%DATADIR%%/public/app/features/explore/slate-plugins/newline.ts
 %%DATADIR%%/public/app/features/explore/slate-plugins/prism/index.tsx
+%%DATADIR%%/public/app/features/explore/slate-plugins/runner.test.tsx
 %%DATADIR%%/public/app/features/explore/slate-plugins/runner.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/selection_shortcuts.ts
+%%DATADIR%%/public/app/features/explore/slate-plugins/suggestions.tsx
 %%DATADIR%%/public/app/features/explore/state/actionTypes.ts
 %%DATADIR%%/public/app/features/explore/state/actions.test.ts
 %%DATADIR%%/public/app/features/explore/state/actions.ts
-%%DATADIR%%/public/app/features/explore/state/epics/limitMessageRateEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/processQueryErrorsEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/processQueryErrorsEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/processQueryResultsEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/runQueriesBatchEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/runQueriesEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/runQueriesEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/stateSaveEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/stateSaveEpic.ts
-%%DATADIR%%/public/app/features/explore/state/epics/timeEpic.test.ts
-%%DATADIR%%/public/app/features/explore/state/epics/timeEpic.ts
 %%DATADIR%%/public/app/features/explore/state/reducers.test.ts
 %%DATADIR%%/public/app/features/explore/state/reducers.ts
 %%DATADIR%%/public/app/features/explore/state/selectors.test.ts
 %%DATADIR%%/public/app/features/explore/state/selectors.ts
+%%DATADIR%%/public/app/features/explore/utils/LogsCrossFadeTransition.tsx
 %%DATADIR%%/public/app/features/explore/utils/ResultProcessor.test.ts
 %%DATADIR%%/public/app/features/explore/utils/ResultProcessor.ts
 %%DATADIR%%/public/app/features/explore/utils/set.test.ts
@@ -576,6 +583,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/panel/panel_directive.ts
 %%DATADIR%%/public/app/features/panel/panel_editor_tab.ts
 %%DATADIR%%/public/app/features/panel/panel_header.ts
+%%DATADIR%%/public/app/features/panel/panellinks/linkSuppliers.ts
 %%DATADIR%%/public/app/features/panel/panellinks/link_srv.ts
 %%DATADIR%%/public/app/features/panel/panellinks/module.html
 %%DATADIR%%/public/app/features/panel/panellinks/module.ts
@@ -631,8 +639,11 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
 %%DATADIR%%/public/app/features/profile/ChangePasswordForm.tsx
 %%DATADIR%%/public/app/features/profile/ChangePasswordPage.tsx
-%%DATADIR%%/public/app/features/profile/PrefControlCtrl.ts
 %%DATADIR%%/public/app/features/profile/ProfileCtrl.ts
+%%DATADIR%%/public/app/features/profile/ReactProfileWrapper.tsx
+%%DATADIR%%/public/app/features/profile/UserOrganizations.tsx
+%%DATADIR%%/public/app/features/profile/UserProfileEditForm.tsx
+%%DATADIR%%/public/app/features/profile/UserTeams.tsx
 %%DATADIR%%/public/app/features/profile/all.ts
 %%DATADIR%%/public/app/features/profile/partials/profile.html
 %%DATADIR%%/public/app/features/profile/state/reducers.ts
@@ -707,7 +718,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/partials/confirm_modal.html
 %%DATADIR%%/public/app/partials/edit_json.html
 %%DATADIR%%/public/app/partials/error.html
-%%DATADIR%%/public/app/partials/login.html
 %%DATADIR%%/public/app/partials/modal.html
 %%DATADIR%%/public/app/partials/reset_password.html
 %%DATADIR%%/public/app/partials/signup_invited.html
@@ -742,6 +752,15 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts
 %%DATADIR%%/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/cloudwatch/types.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/dashboard/README.md
+%%DATADIR%%/public/app/plugins/datasource/dashboard/datasource.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/index.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/module.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/plugin.json
+%%DATADIR%%/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/runSharedRequest.ts
+%%DATADIR%%/public/app/plugins/datasource/dashboard/types.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/README.md
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/bucket_agg.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx
@@ -770,8 +789,11 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/specs/query_builder.test.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/types.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query_ctrl.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__snapshots__/ConfigEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts
@@ -788,7 +810,16 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/supported_namespaces.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.ts
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/config_ctrl.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/css/query_editor.css
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx
@@ -808,9 +839,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/config.html
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts
@@ -888,12 +918,14 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/input/module.ts
 %%DATADIR%%/public/app/plugins/datasource/input/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/input/types.ts
+%%DATADIR%%/public/app/plugins/datasource/input/utils.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/LokiAnnotationsQueryCtrl.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/README.md
+%%DATADIR%%/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryField.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx
-%%DATADIR%%/public/app/plugins/datasource/loki/components/LokiStartPage.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/useLokiLabels.test.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/components/useLokiLabels.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/components/useLokiSyntax.test.ts
@@ -904,7 +936,11 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/loki/img/loki_icon.svg
 %%DATADIR%%/public/app/plugins/datasource/loki/language_provider.test.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/language_provider.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/live_streams.test.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/live_streams.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/mocks.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/module.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/partials/annotations.editor.html
 %%DATADIR%%/public/app/plugins/datasource/loki/partials/config.html
 %%DATADIR%%/public/app/plugins/datasource/loki/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/loki/query_utils.test.ts
@@ -913,8 +949,9 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/loki/result_transformer.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/syntax.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/types.ts
+%%DATADIR%%/public/app/plugins/datasource/mixed/MixedDataSource.test.ts
+%%DATADIR%%/public/app/plugins/datasource/mixed/MixedDataSource.ts
 %%DATADIR%%/public/app/plugins/datasource/mixed/README.md
-%%DATADIR%%/public/app/plugins/datasource/mixed/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/mixed/module.ts
 %%DATADIR%%/public/app/plugins/datasource/mixed/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/mssql/README.md
@@ -981,12 +1018,12 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
-%%DATADIR%%/public/app/plugins/datasource/prometheus/components/PromStart.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/__snapshots__/PromQueryEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/prometheus/config_ctrl.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
+%%DATADIR%%/public/app/plugins/datasource/prometheus/datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
 %%DATADIR%%/public/app/plugins/datasource/prometheus/language_provider.ts
@@ -1051,16 +1088,20 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/stackdriver/specs/testData.ts
 %%DATADIR%%/public/app/plugins/datasource/stackdriver/types.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/ConfigEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/testdata/LogIpsum.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/QueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/testdata/StreamHandler.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/TestInfoTab.tsx
 %%DATADIR%%/public/app/plugins/datasource/testdata/dashboards/streaming.json
 %%DATADIR%%/public/app/plugins/datasource/testdata/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/img/testdata.svg
+%%DATADIR%%/public/app/plugins/datasource/testdata/metricTree.test.ts
+%%DATADIR%%/public/app/plugins/datasource/testdata/metricTree.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/module.tsx
 %%DATADIR%%/public/app/plugins/datasource/testdata/partials/query.editor.html
 %%DATADIR%%/public/app/plugins/datasource/testdata/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/testdata/query_ctrl.ts
+%%DATADIR%%/public/app/plugins/datasource/testdata/runStreams.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/types.ts
 %%DATADIR%%/public/app/plugins/panel/alertlist/README.md
 %%DATADIR%%/public/app/plugins/panel/alertlist/editor.html
@@ -1171,6 +1212,12 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_ctrl.test.ts
 %%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_data_converter.test.ts
 %%DATADIR%%/public/app/plugins/panel/heatmap/types.ts
+%%DATADIR%%/public/app/plugins/panel/logs/LogsPanel.tsx
+%%DATADIR%%/public/app/plugins/panel/logs/LogsPanelEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/logs/img/icn-logs-panel.svg
+%%DATADIR%%/public/app/plugins/panel/logs/module.tsx
+%%DATADIR%%/public/app/plugins/panel/logs/plugin.json
+%%DATADIR%%/public/app/plugins/panel/logs/types.ts
 %%DATADIR%%/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx
 %%DATADIR%%/public/app/plugins/panel/piechart/PieChartPanel.tsx
 %%DATADIR%%/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx
@@ -1256,6 +1303,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/types/folders.ts
 %%DATADIR%%/public/app/types/index.ts
 %%DATADIR%%/public/app/types/jquery/jquery.d.ts
+%%DATADIR%%/public/app/types/ldap.ts
 %%DATADIR%%/public/app/types/location.ts
 %%DATADIR%%/public/app/types/organization.ts
 %%DATADIR%%/public/app/types/plugins.ts
@@ -1264,32 +1312,136 @@ bin/grafana-server
 %%DATADIR%%/public/app/types/teams.ts
 %%DATADIR%%/public/app/types/templates.ts
 %%DATADIR%%/public/app/types/user.ts
-%%DATADIR%%/public/build/app.75ccb77dbb4b5e3c9285.js
-%%DATADIR%%/public/build/app.75ccb77dbb4b5e3c9285.js.map
-%%DATADIR%%/public/build/dark.75ccb77dbb4b5e3c9285.js
-%%DATADIR%%/public/build/dark.75ccb77dbb4b5e3c9285.js.map
-%%DATADIR%%/public/build/explore.75ccb77dbb4b5e3c9285.js
-%%DATADIR%%/public/build/explore.75ccb77dbb4b5e3c9285.js.map
-%%DATADIR%%/public/build/grafana.dark.75ccb77dbb4b5e3c9285.css
-%%DATADIR%%/public/build/grafana.light.75ccb77dbb4b5e3c9285.css
-%%DATADIR%%/public/build/light.75ccb77dbb4b5e3c9285.js
-%%DATADIR%%/public/build/light.75ccb77dbb4b5e3c9285.js.map
-%%DATADIR%%/public/build/vendor.75ccb77dbb4b5e3c9285.js
-%%DATADIR%%/public/build/vendor.75ccb77dbb4b5e3c9285.js.map
+%%DATADIR%%/public/build/46.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/46.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/47.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/47.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/48.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/48.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/49.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/49.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/50.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/50.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/51.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/51.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/52.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/52.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/53.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/53.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/54.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/54.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/55.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/55.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/56.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/56.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/57.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/57.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/58.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/58.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/59.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/59.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/60.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/60.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/AlertRuleList.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/AlertRuleList.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/ApiKeysPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/ApiKeysPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/AppRootPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/AppRootPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/DashboardPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/DashboardPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/DataSourceDashboards.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/DataSourceDashboards.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/DataSourceSettingsPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/DataSourceSettingsPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/DataSourcesListPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/DataSourcesListPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/FolderPermissions.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/FolderPermissions.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/FolderSettingsPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/FolderSettingsPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/NewDataSourcePage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/NewDataSourcePage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/OrgDetailsPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/OrgDetailsPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/PluginListPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/PluginListPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/PluginPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/PluginPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/ServerStats.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/ServerStats.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/SoloPanelPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/SoloPanelPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/TeamList.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/TeamList.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/TeamPages.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/TeamPages.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/UsersListPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/UsersListPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/angular~app.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/angular~app.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/app.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/app.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/azureMonitorPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/azureMonitorPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/brace.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/brace.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/cloudwatchPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/cloudwatchPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/dark.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/dark.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/default~DashboardPage~SoloPanelPage.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/default~DashboardPage~SoloPanelPage.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/elasticsearchPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/elasticsearchPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/exampleApp.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/exampleApp.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/explore.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/explore.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/grafana.dark.317cab0c5862d6c99844.css
+%%DATADIR%%/public/build/grafana.light.317cab0c5862d6c99844.css
+%%DATADIR%%/public/build/grafanaPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/grafanaPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/graphitePlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/graphitePlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/influxdbPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/influxdbPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/inputDatasourcePlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/inputDatasourcePlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/light.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/light.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/lokiPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/lokiPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/mixedPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/mixedPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/moment~app.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/moment~app.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/mssqlPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/mssqlPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/mysqlPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/mysqlPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/opentsdbPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/opentsdbPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/postgresPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/postgresPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/prometheusPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/prometheusPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/rst2html.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/rst2html.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/runtime.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/runtime.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/stackdriverPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/stackdriverPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/testDataDSPlugin.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/testDataDSPlugin.317cab0c5862d6c99844.js.map
+%%DATADIR%%/public/build/vendors~app.317cab0c5862d6c99844.js
+%%DATADIR%%/public/build/vendors~app.317cab0c5862d6c99844.js.map
 %%DATADIR%%/public/dashboards/default.json
 %%DATADIR%%/public/dashboards/home.json
 %%DATADIR%%/public/dashboards/scripted.js
 %%DATADIR%%/public/dashboards/scripted_async.js
 %%DATADIR%%/public/dashboards/scripted_templated.js
 %%DATADIR%%/public/dashboards/template_vars.json
-%%DATADIR%%/public/e2e-test/core/constants.ts
-%%DATADIR%%/public/e2e-test/core/images.ts
-%%DATADIR%%/public/e2e-test/core/launcher.ts
-%%DATADIR%%/public/e2e-test/core/login.ts
-%%DATADIR%%/public/e2e-test/core/pageObjects.ts
-%%DATADIR%%/public/e2e-test/core/pages.ts
-%%DATADIR%%/public/e2e-test/core/scenario.ts
-%%DATADIR%%/public/e2e-test/install/install.ts
 %%DATADIR%%/public/e2e-test/pages/dashboards/createDashboardPage.ts
 %%DATADIR%%/public/e2e-test/pages/dashboards/dashboardsPage.ts
 %%DATADIR%%/public/e2e-test/pages/dashboards/saveDashboardModal.ts
@@ -1299,7 +1451,6 @@ bin/grafana-server
 %%DATADIR%%/public/e2e-test/pages/panels/editPanel.ts
 %%DATADIR%%/public/e2e-test/pages/panels/panel.ts
 %%DATADIR%%/public/e2e-test/pages/panels/sharePanelModal.ts
-%%DATADIR%%/public/e2e-test/pages/start/loginPage.ts
 %%DATADIR%%/public/e2e-test/scenarios/smoke.test.ts
 %%DATADIR%%/public/e2e-test/screenShots/theTruth/smoke-test-scenario.png
 %%DATADIR%%/public/emails/README.md
@@ -1550,8 +1701,10 @@ bin/grafana-server
 %%DATADIR%%/public/sass/_grafana.scss
 %%DATADIR%%/public/sass/_old_responsive.scss
 %%DATADIR%%/public/sass/_variables.dark.generated.scss
+%%DATADIR%%/public/sass/_variables.dark.generated.scss.rej
 %%DATADIR%%/public/sass/_variables.generated.scss
 %%DATADIR%%/public/sass/_variables.light.generated.scss
+%%DATADIR%%/public/sass/_variables.light.generated.scss.rej
 %%DATADIR%%/public/sass/base/_code.scss
 %%DATADIR%%/public/sass/base/_font_awesome.scss
 %%DATADIR%%/public/sass/base/_fonts.scss
@@ -1585,7 +1738,6 @@ bin/grafana-server
 %%DATADIR%%/public/sass/components/_dashboard_settings.scss
 %%DATADIR%%/public/sass/components/_drop.scss
 %%DATADIR%%/public/sass/components/_dropdown.scss
-%%DATADIR%%/public/sass/components/_empty_list_cta.scss
 %%DATADIR%%/public/sass/components/_filter-controls.scss
 %%DATADIR%%/public/sass/components/_filter-list.scss
 %%DATADIR%%/public/sass/components/_filter-table.scss
@@ -1668,7 +1820,6 @@ bin/grafana-server
 %%DATADIR%%/public/sass/utils/_utils.scss
 %%DATADIR%%/public/sass/utils/_validation.scss
 %%DATADIR%%/public/sass/utils/_widths.scss
-%%DATADIR%%/public/test/core/redux/epicTester.ts
 %%DATADIR%%/public/test/core/redux/reducerTester.test.ts
 %%DATADIR%%/public/test/core/redux/reducerTester.ts
 %%DATADIR%%/public/test/core/thunk/thunkTester.ts
@@ -1688,7 +1839,6 @@ bin/grafana-server
 %%DATADIR%%/public/vendor/angular-other/angular-strap.js
 %%DATADIR%%/public/vendor/angular-other/datepicker.js
 %%DATADIR%%/public/vendor/angular-other/timepicker.js
-%%DATADIR%%/public/vendor/ansicolor/ansicolor.ts
 %%DATADIR%%/public/vendor/bootstrap/bootstrap.js
 %%DATADIR%%/public/vendor/css/rc-cascader.scss
 %%DATADIR%%/public/vendor/css/timepicker.css