+
+
-
+
Edit Panel
diff --git a/public/sass/components/_panel_add_panel.scss b/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
similarity index 81%
rename from public/sass/components/_panel_add_panel.scss
rename to public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
index 86921fb43f3..5a1cbee4b44 100644
--- a/public/sass/components/_panel_add_panel.scss
+++ b/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
@@ -1,12 +1,12 @@
-.add-panel-container {
+.add-panel-widget-container {
height: 100%;
}
-.add-panel {
+.add-panel-widget {
height: 100%;
}
-.add-panel__header {
+.add-panel-widget__header {
top: 0;
position: absolute;
padding: 0 15px;
@@ -26,7 +26,7 @@
}
}
-.add-panel__close {
+.add-panel-widget__close {
margin-left: auto;
background-color: transparent;
border: 0;
@@ -34,7 +34,7 @@
margin-right: -10px;
}
-.add-panel-btn-container {
+.add-panel-widget__btn-container {
display: flex;
justify-content: center;
align-items: center;
diff --git a/public/app/features/dashboard/components/AddPanelWidget/index.ts b/public/app/features/dashboard/components/AddPanelWidget/index.ts
new file mode 100644
index 00000000000..b96948ab1c0
--- /dev/null
+++ b/public/app/features/dashboard/components/AddPanelWidget/index.ts
@@ -0,0 +1 @@
+export { AddPanelWidget } from './AddPanelWidget';
diff --git a/public/app/features/dashboard/export/export_modal.ts b/public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
similarity index 92%
rename from public/app/features/dashboard/export/export_modal.ts
rename to public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
index 8136c77cd8f..7769bdf114a 100644
--- a/public/app/features/dashboard/export/export_modal.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
@@ -2,7 +2,7 @@ import angular from 'angular';
import { saveAs } from 'file-saver';
import coreModule from 'app/core/core_module';
-import { DashboardExporter } from './exporter';
+import { DashboardExporter } from './DashboardExporter';
export class DashExportCtrl {
dash: any;
@@ -66,7 +66,7 @@ export class DashExportCtrl {
export function dashExportDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/export/export_modal.html',
+ templateUrl: 'public/app/features/dashboard/components/DashExportModal/template.html',
controller: DashExportCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/specs/exporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
similarity index 98%
rename from public/app/features/dashboard/specs/exporter.test.ts
rename to public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
index eac6b0b272a..20ab21541a5 100644
--- a/public/app/features/dashboard/specs/exporter.test.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
@@ -6,8 +6,8 @@ jest.mock('app/core/store', () => {
import _ from 'lodash';
import config from 'app/core/config';
-import { DashboardExporter } from '../export/exporter';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardExporter } from './DashboardExporter';
+import { DashboardModel } from '../../dashboard_model';
describe('given dashboard with repeated panels', () => {
let dash, exported;
diff --git a/public/app/features/dashboard/export/exporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
similarity index 98%
rename from public/app/features/dashboard/export/exporter.ts
rename to public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index 7aecb5c384f..22b93b767d6 100644
--- a/public/app/features/dashboard/export/exporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -1,6 +1,6 @@
import config from 'app/core/config';
import _ from 'lodash';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export class DashboardExporter {
constructor(private datasourceSrv) {}
diff --git a/public/app/features/dashboard/components/DashExportModal/index.ts b/public/app/features/dashboard/components/DashExportModal/index.ts
new file mode 100644
index 00000000000..6529cf07ad9
--- /dev/null
+++ b/public/app/features/dashboard/components/DashExportModal/index.ts
@@ -0,0 +1,2 @@
+export { DashboardExporter } from './DashboardExporter';
+export { DashExportCtrl } from './DashExportCtrl';
diff --git a/public/app/features/dashboard/export/export_modal.html b/public/app/features/dashboard/components/DashExportModal/template.html
similarity index 100%
rename from public/app/features/dashboard/export/export_modal.html
rename to public/app/features/dashboard/components/DashExportModal/template.html
diff --git a/public/app/features/dashboard/dashlinks/module.ts b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
similarity index 99%
rename from public/app/features/dashboard/dashlinks/module.ts
rename to public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
index c951538d45d..a08e438a46c 100644
--- a/public/app/features/dashboard/dashlinks/module.ts
+++ b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import { iconMap } from './editor';
+import { iconMap } from './DashLinksEditorCtrl';
function dashLinksContainer() {
return {
diff --git a/public/app/features/dashboard/dashlinks/editor.ts b/public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
similarity index 90%
rename from public/app/features/dashboard/dashlinks/editor.ts
rename to public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
index 482052469db..398ad757bf3 100644
--- a/public/app/features/dashboard/dashlinks/editor.ts
+++ b/public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
@@ -11,7 +11,7 @@ export let iconMap = {
cloud: 'fa-cloud',
};
-export class DashLinkEditorCtrl {
+export class DashLinksEditorCtrl {
dashboard: any;
iconMap: any;
mode: any;
@@ -65,8 +65,8 @@ export class DashLinkEditorCtrl {
function dashLinksEditor() {
return {
restrict: 'E',
- controller: DashLinkEditorCtrl,
- templateUrl: 'public/app/features/dashboard/dashlinks/editor.html',
+ controller: DashLinksEditorCtrl,
+ templateUrl: 'public/app/features/dashboard/components/DashLinks/editor.html',
bindToController: true,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashboard/dashlinks/editor.html b/public/app/features/dashboard/components/DashLinks/editor.html
similarity index 100%
rename from public/app/features/dashboard/dashlinks/editor.html
rename to public/app/features/dashboard/components/DashLinks/editor.html
diff --git a/public/app/features/dashboard/components/DashLinks/index.ts b/public/app/features/dashboard/components/DashLinks/index.ts
new file mode 100644
index 00000000000..ef118d4a84c
--- /dev/null
+++ b/public/app/features/dashboard/components/DashLinks/index.ts
@@ -0,0 +1,2 @@
+export { DashLinksContainerCtrl } from './DashLinksContainerCtrl';
+export { DashLinksEditorCtrl } from './DashLinksEditorCtrl';
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
similarity index 92%
rename from public/app/features/dashboard/dashnav/dashnav.ts
rename to public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
index 1c83b2d0bdb..d7305b948dc 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
@@ -1,7 +1,7 @@
import moment from 'moment';
import angular from 'angular';
import { appEvents, NavModel } from 'app/core/core';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export class DashNavCtrl {
dashboard: DashboardModel;
@@ -60,7 +60,7 @@ export class DashNavCtrl {
modalScope.dashboard = this.dashboard;
appEvents.emit('show-modal', {
- src: 'public/app/features/dashboard/partials/shareModal.html',
+ src: 'public/app/features/dashboard/components/ShareModal/template.html',
scope: modalScope,
});
}
@@ -107,7 +107,7 @@ export class DashNavCtrl {
export function dashNavDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/dashnav/dashnav.html',
+ templateUrl: 'public/app/features/dashboard/components/DashNav/template.html',
controller: DashNavCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/components/DashNav/index.ts b/public/app/features/dashboard/components/DashNav/index.ts
new file mode 100644
index 00000000000..854e32b24d2
--- /dev/null
+++ b/public/app/features/dashboard/components/DashNav/index.ts
@@ -0,0 +1 @@
+export { DashNavCtrl } from './DashNavCtrl';
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/components/DashNav/template.html
similarity index 100%
rename from public/app/features/dashboard/dashnav/dashnav.html
rename to public/app/features/dashboard/components/DashNav/template.html
diff --git a/public/app/features/dashboard/permissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
similarity index 97%
rename from public/app/features/dashboard/permissions/DashboardPermissions.tsx
rename to public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index 265d11161ea..ce6a866ce57 100644
--- a/public/app/features/dashboard/permissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -8,11 +8,11 @@ import {
addDashboardPermission,
removeDashboardPermission,
updateDashboardPermission,
-} from '../state/actions';
+} from '../../state/actions';
import PermissionList from 'app/core/components/PermissionList/PermissionList';
import AddPermission from 'app/core/components/PermissionList/AddPermission';
import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
-import { connectWithStore } from '../../../core/utils/connectWithReduxStore';
+import { connectWithStore } from 'app/core/utils/connectWithReduxStore';
export interface Props {
dashboardId: number;
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
similarity index 97%
rename from public/app/features/dashboard/settings/settings.ts
rename to public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
index 1e8d96a54cb..a0eb5c8c6b3 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
@@ -1,5 +1,5 @@
import { coreModule, appEvents, contextSrv } from 'app/core/core';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
import $ from 'jquery';
import _ from 'lodash';
import angular from 'angular';
@@ -230,7 +230,7 @@ export class SettingsCtrl {
export function dashboardSettings() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/settings/settings.html',
+ templateUrl: 'public/app/features/dashboard/components/DashboardSettings/template.html',
controller: SettingsCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/components/DashboardSettings/index.ts b/public/app/features/dashboard/components/DashboardSettings/index.ts
new file mode 100644
index 00000000000..f81b8cdbc67
--- /dev/null
+++ b/public/app/features/dashboard/components/DashboardSettings/index.ts
@@ -0,0 +1 @@
+export { SettingsCtrl } from './SettingsCtrl';
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/components/DashboardSettings/template.html
similarity index 98%
rename from public/app/features/dashboard/settings/settings.html
rename to public/app/features/dashboard/components/DashboardSettings/template.html
index 46d84a7a2fd..97002f7bf92 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/components/DashboardSettings/template.html
@@ -51,7 +51,8 @@
on-change="ctrl.onFolderChange($folder)"
enable-create-new="true"
is-valid-selection="true"
- label-class="width-7">
+ label-class="width-7"
+ dashboard-id="ctrl.dashboard.id">
diff --git a/public/app/features/dashboard/export_data/export_data_modal.ts b/public/app/features/dashboard/components/ExportDataModal/ExportDataModalCtrl.ts
similarity index 92%
rename from public/app/features/dashboard/export_data/export_data_modal.ts
rename to public/app/features/dashboard/components/ExportDataModal/ExportDataModalCtrl.ts
index 460f80079d9..f87daa94ee7 100644
--- a/public/app/features/dashboard/export_data/export_data_modal.ts
+++ b/public/app/features/dashboard/components/ExportDataModal/ExportDataModalCtrl.ts
@@ -31,7 +31,7 @@ export class ExportDataModalCtrl {
export function exportDataModal() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/export_data/export_data_modal.html',
+ templateUrl: 'public/app/features/dashboard/components/ExportDataModal/template.html',
controller: ExportDataModalCtrl,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashboard/components/ExportDataModal/index.ts b/public/app/features/dashboard/components/ExportDataModal/index.ts
new file mode 100644
index 00000000000..6df4fd00434
--- /dev/null
+++ b/public/app/features/dashboard/components/ExportDataModal/index.ts
@@ -0,0 +1 @@
+export { ExportDataModalCtrl } from './ExportDataModalCtrl';
diff --git a/public/app/features/dashboard/export_data/export_data_modal.html b/public/app/features/dashboard/components/ExportDataModal/template.html
similarity index 100%
rename from public/app/features/dashboard/export_data/export_data_modal.html
rename to public/app/features/dashboard/components/ExportDataModal/template.html
diff --git a/public/app/features/dashboard/folder_picker/folder_picker.ts b/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
similarity index 90%
rename from public/app/features/dashboard/folder_picker/folder_picker.ts
rename to public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
index 80651fecb7e..93d43d36038 100644
--- a/public/app/features/dashboard/folder_picker/folder_picker.ts
+++ b/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
@@ -21,6 +21,7 @@ export class FolderPickerCtrl {
hasValidationError: boolean;
validationError: any;
isEditor: boolean;
+ dashboardId?: number;
/** @ngInject */
constructor(private backendSrv, private validationSrv, private contextSrv) {
@@ -144,7 +145,13 @@ export class FolderPickerCtrl {
if (this.isEditor) {
folder = rootFolder;
} else {
- folder = result.length > 0 ? result[0] : resetFolder;
+ // We shouldn't assign a random folder without the user actively choosing it on a persisted dashboard
+ const isPersistedDashBoard = this.dashboardId ? true : false;
+ if (isPersistedDashBoard) {
+ folder = resetFolder;
+ } else {
+ folder = result.length > 0 ? result[0] : resetFolder;
+ }
}
}
@@ -161,7 +168,7 @@ export class FolderPickerCtrl {
export function folderPicker() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/folder_picker/folder_picker.html',
+ templateUrl: 'public/app/features/dashboard/components/FolderPicker/template.html',
controller: FolderPickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@@ -176,6 +183,7 @@ export function folderPicker() {
exitFolderCreation: '&',
enableCreateNew: '@',
enableReset: '@',
+ dashboardId: ' {
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
similarity index 96%
rename from public/app/features/dashboard/save_as_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
index 4649bc18f9f..6a470785fdb 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
@@ -25,7 +25,8 @@ const template = `
enter-folder-creation="ctrl.onEnterFolderCreation()"
exit-folder-creation="ctrl.onExitFolderCreation()"
enable-create-new="true"
- label-class="width-7">
+ label-class="width-7"
+ dashboard-id="ctrl.clone.id">
diff --git a/public/app/features/dashboard/specs/save_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
similarity index 97%
rename from public/app/features/dashboard/specs/save_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
index 669ae43a0ff..f973c1b8e63 100644
--- a/public/app/features/dashboard/specs/save_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveDashboardModalCtrl } from '../save_modal';
+import { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
const setup = (timeChanged, variableValuesChanged, cb) => {
const dash = {
diff --git a/public/app/features/dashboard/save_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
diff --git a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
similarity index 87%
rename from public/app/features/dashboard/specs/save_provisioned_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
index a3ab27a984f..86048e861bd 100644
--- a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveProvisionedDashboardModalCtrl } from '../save_provisioned_modal';
+import { SaveProvisionedDashboardModalCtrl } from './SaveProvisionedDashboardModalCtrl';
describe('SaveProvisionedDashboardModalCtrl', () => {
const json = {
diff --git a/public/app/features/dashboard/save_provisioned_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_provisioned_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts
diff --git a/public/app/features/dashboard/components/SaveModals/index.ts b/public/app/features/dashboard/components/SaveModals/index.ts
new file mode 100644
index 00000000000..afab0796d28
--- /dev/null
+++ b/public/app/features/dashboard/components/SaveModals/index.ts
@@ -0,0 +1,2 @@
+export { SaveDashboardAsModalCtrl } from './SaveDashboardAsModalCtrl';
+export { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
diff --git a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
similarity index 96%
rename from public/app/features/dashboard/specs/share_modal_ctrl.test.ts
rename to public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
index 70d301ed5ff..3181231cb53 100644
--- a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
+++ b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
@@ -1,7 +1,6 @@
-import '../shareModalCtrl';
-import { ShareModalCtrl } from '../shareModalCtrl';
import config from 'app/core/config';
-import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
+import { LinkSrv } from 'app/features/panel/panellinks/link_srv';
+import { ShareModalCtrl } from './ShareModalCtrl';
describe('ShareModalCtrl', () => {
const ctx = {
diff --git a/public/app/features/dashboard/shareModalCtrl.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/shareModalCtrl.ts
rename to public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts
diff --git a/public/app/features/dashboard/share_snapshot_ctrl.ts b/public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/share_snapshot_ctrl.ts
rename to public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
diff --git a/public/app/features/dashboard/components/ShareModal/index.ts b/public/app/features/dashboard/components/ShareModal/index.ts
new file mode 100644
index 00000000000..3f27d5a1ba3
--- /dev/null
+++ b/public/app/features/dashboard/components/ShareModal/index.ts
@@ -0,0 +1,2 @@
+export { ShareModalCtrl } from './ShareModalCtrl';
+export { ShareSnapshotCtrl } from './ShareSnapshotCtrl';
diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/components/ShareModal/template.html
similarity index 100%
rename from public/app/features/dashboard/partials/shareModal.html
rename to public/app/features/dashboard/components/ShareModal/template.html
diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
similarity index 86%
rename from public/app/features/dashboard/submenu/submenu.ts
rename to public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
index 184d29facee..502e467ad2b 100644
--- a/public/app/features/dashboard/submenu/submenu.ts
+++ b/public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
@@ -1,7 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
-export class SubmenuCtrl {
+export class SubMenuCtrl {
annotations: any;
variables: any;
dashboard: any;
@@ -29,8 +29,8 @@ export class SubmenuCtrl {
export function submenuDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/submenu/submenu.html',
- controller: SubmenuCtrl,
+ templateUrl: 'public/app/features/dashboard/components/SubMenu/template.html',
+ controller: SubMenuCtrl,
bindToController: true,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashboard/components/SubMenu/index.ts b/public/app/features/dashboard/components/SubMenu/index.ts
new file mode 100644
index 00000000000..1790aa66782
--- /dev/null
+++ b/public/app/features/dashboard/components/SubMenu/index.ts
@@ -0,0 +1 @@
+export { SubMenuCtrl } from './SubMenuCtrl';
diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/components/SubMenu/template.html
similarity index 100%
rename from public/app/features/dashboard/submenu/submenu.html
rename to public/app/features/dashboard/components/SubMenu/template.html
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
similarity index 95%
rename from public/app/features/dashboard/timepicker/timepicker.ts
rename to public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
index c89e49b54b3..0c388c27f8d 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
@@ -159,7 +159,7 @@ export class TimePickerCtrl {
export function settingsDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/timepicker/settings.html',
+ templateUrl: 'public/app/features/dashboard/components/TimePicker/settings.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@@ -172,7 +172,7 @@ export function settingsDirective() {
export function timePickerDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/timepicker/timepicker.html',
+ templateUrl: 'public/app/features/dashboard/components/TimePicker/template.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@@ -185,5 +185,5 @@ export function timePickerDirective() {
angular.module('grafana.directives').directive('gfTimePickerSettings', settingsDirective);
angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective);
-import { inputDateDirective } from './input_date';
+import { inputDateDirective } from './validation';
angular.module('grafana.directives').directive('inputDatetime', inputDateDirective);
diff --git a/public/app/features/dashboard/components/TimePicker/index.ts b/public/app/features/dashboard/components/TimePicker/index.ts
new file mode 100644
index 00000000000..ca6e2792c43
--- /dev/null
+++ b/public/app/features/dashboard/components/TimePicker/index.ts
@@ -0,0 +1 @@
+export { TimePickerCtrl } from './TimePickerCtrl';
diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/components/TimePicker/settings.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/settings.html
rename to public/app/features/dashboard/components/TimePicker/settings.html
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/components/TimePicker/template.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/timepicker.html
rename to public/app/features/dashboard/components/TimePicker/template.html
diff --git a/public/app/features/dashboard/timepicker/input_date.ts b/public/app/features/dashboard/components/TimePicker/validation.ts
similarity index 100%
rename from public/app/features/dashboard/timepicker/input_date.ts
rename to public/app/features/dashboard/components/TimePicker/validation.ts
diff --git a/public/app/features/dashboard/unsaved_changes_modal.ts b/public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/unsaved_changes_modal.ts
rename to public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
diff --git a/public/app/features/dashboard/components/UnsavedChangesModal/index.ts b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
new file mode 100644
index 00000000000..43943f06694
--- /dev/null
+++ b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
@@ -0,0 +1 @@
+export { UnsavedChangesModalCtrl } from './UnsavedChangesModalCtrl';
diff --git a/public/app/features/dashboard/specs/history_ctrl.test.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
similarity index 98%
rename from public/app/features/dashboard/specs/history_ctrl.test.ts
rename to public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
index 632f3489dae..2b257e148f5 100644
--- a/public/app/features/dashboard/specs/history_ctrl.test.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import { HistoryListCtrl } from 'app/features/dashboard/history/history';
-import { versions, compare, restore } from './history_mocks';
+import { HistoryListCtrl } from './HistoryListCtrl';
+import { versions, compare, restore } from './__mocks__/history';
import $q from 'q';
describe('HistoryListCtrl', () => {
diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
similarity index 96%
rename from public/app/features/dashboard/history/history.ts
rename to public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
index 3563ccc7766..b8632e2eeae 100644
--- a/public/app/features/dashboard/history/history.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
@@ -1,12 +1,10 @@
-import './history_srv';
-
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import locationUtil from 'app/core/utils/location_util';
-import { DashboardModel } from '../dashboard_model';
-import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './history_srv';
+import { DashboardModel } from '../../dashboard_model';
+import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv';
export class HistoryListCtrl {
appending: boolean;
@@ -200,7 +198,7 @@ export class HistoryListCtrl {
export function dashboardHistoryDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/history/history.html',
+ templateUrl: 'public/app/features/dashboard/components/VersionHistory/template.html',
controller: HistoryListCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/specs/history_srv.test.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
similarity index 90%
rename from public/app/features/dashboard/specs/history_srv.test.ts
rename to public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
index 1e2bd57a221..75766060e7f 100644
--- a/public/app/features/dashboard/specs/history_srv.test.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
@@ -1,7 +1,6 @@
-import '../history/history_srv';
-import { versions, restore } from './history_mocks';
-import { HistorySrv } from '../history/history_srv';
-import { DashboardModel } from '../dashboard_model';
+import { versions, restore } from './__mocks__/history';
+import { HistorySrv } from './HistorySrv';
+import { DashboardModel } from '../../dashboard_model';
jest.mock('app/core/store');
describe('historySrv', () => {
diff --git a/public/app/features/dashboard/history/history_srv.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
similarity index 96%
rename from public/app/features/dashboard/history/history_srv.ts
rename to public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
index 7f7dc950de3..d52f3ab879c 100644
--- a/public/app/features/dashboard/history/history_srv.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
@@ -1,6 +1,6 @@
import _ from 'lodash';
import coreModule from 'app/core/core_module';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export interface HistoryListOpts {
limit: number;
diff --git a/public/app/features/dashboard/specs/history_mocks.ts b/public/app/features/dashboard/components/VersionHistory/__mocks__/history.ts
similarity index 100%
rename from public/app/features/dashboard/specs/history_mocks.ts
rename to public/app/features/dashboard/components/VersionHistory/__mocks__/history.ts
diff --git a/public/app/features/dashboard/components/VersionHistory/index.ts b/public/app/features/dashboard/components/VersionHistory/index.ts
new file mode 100644
index 00000000000..138de434bf3
--- /dev/null
+++ b/public/app/features/dashboard/components/VersionHistory/index.ts
@@ -0,0 +1,2 @@
+export { HistoryListCtrl } from './HistoryListCtrl';
+export { HistorySrv } from './HistorySrv';
diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/components/VersionHistory/template.html
similarity index 100%
rename from public/app/features/dashboard/history/history.html
rename to public/app/features/dashboard/components/VersionHistory/template.html
diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index 6611a728803..5c4480dbad5 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -22,7 +22,6 @@ export class DashboardCtrl {
private keybindingSrv,
private timeSrv,
private variableSrv,
- private alertingSrv,
private dashboardSrv,
private unsavedChangesSrv,
private dashboardViewStateSrv,
@@ -54,7 +53,6 @@ export class DashboardCtrl {
// init services
this.timeSrv.init(dashboard);
- this.alertingSrv.init(dashboard, data.alerts);
this.annotationsSrv.init(dashboard);
// template values service needs to initialize completely before
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index f0e97162d43..cfff64cb042 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames';
import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
import { importPluginModule } from 'app/features/plugins/plugin_loader';
-import { AddPanelPanel } from './AddPanelPanel';
+import { AddPanelWidget } from '../components/AddPanelWidget';
import { getPanelPluginNotFound } from './PanelPluginNotFound';
import { DashboardRow } from './DashboardRow';
import { PanelChrome } from './PanelChrome';
@@ -53,7 +53,7 @@ export class DashboardPanel extends PureComponent
{
}
renderAddPanel() {
- return {
onDisableQuery = () => {
this.props.query.hide = !this.props.query.hide;
+ this.onExecuteQuery();
this.forceUpdate();
};
diff --git a/public/app/features/dashboard/partials/folder_permissions.html b/public/app/features/dashboard/partials/folder_permissions.html
deleted file mode 100644
index be44c1051f2..00000000000
--- a/public/app/features/dashboard/partials/folder_permissions.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/public/app/features/dashboard/partials/folder_settings.html b/public/app/features/dashboard/partials/folder_settings.html
deleted file mode 100644
index 8e819be5fe8..00000000000
--- a/public/app/features/dashboard/partials/folder_settings.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
Request details
-
-
-
Request parameters
-
-
-
- {{param.key}}
-
-
- {{param.value}}
-
-
-
-
-
-
-
{{message}}
-
-{{response}}
-
-
-
-
-
-
Message:
-
-{{message}}
-
-
-
Stack trace:
-
-{{stack_trace}}
-
-
-
-
-
-
{
this.el = el;
};
- onChangeDatasource = async option => {
- this.props.changeDatasource(this.props.exploreId, option.value);
- };
-
onChangeTime = (range: TimeRange, changedByScanner?: boolean) => {
if (this.props.scanning && !changedByScanner) {
this.onStopScanning();
@@ -156,23 +139,11 @@ export class Explore extends React.PureComponent {
this.props.changeTime(this.props.exploreId, range);
};
- onClickClear = () => {
- this.props.clearQueries(this.props.exploreId);
- };
-
- onClickCloseSplit = () => {
- this.props.splitClose();
- };
-
// Use this in help pages to set page to a single query
onClickExample = (query: DataQuery) => {
this.props.setQueries(this.props.exploreId, [query]);
};
- onClickSplit = () => {
- this.props.splitOpen();
- };
-
onClickLabel = (key: string, value: string) => {
this.onModifyQueries({ type: 'ADD_FILTER', key, value });
};
@@ -204,10 +175,6 @@ export class Explore extends React.PureComponent {
this.props.scanStop(this.props.exploreId);
};
- onSubmit = () => {
- this.props.runQueries(this.props.exploreId);
- };
-
render() {
const {
StartPage,
@@ -215,11 +182,8 @@ export class Explore extends React.PureComponent {
datasourceError,
datasourceLoading,
datasourceMissing,
- exploreDatasources,
exploreId,
- loading,
initialQueries,
- range,
showingStartPage,
split,
supportsGraph,
@@ -227,64 +191,10 @@ export class Explore extends React.PureComponent {
supportsTable,
} = this.props;
const exploreClass = split ? 'explore explore-split' : 'explore';
- const selectedDatasource = datasourceInstance
- ? exploreDatasources.find(d => d.name === datasourceInstance.name)
- : undefined;
return (
-
- {exploreId === 'left' ? (
-
- ) : (
- <>
-
-
-
- Close Split
-
-
-
- )}
- {!datasourceMissing ? (
-
-
- ) : null}
-
- {exploreId === 'left' && !split ? (
-
-
- Split
-
-
- ) : null}
-
-
-
- Clear All
-
-
-
-
- Run Query{' '}
- {loading ? (
-
-
-
+
{datasourceLoading ?
Loading datasource...
: null}
{datasourceMissing ? (
Please add a datasource that supports Explore (e.g., Prometheus).
@@ -341,30 +251,24 @@ function mapStateToProps(state: StoreState, { exploreId }) {
datasourceInstance,
datasourceLoading,
datasourceMissing,
- exploreDatasources,
initialDatasource,
initialQueries,
initialized,
- queryTransactions,
range,
showingStartPage,
supportsGraph,
supportsLogs,
supportsTable,
} = item;
- const loading = queryTransactions.some(qt => !qt.done);
return {
StartPage,
datasourceError,
datasourceInstance,
datasourceLoading,
datasourceMissing,
- exploreDatasources,
initialDatasource,
initialQueries,
initialized,
- loading,
- queryTransactions,
range,
showingStartPage,
split,
@@ -375,18 +279,13 @@ function mapStateToProps(state: StoreState, { exploreId }) {
}
const mapDispatchToProps = {
- changeDatasource,
changeSize,
changeTime,
- clearQueries,
initializeExplore,
modifyQueries,
- runQueries,
scanStart,
scanStop,
setQueries,
- splitClose,
- splitOpen,
};
export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(Explore));
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
new file mode 100644
index 00000000000..35f06d11c81
--- /dev/null
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -0,0 +1,191 @@
+import React, { PureComponent } from 'react';
+import { connect } from 'react-redux';
+import { hot } from 'react-hot-loader';
+
+import { ExploreId } from 'app/types/explore';
+import { DataSourceSelectItem, RawTimeRange, TimeRange } from '@grafana/ui';
+import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker';
+import { StoreState } from 'app/types/store';
+import { changeDatasource, clearQueries, splitClose, runQueries, splitOpen } from './state/actions';
+import TimePicker from './TimePicker';
+
+enum IconSide {
+ left = 'left',
+ right = 'right',
+}
+
+const createResponsiveButton = (options: {
+ splitted: boolean;
+ title: string;
+ onClick: () => void;
+ buttonClassName?: string;
+ iconClassName?: string;
+ iconSide?: IconSide;
+}) => {
+ const defaultOptions = {
+ iconSide: IconSide.left,
+ };
+ const props = { ...options, defaultOptions };
+ const { title, onClick, buttonClassName, iconClassName, splitted, iconSide } = props;
+
+ return (
+
+ {iconClassName && iconSide === IconSide.left ? {!splitted ? title : ''}
+ {iconClassName && iconSide === IconSide.right ?
+ );
+};
+
+interface OwnProps {
+ exploreId: ExploreId;
+ timepickerRef: React.RefObject
;
+ onChangeTime: (range: TimeRange, changedByScanner?: boolean) => void;
+}
+
+interface StateProps {
+ datasourceMissing: boolean;
+ exploreDatasources: DataSourceSelectItem[];
+ loading: boolean;
+ range: RawTimeRange;
+ selectedDatasource: DataSourceSelectItem;
+ splitted: boolean;
+}
+
+interface DispatchProps {
+ changeDatasource: typeof changeDatasource;
+ clearAll: typeof clearQueries;
+ runQuery: typeof runQueries;
+ closeSplit: typeof splitClose;
+ split: typeof splitOpen;
+}
+
+type Props = StateProps & DispatchProps & OwnProps;
+
+export class UnConnectedExploreToolbar extends PureComponent {
+ constructor(props) {
+ super(props);
+ }
+
+ onChangeDatasource = async option => {
+ this.props.changeDatasource(this.props.exploreId, option.value);
+ };
+
+ onClearAll = () => {
+ this.props.clearAll(this.props.exploreId);
+ };
+
+ onRunQuery = () => {
+ this.props.runQuery(this.props.exploreId);
+ };
+
+ render() {
+ const {
+ datasourceMissing,
+ exploreDatasources,
+ exploreId,
+ loading,
+ range,
+ selectedDatasource,
+ splitted,
+ timepickerRef,
+ } = this.props;
+
+ return (
+
+
+
+
+
+ {exploreId === 'right' && (
+
+
+ )}
+
+
+
+
+
+ {!datasourceMissing ? (
+
+ ) : null}
+ {exploreId === 'left' && !splitted ? (
+
+ {createResponsiveButton({
+ splitted,
+ title: 'Split',
+ onClick: this.props.split,
+ iconClassName: 'fa fa-fw fa-columns icon-margin-right',
+ iconSide: IconSide.left,
+ })}
+
+ ) : null}
+
+
+
+
+ Clear All
+
+
+
+ {createResponsiveButton({
+ splitted,
+ title: 'Run Query',
+ onClick: this.onRunQuery,
+ buttonClassName: 'navbar-button--primary',
+ iconClassName: loading ? 'fa fa-spinner fa-fw fa-spin run-icon' : 'fa fa-level-down fa-fw run-icon',
+ iconSide: IconSide.right,
+ })}
+
+
+
+
{
render() {
const { exploreId, graphResult, loading, onChangeTime, showingGraph, showingTable, range, split } = this.props;
const graphHeight = showingGraph && showingTable ? '200px' : '400px';
+
+ if (!graphResult) {
+ return null;
+ }
+
return (
LogRowModel[];
+ label: string;
+ plain?: boolean;
+ value: string;
+ onClickLabel?: (label: string, value: string) => void;
+}
+
+interface State {
+ showStats: boolean;
+ stats: LogLabelStatsModel[];
+}
+
+export class LogLabel extends PureComponent {
+ state = {
+ stats: null,
+ showStats: false,
+ };
+
+ onClickClose = () => {
+ this.setState({ showStats: false });
+ };
+
+ onClickLabel = () => {
+ const { onClickLabel, label, value } = this.props;
+ if (onClickLabel) {
+ onClickLabel(label, value);
+ }
+ };
+
+ onClickStats = () => {
+ this.setState(state => {
+ if (state.showStats) {
+ return { showStats: false, stats: null };
+ }
+ const allRows = this.props.getRows();
+ const stats = calculateLogsLabelStats(allRows, this.props.label);
+ return { showStats: true, stats };
+ });
+ };
+
+ render() {
+ const { getRows, label, plain, value } = this.props;
+ const { showStats, stats } = this.state;
+ const tooltip = `${label}: ${value}`;
+ return (
+
+
+ {value}
+
+ {!plain && (
+
+
+ )}
+
+ );
+ }
+}
diff --git a/public/app/features/explore/LogLabelStats.tsx b/public/app/features/explore/LogLabelStats.tsx
new file mode 100644
index 00000000000..b0bd69170c5
--- /dev/null
+++ b/public/app/features/explore/LogLabelStats.tsx
@@ -0,0 +1,72 @@
+import React, { PureComponent } from 'react';
+import classnames from 'classnames';
+import { LogLabelStatsModel } from 'app/core/logs_model';
+
+function LogLabelStatsRow(logLabelStatsModel: LogLabelStatsModel) {
+ const { active, count, proportion, value } = logLabelStatsModel;
+ const percent = `${Math.round(proportion * 100)}%`;
+ const barStyle = { width: percent };
+ const className = classnames('logs-stats-row', { 'logs-stats-row--active': active });
+
+ return (
+
+
+
{value}
+
{count}
+
{percent}
+
+
+
{
+ render() {
+ const { label, rowCount, stats, value, onClickClose } = this.props;
+ const topRows = stats.slice(0, STATS_ROW_LIMIT);
+ let activeRow = topRows.find(row => row.value === value);
+ let otherRows = stats.slice(STATS_ROW_LIMIT);
+ const insertActiveRow = !activeRow;
+
+ // Remove active row from other to show extra
+ if (insertActiveRow) {
+ activeRow = otherRows.find(row => row.value === value);
+ otherRows = otherRows.filter(row => row.value !== value);
+ }
+
+ const otherCount = otherRows.reduce((sum, row) => sum + row.count, 0);
+ const topCount = topRows.reduce((sum, row) => sum + row.count, 0);
+ const total = topCount + otherCount;
+ const otherProportion = otherCount / total;
+
+ return (
+
+
+
+ {label}: {total} of {rowCount} rows have that label
+
+
+
+ {topRows.map(stat =>
+
-
-
{value}
-
{count}
-
{percent}
-
-
-
-
-
- {label}: {total} of {rowCount} rows have that label
-
-
-
- {topRows.map(stat =>
-
-
- {value}
-
- {!plain && (
-
-
- )}
-
- );
- }
-}
-
-export default class LogLabels extends PureComponent<{
- getRows?: () => LogRow[];
+interface Props {
+ getRows?: () => LogRowModel[];
labels: LogsStreamLabels;
plain?: boolean;
onClickLabel?: (label: string, value: string) => void;
-}> {
+}
+
+export class LogLabels extends PureComponent {
render() {
const { getRows, labels, onClickLabel, plain } = this.props;
return Object.keys(labels).map(key => (
-
+ {props.children}
+ onClick(props.children)} />
+
+ );
+};
+
+/**
+ * Renders a log line.
+ *
+ * When user hovers over it for a certain time, it lazily parses the log line.
+ * Once a parser is found, it will determine fields, that will be highlighted.
+ * When the user requests stats for a field, they will be calculated and rendered below the row.
+ */
+export class LogRow extends PureComponent {
+ mouseMessageTimer: NodeJS.Timer;
+
+ state = {
+ fieldCount: 0,
+ fieldLabel: null,
+ fieldStats: null,
+ fieldValue: null,
+ parsed: false,
+ parser: undefined,
+ parsedFieldHighlights: [],
+ showFieldStats: false,
+ };
+
+ componentWillUnmount() {
+ clearTimeout(this.mouseMessageTimer);
+ }
+
+ onClickClose = () => {
+ this.setState({ showFieldStats: false });
+ };
+
+ onClickHighlight = (fieldText: string) => {
+ const { getRows } = this.props;
+ const { parser } = this.state;
+ const allRows = getRows();
+
+ // Build value-agnostic row matcher based on the field label
+ const fieldLabel = parser.getLabelFromField(fieldText);
+ const fieldValue = parser.getValueFromField(fieldText);
+ const matcher = parser.buildMatcher(fieldLabel);
+ const fieldStats = calculateFieldStats(allRows, matcher);
+ const fieldCount = fieldStats.reduce((sum, stat) => sum + stat.count, 0);
+
+ this.setState({ fieldCount, fieldLabel, fieldStats, fieldValue, showFieldStats: true });
+ };
+
+ onMouseOverMessage = () => {
+ // Don't parse right away, user might move along
+ this.mouseMessageTimer = setTimeout(this.parseMessage, 500);
+ };
+
+ onMouseOutMessage = () => {
+ clearTimeout(this.mouseMessageTimer);
+ this.setState({ parsed: false });
+ };
+
+ parseMessage = () => {
+ if (!this.state.parsed) {
+ const { row } = this.props;
+ const parser = getParser(row.entry);
+ if (parser) {
+ // Use parser to highlight detected fields
+ const parsedFieldHighlights = parser.getFields(this.props.row.entry);
+ this.setState({ parsedFieldHighlights, parsed: true, parser });
+ }
+ }
+ };
+
+ render() {
+ const {
+ getRows,
+ highlighterExpressions,
+ onClickLabel,
+ row,
+ showDuplicates,
+ showLabels,
+ showLocalTime,
+ showUtc,
+ } = this.props;
+ const {
+ fieldCount,
+ fieldLabel,
+ fieldStats,
+ fieldValue,
+ parsed,
+ parsedFieldHighlights,
+ showFieldStats,
+ } = this.state;
+ const previewHighlights = highlighterExpressions && !_.isEqual(highlighterExpressions, row.searchWords);
+ const highlights = previewHighlights ? highlighterExpressions : row.searchWords;
+ const needsHighlighter = highlights && highlights.length > 0;
+ const highlightClassName = classnames('logs-row__match-highlight', {
+ 'logs-row__match-highlight--preview': previewHighlights,
+ });
+ return (
+
+ {showDuplicates && (
+
{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}
+ )}
+
+ {showUtc && (
+
+ {row.timestamp}
+
+ )}
+ {showLocalTime && (
+
+ {row.timeLocal}
+
+ )}
+ {showLabels && (
+
+
+ )}
+
+ {parsed && (
+
+ )}
+ {!parsed &&
+ needsHighlighter && (
+
+ )}
+ {!parsed && !needsHighlighter && row.entry}
+ {showFieldStats && (
+
+
+ )}
+
+
- {props.children}
- onClick(props.children)} />
-
- );
-};
-
-interface RowProps {
- highlighterExpressions?: string[];
- row: LogRow;
- showDuplicates: boolean;
- showLabels: boolean | null; // Tristate: null means auto
- showLocalTime: boolean;
- showUtc: boolean;
- getRows: () => LogRow[];
- onClickLabel?: (label: string, value: string) => void;
-}
-
-interface RowState {
- fieldCount: number;
- fieldLabel: string;
- fieldStats: LogsLabelStat[];
- fieldValue: string;
- parsed: boolean;
- parser?: LogsParser;
- parsedFieldHighlights: string[];
- showFieldStats: boolean;
-}
-
-/**
- * Renders a log line.
- *
- * When user hovers over it for a certain time, it lazily parses the log line.
- * Once a parser is found, it will determine fields, that will be highlighted.
- * When the user requests stats for a field, they will be calculated and rendered below the row.
- */
-class Row extends PureComponent {
- mouseMessageTimer: NodeJS.Timer;
-
- state = {
- fieldCount: 0,
- fieldLabel: null,
- fieldStats: null,
- fieldValue: null,
- parsed: false,
- parser: undefined,
- parsedFieldHighlights: [],
- showFieldStats: false,
- };
-
- componentWillUnmount() {
- clearTimeout(this.mouseMessageTimer);
- }
-
- onClickClose = () => {
- this.setState({ showFieldStats: false });
- };
-
- onClickHighlight = (fieldText: string) => {
- const { getRows } = this.props;
- const { parser } = this.state;
- const allRows = getRows();
-
- // Build value-agnostic row matcher based on the field label
- const fieldLabel = parser.getLabelFromField(fieldText);
- const fieldValue = parser.getValueFromField(fieldText);
- const matcher = parser.buildMatcher(fieldLabel);
- const fieldStats = calculateFieldStats(allRows, matcher);
- const fieldCount = fieldStats.reduce((sum, stat) => sum + stat.count, 0);
-
- this.setState({ fieldCount, fieldLabel, fieldStats, fieldValue, showFieldStats: true });
- };
-
- onMouseOverMessage = () => {
- // Don't parse right away, user might move along
- this.mouseMessageTimer = setTimeout(this.parseMessage, 500);
- };
-
- onMouseOutMessage = () => {
- clearTimeout(this.mouseMessageTimer);
- this.setState({ parsed: false });
- };
-
- parseMessage = () => {
- if (!this.state.parsed) {
- const { row } = this.props;
- const parser = getParser(row.entry);
- if (parser) {
- // Use parser to highlight detected fields
- const parsedFieldHighlights = parser.getFields(this.props.row.entry);
- this.setState({ parsedFieldHighlights, parsed: true, parser });
- }
- }
- };
-
- render() {
- const {
- getRows,
- highlighterExpressions,
- onClickLabel,
- row,
- showDuplicates,
- showLabels,
- showLocalTime,
- showUtc,
- } = this.props;
- const {
- fieldCount,
- fieldLabel,
- fieldStats,
- fieldValue,
- parsed,
- parsedFieldHighlights,
- showFieldStats,
- } = this.state;
- const previewHighlights = highlighterExpressions && !_.isEqual(highlighterExpressions, row.searchWords);
- const highlights = previewHighlights ? highlighterExpressions : row.searchWords;
- const needsHighlighter = highlights && highlights.length > 0;
- const highlightClassName = classnames('logs-row__match-highlight', {
- 'logs-row__match-highlight--preview': previewHighlights,
- });
- return (
-
- {showDuplicates && (
-
{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}
- )}
-
- {showUtc && (
-
- {row.timestamp}
-
- )}
- {showLocalTime && (
-
- {row.timeLocal}
-
- )}
- {showLabels && (
-
-
- )}
-
- {parsed && (
-
- )}
- {!parsed &&
- needsHighlighter && (
-
- )}
- {!parsed && !needsHighlighter && row.entry}
- {showFieldStats && (
-
-
- )}
-
-
;
@@ -262,7 +71,7 @@ interface LogsState {
showUtc: boolean;
}
-export default class Logs extends PureComponent {
+export default class Logs extends PureComponent {
deferLogsTimer: NodeJS.Timer;
renderAllTimer: NodeJS.Timer;
@@ -355,6 +164,11 @@ export default class Logs extends PureComponent {
scanning,
scanRange,
} = this.props;
+
+ if (!data) {
+ return null;
+ }
+
const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state;
let { showLabels } = this.state;
const hasData = data && data.rows && data.rows.length > 0;
@@ -440,10 +254,9 @@ export default class Logs extends PureComponent {
{hasData &&
- !deferLogs &&
- // Only inject highlighterExpression in the first set for performance reasons
+ !deferLogs && // Only inject highlighterExpression in the first set for performance reasons
firstRows.map(row => (
-
{
!deferLogs &&
renderAll &&
lastRows.map(row => (
- {
scanning,
scanRange,
} = this.props;
+
return (
{
}
render() {
- return (this.element = element)} style={{ width: '100%' }} />;
+ return
(this.element = element)} style={{ width: '100%' }} />;
}
}
diff --git a/public/app/features/explore/QueryField.tsx b/public/app/features/explore/QueryField.tsx
index 24b8b8f5b16..d27213cea34 100644
--- a/public/app/features/explore/QueryField.tsx
+++ b/public/app/features/explore/QueryField.tsx
@@ -73,6 +73,7 @@ export class QueryField extends React.PureComponent
{
- this.setState({
- suggestions: [],
- typeaheadIndex: 0,
- typeaheadPrefix: '',
- typeaheadContext: null,
- });
- this.resetTimer = null;
+ if (this.mounted) {
+ this.setState({
+ suggestions: [],
+ typeaheadIndex: 0,
+ typeaheadPrefix: '',
+ typeaheadContext: null,
+ });
+ this.resetTimer = null;
+ }
};
handleBlur = () => {
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 1d00a441e14..f386e5ab99b 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { ExploreId, ExploreItemState } from 'app/types/explore';
import { StoreState } from 'app/types';
-import { toggleGraph } from './state/actions';
+import { toggleTable } from './state/actions';
import Table from './Table';
import Panel from './Panel';
import TableModel from 'app/core/table_model';
@@ -16,16 +16,21 @@ interface TableContainerProps {
onClickCell: (key: string, value: string) => void;
showingTable: boolean;
tableResult?: TableModel;
- toggleGraph: typeof toggleGraph;
+ toggleTable: typeof toggleTable;
}
export class TableContainer extends PureComponent {
onClickTableButton = () => {
- this.props.toggleGraph(this.props.exploreId);
+ this.props.toggleTable(this.props.exploreId);
};
render() {
const { loading, onClickCell, showingTable, tableResult } = this.props;
+
+ if (!tableResult) {
+ return null;
+ }
+
return (
@@ -43,7 +48,7 @@ function mapStateToProps(state: StoreState, { exploreId }) {
}
const mapDispatchToProps = {
- toggleGraph,
+ toggleTable,
};
export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(TableContainer));
diff --git a/public/app/features/explore/TimePicker.tsx b/public/app/features/explore/TimePicker.tsx
index 8476c6b2b27..38c3f2e7498 100644
--- a/public/app/features/explore/TimePicker.tsx
+++ b/public/app/features/explore/TimePicker.tsx
@@ -293,6 +293,7 @@ export default class TimePicker extends PureComponent
diff --git a/public/app/features/explore/Wrapper.tsx b/public/app/features/explore/Wrapper.tsx
index 7ea8f228af8..aca2e6d8cbd 100644
--- a/public/app/features/explore/Wrapper.tsx
+++ b/public/app/features/explore/Wrapper.tsx
@@ -7,14 +7,16 @@ import { StoreState } from 'app/types';
import { ExploreId, ExploreUrlState } from 'app/types/explore';
import { parseUrlState } from 'app/core/utils/explore';
-import { initializeExploreSplit } from './state/actions';
+import { initializeExploreSplit, resetExplore } from './state/actions';
import ErrorBoundary from './ErrorBoundary';
import Explore from './Explore';
+import { CustomScrollbar } from '@grafana/ui';
interface WrapperProps {
initializeExploreSplit: typeof initializeExploreSplit;
split: boolean;
updateLocation: typeof updateLocation;
+ resetExplore: typeof resetExplore;
urlStates: { [key: string]: string };
}
@@ -41,20 +43,28 @@ export class Wrapper extends Component
{
}
}
+ componentWillUnmount() {
+ this.props.resetExplore();
+ }
+
render() {
const { split } = this.props;
const { leftState, rightState } = this.urlStates;
return (
-
-
-
- {split && (
-
-
- )}
+
+
+
+
+
+ {split && (
+
+
+ )}
+
+
);
}
@@ -69,6 +79,7 @@ const mapStateToProps = (state: StoreState) => {
const mapDispatchToProps = {
initializeExploreSplit,
updateLocation,
+ resetExplore,
};
export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(Wrapper));
diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts
index 850f2137541..21918e1c013 100644
--- a/public/app/features/explore/state/actionTypes.ts
+++ b/public/app/features/explore/state/actionTypes.ts
@@ -1,6 +1,6 @@
// Types
import { Emitter } from 'app/core/core';
-import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types';
+import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types';
import {
ExploreId,
ExploreItemState,
@@ -41,6 +41,7 @@ export enum ActionTypes {
ToggleGraph = 'explore/TOGGLE_GRAPH',
ToggleLogs = 'explore/TOGGLE_LOGS',
ToggleTable = 'explore/TOGGLE_TABLE',
+ ResetExplore = 'explore/RESET_EXPLORE',
}
export interface AddQueryRowAction {
@@ -123,7 +124,7 @@ export interface LoadDatasourcePendingAction {
type: ActionTypes.LoadDatasourcePending;
payload: {
exploreId: ExploreId;
- datasourceId: number;
+ datasourceName: string;
};
}
@@ -270,6 +271,11 @@ export interface ToggleLogsAction {
};
}
+export interface ResetExploreAction {
+ type: ActionTypes.ResetExplore;
+ payload: {};
+}
+
export type Action =
| AddQueryRowAction
| ChangeQueryAction
@@ -297,4 +303,5 @@ export type Action =
| SplitOpenAction
| ToggleGraphAction
| ToggleLogsAction
- | ToggleTableAction;
+ | ToggleTableAction
+ | ResetExploreAction;
diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts
index 34169a999a3..59df0c47ef9 100644
--- a/public/app/features/explore/state/actions.ts
+++ b/public/app/features/explore/state/actions.ts
@@ -21,7 +21,7 @@ import { updateLocation } from 'app/core/actions';
// Types
import { StoreState } from 'app/types';
-import { DataQuery, DataSourceSelectItem, QueryHint } from '@grafana/ui/src/types';
+import { DataQuery, DataSourceSelectItem, QueryHint } from '@grafana/ui/src/types';
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
import {
ExploreId,
@@ -33,7 +33,7 @@ import {
} from 'app/types/explore';
import { Emitter } from 'app/core/core';
-import { RawTimeRange, TimeRange } from '@grafana/ui';
+import { RawTimeRange, TimeRange, DataSourceApi } from '@grafana/ui';
import {
Action as ThunkableAction,
ActionTypes,
@@ -48,7 +48,6 @@ import {
ScanStopAction,
} from './actionTypes';
-
type ThunkResult
= ThunkAction;
/**
@@ -216,11 +215,11 @@ export const loadDatasourceMissing = (exploreId: ExploreId): LoadDatasourceMissi
/**
* Start the async process of loading a datasource to display a loading indicator
*/
-export const loadDatasourcePending = (exploreId: ExploreId, datasourceId: number): LoadDatasourcePendingAction => ({
+export const loadDatasourcePending = (exploreId: ExploreId, datasourceName: string): LoadDatasourcePendingAction => ({
type: ActionTypes.LoadDatasourcePending,
payload: {
exploreId,
- datasourceId,
+ datasourceName,
},
});
@@ -266,12 +265,12 @@ export const loadDatasourceSuccess = (
/**
* Main action to asynchronously load a datasource. Dispatches lots of smaller actions for feedback.
*/
-export function loadDatasource(exploreId: ExploreId, instance: any): ThunkResult {
+export function loadDatasource(exploreId: ExploreId, instance: DataSourceApi): ThunkResult {
return async (dispatch, getState) => {
- const datasourceId = instance.meta.id;
+ const datasourceName = instance.name;
// Keep ID to track selection
- dispatch(loadDatasourcePending(exploreId, datasourceId));
+ dispatch(loadDatasourcePending(exploreId, datasourceName));
let datasourceError = null;
try {
@@ -280,12 +279,13 @@ export function loadDatasource(exploreId: ExploreId, instance: any): ThunkResult
} catch (error) {
datasourceError = (error && error.statusText) || 'Network error';
}
+
if (datasourceError) {
dispatch(loadDatasourceFailure(exploreId, datasourceError));
return;
}
- if (datasourceId !== getState().explore[exploreId].requestedDatasourceId) {
+ if (datasourceName !== getState().explore[exploreId].requestedDatasourceName) {
// User already changed datasource again, discard results
return;
}
@@ -311,7 +311,7 @@ export function loadDatasource(exploreId: ExploreId, instance: any): ThunkResult
}
}
- if (datasourceId !== getState().explore[exploreId].requestedDatasourceId) {
+ if (datasourceName !== getState().explore[exploreId].requestedDatasourceName) {
// User already changed datasource again, discard results
return;
}
@@ -538,6 +538,7 @@ export function runQueries(exploreId: ExploreId) {
if (!hasNonEmptyQuery(modifiedQueries)) {
dispatch({ type: ActionTypes.RunQueriesEmpty, payload: { exploreId } });
+ dispatch(stateSave()); // Remember to saves to state and update location
return;
}
@@ -765,3 +766,12 @@ export function toggleTable(exploreId: ExploreId): ThunkResult {
}
};
}
+
+/**
+ * Resets state for explore.
+ */
+export function resetExplore(): ThunkResult {
+ return dispatch => {
+ dispatch({ type: ActionTypes.ResetExplore, payload: {} });
+ };
+}
diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts
new file mode 100644
index 00000000000..8227a947c5b
--- /dev/null
+++ b/public/app/features/explore/state/reducers.test.ts
@@ -0,0 +1,42 @@
+import { Action, ActionTypes } from './actionTypes';
+import { itemReducer, makeExploreItemState } from './reducers';
+import { ExploreId } from 'app/types/explore';
+
+describe('Explore item reducer', () => {
+ describe('scanning', () => {
+ test('should start scanning', () => {
+ let state = makeExploreItemState();
+ const action: Action = {
+ type: ActionTypes.ScanStart,
+ payload: {
+ exploreId: ExploreId.left,
+ scanner: jest.fn(),
+ },
+ };
+ state = itemReducer(state, action);
+ expect(state.scanning).toBeTruthy();
+ expect(state.scanner).toBe(action.payload.scanner);
+ });
+ test('should stop scanning', () => {
+ let state = makeExploreItemState();
+ const start: Action = {
+ type: ActionTypes.ScanStart,
+ payload: {
+ exploreId: ExploreId.left,
+ scanner: jest.fn(),
+ },
+ };
+ state = itemReducer(state, start);
+ expect(state.scanning).toBeTruthy();
+ const action: Action = {
+ type: ActionTypes.ScanStop,
+ payload: {
+ exploreId: ExploreId.left,
+ },
+ };
+ state = itemReducer(state, action);
+ expect(state.scanning).toBeFalsy();
+ expect(state.scanner).toBeUndefined();
+ });
+ });
+});
diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts
index ba87e8818df..5e9cc23c64f 100644
--- a/public/app/features/explore/state/reducers.ts
+++ b/public/app/features/explore/state/reducers.ts
@@ -20,7 +20,7 @@ const DEFAULT_GRAPH_INTERVAL = 15 * 1000;
/**
* Returns a fresh Explore area state
*/
-const makeExploreItemState = (): ExploreItemState => ({
+export const makeExploreItemState = (): ExploreItemState => ({
StartPage: undefined,
containerWidth: 0,
datasourceInstance: null,
@@ -48,7 +48,7 @@ const makeExploreItemState = (): ExploreItemState => ({
/**
* Global Explore state that handles multiple Explore areas and the split state
*/
-const initialExploreState: ExploreState = {
+export const initialExploreState: ExploreState = {
split: null,
left: makeExploreItemState(),
right: makeExploreItemState(),
@@ -57,7 +57,7 @@ const initialExploreState: ExploreState = {
/**
* Reducer for an Explore area, to be used by the global Explore reducer.
*/
-const itemReducer = (state, action: Action): ExploreItemState => {
+export const itemReducer = (state, action: Action): ExploreItemState => {
switch (action.type) {
case ActionTypes.AddQueryRow: {
const { initialQueries, modifiedQueries, queryTransactions } = state;
@@ -185,7 +185,7 @@ const itemReducer = (state, action: Action): ExploreItemState => {
}
case ActionTypes.LoadDatasourcePending: {
- return { ...state, datasourceLoading: true, requestedDatasourceId: action.payload.datasourceId };
+ return { ...state, datasourceLoading: true, requestedDatasourceName: action.payload.datasourceName };
}
case ActionTypes.LoadDatasourceSuccess: {
@@ -217,6 +217,7 @@ const itemReducer = (state, action: Action): ExploreItemState => {
supportsTable,
datasourceLoading: false,
datasourceMissing: false,
+ datasourceError: null,
logsHighlighterExpressions: undefined,
modifiedQueries: initialQueries.slice(),
queryTransactions: [],
@@ -277,7 +278,7 @@ const itemReducer = (state, action: Action): ExploreItemState => {
}
case ActionTypes.QueryTransactionStart: {
- const { datasourceInstance, queryIntervals, queryTransactions } = state;
+ const { queryTransactions } = state;
const { resultType, rowIndex, transaction } = action.payload;
// Discarding existing transactions of same type
const remainingTransactions = queryTransactions.filter(
@@ -287,15 +288,9 @@ const itemReducer = (state, action: Action): ExploreItemState => {
// Append new transaction
const nextQueryTransactions: QueryTransaction[] = [...remainingTransactions, transaction];
- const results = calculateResultsFromQueryTransactions(
- nextQueryTransactions,
- datasourceInstance,
- queryIntervals.intervalMs
- );
return {
...state,
- ...results,
queryTransactions: nextQueryTransactions,
showingStartPage: false,
};
@@ -359,13 +354,19 @@ const itemReducer = (state, action: Action): ExploreItemState => {
}
case ActionTypes.ScanStart: {
- return { ...state, scanning: true };
+ return { ...state, scanning: true, scanner: action.payload.scanner };
}
case ActionTypes.ScanStop: {
const { queryTransactions } = state;
const nextQueryTransactions = queryTransactions.filter(qt => qt.scanning && !qt.done);
- return { ...state, queryTransactions: nextQueryTransactions, scanning: false, scanRange: undefined };
+ return {
+ ...state,
+ queryTransactions: nextQueryTransactions,
+ scanning: false,
+ scanRange: undefined,
+ scanner: undefined,
+ };
}
case ActionTypes.SetQueries: {
@@ -421,25 +422,19 @@ const itemReducer = (state, action: Action): ExploreItemState => {
export const exploreReducer = (state = initialExploreState, action: Action): ExploreState => {
switch (action.type) {
case ActionTypes.SplitClose: {
- return {
- ...state,
- split: false,
- };
+ return { ...state, split: false };
}
case ActionTypes.SplitOpen: {
- return {
- ...state,
- split: true,
- right: action.payload.itemState,
- };
+ return { ...state, split: true, right: action.payload.itemState };
}
case ActionTypes.InitializeExploreSplit: {
- return {
- ...state,
- split: true,
- };
+ return { ...state, split: true };
+ }
+
+ case ActionTypes.ResetExplore: {
+ return initialExploreState;
}
}
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/folders/CreateFolderCtrl.ts
similarity index 96%
rename from public/app/features/dashboard/create_folder_ctrl.ts
rename to public/app/features/folders/CreateFolderCtrl.ts
index 99b2e8d4853..db70c2a18a2 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/folders/CreateFolderCtrl.ts
@@ -1,7 +1,7 @@
import appEvents from 'app/core/app_events';
import locationUtil from 'app/core/utils/location_util';
-export class CreateFolderCtrl {
+export default class CreateFolderCtrl {
title = '';
navModel: any;
titleTouched = false;
@@ -38,3 +38,4 @@ export class CreateFolderCtrl {
});
}
}
+
diff --git a/public/app/features/dashboard/folder_dashboards_ctrl.ts b/public/app/features/folders/FolderDashboardsCtrl.ts
similarity index 84%
rename from public/app/features/dashboard/folder_dashboards_ctrl.ts
rename to public/app/features/folders/FolderDashboardsCtrl.ts
index 05cc420c489..95ff355937b 100644
--- a/public/app/features/dashboard/folder_dashboards_ctrl.ts
+++ b/public/app/features/folders/FolderDashboardsCtrl.ts
@@ -1,7 +1,7 @@
-import { FolderPageLoader } from './folder_page_loader';
+import { FolderPageLoader } from './services/FolderPageLoader';
import locationUtil from 'app/core/utils/location_util';
-export class FolderDashboardsCtrl {
+export default class FolderDashboardsCtrl {
navModel: any;
folderId: number;
uid: string;
@@ -23,3 +23,4 @@ export class FolderDashboardsCtrl {
}
}
}
+
diff --git a/public/app/features/dashboard/partials/create_folder.html b/public/app/features/folders/partials/create_folder.html
similarity index 100%
rename from public/app/features/dashboard/partials/create_folder.html
rename to public/app/features/folders/partials/create_folder.html
diff --git a/public/app/features/dashboard/partials/folder_dashboards.html b/public/app/features/folders/partials/folder_dashboards.html
similarity index 100%
rename from public/app/features/dashboard/partials/folder_dashboards.html
rename to public/app/features/folders/partials/folder_dashboards.html
diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/folders/services/FolderPageLoader.ts
similarity index 100%
rename from public/app/features/dashboard/folder_page_loader.ts
rename to public/app/features/folders/services/FolderPageLoader.ts
diff --git a/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts b/public/app/features/manage-dashboards/DashboardImportCtrl.test.ts
similarity index 95%
rename from public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts
rename to public/app/features/manage-dashboards/DashboardImportCtrl.test.ts
index bcde009cb3a..c9037c0a62d 100644
--- a/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts
+++ b/public/app/features/manage-dashboards/DashboardImportCtrl.test.ts
@@ -1,5 +1,5 @@
-import { DashboardImportCtrl } from '../dashboard_import_ctrl';
-import config from '../../../core/config';
+import { DashboardImportCtrl } from './DashboardImportCtrl';
+import config from 'app/core/config';
describe('DashboardImportCtrl', () => {
const ctx: any = {};
diff --git a/public/app/features/dashboard/dashboard_import_ctrl.ts b/public/app/features/manage-dashboards/DashboardImportCtrl.ts
similarity index 99%
rename from public/app/features/dashboard/dashboard_import_ctrl.ts
rename to public/app/features/manage-dashboards/DashboardImportCtrl.ts
index 455fa682edd..d2c6584d13d 100644
--- a/public/app/features/dashboard/dashboard_import_ctrl.ts
+++ b/public/app/features/manage-dashboards/DashboardImportCtrl.ts
@@ -232,3 +232,5 @@ export class DashboardImportCtrl {
this.gnetInfo = '';
}
}
+
+export default DashboardImportCtrl;
diff --git a/public/app/features/dashboard/move_to_folder_modal/move_to_folder.ts b/public/app/features/manage-dashboards/components/MoveToFolderModal/MoveToFolderCtrl.ts
similarity index 93%
rename from public/app/features/dashboard/move_to_folder_modal/move_to_folder.ts
rename to public/app/features/manage-dashboards/components/MoveToFolderModal/MoveToFolderCtrl.ts
index 075583b971b..c183f38d92a 100644
--- a/public/app/features/dashboard/move_to_folder_modal/move_to_folder.ts
+++ b/public/app/features/manage-dashboards/components/MoveToFolderModal/MoveToFolderCtrl.ts
@@ -46,7 +46,7 @@ export class MoveToFolderCtrl {
export function moveToFolderModal() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/move_to_folder_modal/move_to_folder.html',
+ templateUrl: 'public/app/features/manage-dashboards/components/MoveToFolderModal/template.html',
controller: MoveToFolderCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/manage-dashboards/components/MoveToFolderModal/index.ts b/public/app/features/manage-dashboards/components/MoveToFolderModal/index.ts
new file mode 100644
index 00000000000..df0553aedb9
--- /dev/null
+++ b/public/app/features/manage-dashboards/components/MoveToFolderModal/index.ts
@@ -0,0 +1 @@
+export { MoveToFolderCtrl } from './MoveToFolderCtrl';
diff --git a/public/app/features/dashboard/move_to_folder_modal/move_to_folder.html b/public/app/features/manage-dashboards/components/MoveToFolderModal/template.html
similarity index 100%
rename from public/app/features/dashboard/move_to_folder_modal/move_to_folder.html
rename to public/app/features/manage-dashboards/components/MoveToFolderModal/template.html
diff --git a/public/app/features/manage-dashboards/components/UploadDashboard/index.ts b/public/app/features/manage-dashboards/components/UploadDashboard/index.ts
new file mode 100644
index 00000000000..828b4f76982
--- /dev/null
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/index.ts
@@ -0,0 +1 @@
+export { uploadDashboardDirective } from './uploadDashboardDirective';
diff --git a/public/app/features/dashboard/upload.ts b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
similarity index 96%
rename from public/app/features/dashboard/upload.ts
rename to public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
index ec4ad9a03cb..0c38a1247f1 100644
--- a/public/app/features/dashboard/upload.ts
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
@@ -11,7 +11,7 @@ const template = `
`;
/** @ngInject */
-function uploadDashboardDirective(timer, $location) {
+export function uploadDashboardDirective(timer, $location) {
return {
restrict: 'E',
template: template,
diff --git a/public/app/features/manage-dashboards/index.ts b/public/app/features/manage-dashboards/index.ts
index 046740904e1..9d7c2bbc811 100644
--- a/public/app/features/manage-dashboards/index.ts
+++ b/public/app/features/manage-dashboards/index.ts
@@ -1,7 +1,15 @@
-import coreModule from 'app/core/core_module';
+// Services
+export { ValidationSrv } from './services/ValidationSrv';
+// Components
+export * from './components/MoveToFolderModal';
+export * from './components/UploadDashboard';
+
+// Controllers
import { DashboardListCtrl } from './DashboardListCtrl';
import { SnapshotListCtrl } from './SnapshotListCtrl';
+import coreModule from 'app/core/core_module';
+
coreModule.controller('DashboardListCtrl', DashboardListCtrl);
coreModule.controller('SnapshotListCtrl', SnapshotListCtrl);
diff --git a/public/app/features/dashboard/partials/dashboard_import.html b/public/app/features/manage-dashboards/partials/dashboard_import.html
similarity index 100%
rename from public/app/features/dashboard/partials/dashboard_import.html
rename to public/app/features/manage-dashboards/partials/dashboard_import.html
diff --git a/public/app/features/dashboard/validation_srv.ts b/public/app/features/manage-dashboards/services/ValidationSrv.ts
similarity index 100%
rename from public/app/features/dashboard/validation_srv.ts
rename to public/app/features/manage-dashboards/services/ValidationSrv.ts
diff --git a/public/app/features/panel/all.ts b/public/app/features/panel/all.ts
index d461b491897..8bc2822a77c 100644
--- a/public/app/features/panel/all.ts
+++ b/public/app/features/panel/all.ts
@@ -4,3 +4,5 @@ import './solo_panel_ctrl';
import './query_ctrl';
import './panel_editor_tab';
import './query_editor_row';
+import './repeat_option';
+import './panellinks/module';
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index f68423315d7..2f1ef72cedd 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -290,17 +290,4 @@ export class PanelCtrl {
html += ' }] => {
+ const mockBackendSrv = {
+ get: jest.fn(url => {
+ switch (url) {
+ case '/api/playlists/1':
+ return Promise.resolve({ interval: '1s' });
+ case '/api/playlists/1/dashboards':
+ return Promise.resolve(dashboards);
+ default:
+ throw new Error(`Unexpected url=${url}`);
+ }
+ }),
+ };
+
+ const mockLocation = {
+ url: jest.fn(),
+ search: () => ({}),
+ };
+
+ const mockTimeout = jest.fn();
+ (mockTimeout as any).cancel = jest.fn();
+
+ return [new PlaylistSrv(mockLocation, mockTimeout, mockBackendSrv), mockLocation];
+};
+
+const mockWindowLocation = (): [jest.MockInstance, () => void] => {
+ const oldLocation = window.location;
+ const hrefMock = jest.fn();
+
+ // JSDom defines window in a way that you cannot tamper with location so this seems to be the only way to change it.
+ // https://github.com/facebook/jest/issues/5124#issuecomment-446659510
+ delete window.location;
+ window.location = {} as any;
+
+ // Only mocking href as that is all this test needs, but otherwise there is lots of things missing, so keep that
+ // in mind if this is reused.
+ Object.defineProperty(window.location, 'href', {
+ set: hrefMock,
+ get: hrefMock,
+ });
+ const unmock = () => {
+ window.location = oldLocation;
+ };
+ return [hrefMock, unmock];
+};
+
+describe('PlaylistSrv', () => {
+ let srv: PlaylistSrv;
+ let mockLocationService: { url: jest.MockInstance };
+ let hrefMock: jest.MockInstance;
+ let unmockLocation: () => void;
+ const initialUrl = 'http://localhost/playlist';
+
+ beforeEach(() => {
+ [srv, mockLocationService] = createPlaylistSrv();
+ [hrefMock, unmockLocation] = mockWindowLocation();
+
+ // This will be cached in the srv when start() is called
+ hrefMock.mockReturnValue(initialUrl);
+ });
+
+ afterEach(() => {
+ unmockLocation();
+ });
+
+ it('runs all dashboards in cycle and reloads page after 3 cycles', async () => {
+ await srv.start(1);
+
+ for (let i = 0; i < 6; i++) {
+ expect(mockLocationService.url).toHaveBeenLastCalledWith(`dashboard/${dashboards[i % 2].uri}?`);
+ srv.next();
+ }
+
+ expect(hrefMock).toHaveBeenCalledTimes(2);
+ expect(hrefMock).toHaveBeenLastCalledWith(initialUrl);
+ });
+
+ it('keeps the refresh counter value after restarting', async () => {
+ await srv.start(1);
+
+ // 1 complete loop
+ for (let i = 0; i < 3; i++) {
+ expect(mockLocationService.url).toHaveBeenLastCalledWith(`dashboard/${dashboards[i % 2].uri}?`);
+ srv.next();
+ }
+
+ srv.stop();
+ await srv.start(1);
+
+ // Another 2 loops
+ for (let i = 0; i < 4; i++) {
+ expect(mockLocationService.url).toHaveBeenLastCalledWith(`dashboard/${dashboards[i % 2].uri}?`);
+ srv.next();
+ }
+
+ expect(hrefMock).toHaveBeenCalledTimes(3);
+ expect(hrefMock).toHaveBeenLastCalledWith(initialUrl);
+ });
+});
diff --git a/public/app/features/templating/specs/template_srv.test.ts b/public/app/features/templating/specs/template_srv.test.ts
index 7805341d1a2..30faffea3be 100644
--- a/public/app/features/templating/specs/template_srv.test.ts
+++ b/public/app/features/templating/specs/template_srv.test.ts
@@ -275,6 +275,11 @@ describe('templateSrv', () => {
expect(result).toBe('test,test2');
});
+ it('multi value and percentencode format should render percent-encoded string', () => {
+ const result = _templateSrv.formatValue(['foo()bar BAZ', 'test2'], 'percentencode');
+ expect(result).toBe('%7Bfoo%28%29bar%20BAZ%2Ctest2%7D');
+ });
+
it('slash should be properly escaped in regex format', () => {
const result = _templateSrv.formatValue('Gi3/14', 'regex');
expect(result).toBe('Gi3\\/14');
@@ -464,6 +469,11 @@ describe('templateSrv', () => {
name: 'empty_on_init',
current: { value: '', text: '' },
},
+ {
+ type: 'custom',
+ name: 'foo',
+ current: { value: 'constructor', text: 'constructor' },
+ }
]);
_templateSrv.setGrafanaVariable('$__auto_interval_interval', '13m');
_templateSrv.updateTemplateData();
@@ -478,6 +488,12 @@ describe('templateSrv', () => {
const target = _templateSrv.replaceWithText('Hello $empty_on_init');
expect(target).toBe('Hello ');
});
+
+ it('should not return a string representation of a constructor property', () => {
+ const target = _templateSrv.replaceWithText('$foo');
+ expect(target).not.toBe('function Object() { [native code] }');
+ expect(target).toBe('constructor');
+ });
});
describe('built in interval variables', () => {
diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts
index 74da017bb93..2f8068137e5 100644
--- a/public/app/features/templating/template_srv.ts
+++ b/public/app/features/templating/template_srv.ts
@@ -77,6 +77,15 @@ export class TemplateSrv {
return '(' + quotedValues.join(' OR ') + ')';
}
+ // encode string according to RFC 3986; in contrast to encodeURIComponent()
+ // also the sub-delims "!", "'", "(", ")" and "*" are encoded;
+ // unicode handling uses UTF-8 as in ECMA-262.
+ encodeURIComponentStrict(str) {
+ return encodeURIComponent(str).replace(/[!'()*]/g, (c) => {
+ return '%' + c.charCodeAt(0).toString(16).toUpperCase();
+ });
+ }
+
formatValue(value, format, variable) {
// for some scopedVars there is no variable
variable = variable || {};
@@ -118,6 +127,13 @@ export class TemplateSrv {
}
return value;
}
+ case 'percentencode': {
+ // like glob, but url escaped
+ if (_.isArray(value)) {
+ return this.encodeURIComponentStrict('{' + value.join(',') + '}');
+ }
+ return this.encodeURIComponentStrict(value);
+ }
default: {
if (_.isArray(value)) {
return '{' + value.join(',') + '}';
@@ -238,7 +254,9 @@ export class TemplateSrv {
return match;
}
- return this.grafanaVariables[variable.current.value] || variable.current.text;
+ const value = this.grafanaVariables[variable.current.value];
+
+ return typeof(value) === 'string' ? value : variable.current.text;
});
}
diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
index 49f6b74e8b6..a7b865cde3f 100644
--- a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
@@ -26,7 +26,7 @@ export default (props: any) => (
Loki Cheat Sheet
{CHEAT_SHEET_ITEMS.map(item => (
-
+
{item.title}
{item.expression && (
({
- ...query,
+ refId: query.refId,
expr: '',
}));
}
diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts
index 1f86f20d6fd..9cd4ee0779b 100644
--- a/public/app/plugins/datasource/loki/result_transformer.ts
+++ b/public/app/plugins/datasource/loki/result_transformer.ts
@@ -5,7 +5,7 @@ import {
LogLevel,
LogsMetaItem,
LogsModel,
- LogRow,
+ LogRowModel,
LogsStream,
LogsStreamEntry,
LogsStreamLabels,
@@ -115,7 +115,7 @@ export function processEntry(
parsedLabels: LogsStreamLabels,
uniqueLabels: LogsStreamLabels,
search: string
-): LogRow {
+): LogRowModel {
const { line } = entry;
const ts = entry.ts || entry.timestamp;
// Assumes unique-ness, needs nanosec precision for timestamp
@@ -156,9 +156,9 @@ export function mergeStreamsToLogs(streams: LogsStream[], limit = DEFAULT_MAX_LI
}));
// Merge stream entries into single list of log rows
- const sortedRows: LogRow[] = _.chain(streams)
+ const sortedRows: LogRowModel[] = _.chain(streams)
.reduce(
- (acc: LogRow[], stream: LogsStream) => [
+ (acc: LogRowModel[], stream: LogsStream) => [
...acc,
...stream.entries.map(entry =>
processEntry(entry, stream.labels, stream.parsedLabels, stream.uniqueLabels, stream.search)
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
index 6fd450394a3..f5b5b311b2a 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
@@ -91,7 +91,6 @@ interface PromQueryFieldProps {
initialQuery: PromQuery;
hint?: any;
history?: any[];
- metricsByPrefix?: CascaderOption[];
onClickHintFix?: (action: any) => void;
onPressEnter?: () => void;
onQueryChange?: (value: PromQuery, override?: boolean) => void;
@@ -99,7 +98,6 @@ interface PromQueryFieldProps {
interface PromQueryFieldState {
metricsOptions: any[];
- metricsByPrefix: CascaderOption[];
syntaxLoaded: boolean;
}
@@ -124,7 +122,6 @@ class PromQueryField extends React.PureComponent
{
+ const { panel } = scope.ctrl;
+ return [
+ panel.content,
+ panel.mode
+ ].join();
+ };
+
$scope.$watch(
- 'ctrl.panel.content',
+ renderWhenChanged,
_.throttle(() => {
this.render();
- }, 1000)
+ }, 100)
);
}
@@ -62,7 +72,7 @@ export class TextPanelCtrl extends PanelCtrl {
this.renderingCompleted();
}
- renderText(content) {
+ renderText(content: string) {
content = content
.replace(/&/g, '&')
.replace(/>/g, '>')
@@ -71,7 +81,7 @@ export class TextPanelCtrl extends PanelCtrl {
this.updateContent(content);
}
- renderMarkdown(content) {
+ renderMarkdown(content: string) {
if (!this.remarkable) {
this.remarkable = new Remarkable();
}
@@ -81,7 +91,8 @@ export class TextPanelCtrl extends PanelCtrl {
});
}
- updateContent(html) {
+ updateContent(html: string) {
+ html = config.disableSanitizeHtml ? html : sanitize(html);
try {
this.content = this.$sce.trustAsHtml(this.templateSrv.replace(html, this.panel.scopedVars));
} catch (e) {
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 8552d0510a9..e7381740435 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -10,6 +10,9 @@ import ApiKeys from 'app/features/api-keys/ApiKeysPage';
import PluginListPage from 'app/features/plugins/PluginListPage';
import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
import FolderPermissions from 'app/features/folders/FolderPermissions';
+import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl';
+import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl';
+import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl';
import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage';
import NewDataSourcePage from '../features/datasources/NewDataSourcePage';
import UsersListPage from 'app/features/users/UsersListPage';
@@ -66,8 +69,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
pageClass: 'page-dashboard',
})
.when('/dashboard/import', {
- templateUrl: 'public/app/features/dashboard/partials/dashboard_import.html',
- controller: 'DashboardImportCtrl',
+ templateUrl: 'public/app/features/manage-dashboards/partials/dashboard_import.html',
+ controller: DashboardImportCtrl,
controllerAs: 'ctrl',
})
.when('/datasources', {
@@ -100,8 +103,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controllerAs: 'ctrl',
})
.when('/dashboards/folder/new', {
- templateUrl: 'public/app/features/dashboard/partials/create_folder.html',
- controller: 'CreateFolderCtrl',
+ templateUrl: 'public/app/features/folders/partials/create_folder.html',
+ controller: CreateFolderCtrl,
controllerAs: 'ctrl',
})
.when('/dashboards/f/:uid/:slug/permissions', {
@@ -117,8 +120,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
},
})
.when('/dashboards/f/:uid/:slug', {
- templateUrl: 'public/app/features/dashboard/partials/folder_dashboards.html',
- controller: 'FolderDashboardsCtrl',
+ templateUrl: 'public/app/features/folders/partials/folder_dashboards.html',
+ controller: FolderDashboardsCtrl,
controllerAs: 'ctrl',
})
.when('/dashboards/f/:uid', {
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index 570a387cd74..dc9a478adf3 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -1,6 +1,6 @@
import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
import thunk from 'redux-thunk';
-import { createLogger } from 'redux-logger';
+// import { createLogger } from 'redux-logger';
import sharedReducers from 'app/core/reducers';
import alertingReducers from 'app/features/alerting/state/reducers';
import teamsReducers from 'app/features/teams/state/reducers';
@@ -39,7 +39,7 @@ export function configureStore() {
if (process.env.NODE_ENV !== 'production') {
// DEV builds we had the logger middleware
- setStore(createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk, createLogger()))));
+ setStore(createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk))));
} else {
setStore(createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk))));
}
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index c69e93ff88e..ce5ea1047dd 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -186,7 +186,7 @@ export interface ExploreItemState {
* Allows the selection to be discarded if something went wrong during the asynchronous
* loading of the datasource.
*/
- requestedDatasourceId?: number;
+ requestedDatasourceName?: string;
/**
* Time range for this Explore. Managed by the time picker and used by all query runs.
*/
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 9e74b343b2d..739ccb6c412 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -39,6 +39,7 @@
@import 'layout/page';
// COMPONENTS
+@import '../app/features/dashboard/components/AddPanelWidget/AddPanelWidget';
@import 'components/scrollbar';
@import 'components/cards';
@import 'components/buttons';
@@ -58,7 +59,6 @@
@import 'components/panel_table';
@import 'components/panel_text';
@import 'components/panel_heatmap';
-@import 'components/panel_add_panel';
@import 'components/panel_logs';
@import 'components/settings_permissions';
@import 'components/tagsinput';
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 237574b93bc..44941540598 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -149,6 +149,19 @@
color: #ebedf2;
}
+.side-menu-header-link {
+ // Removes left-brand-border-gradient from link
+ color: #ebedf2 !important;
+ border: none !important;
+ padding: 0 !important;
+}
+
+.dropdown-menu--sidemenu > li > .side-menu-header-link:hover {
+ // Makes sure it looks good on light theme
+ color: #fff !important;
+ background-color: $side-menu-item-hover-bg !important;
+}
+
.sidemenu-subtitle {
padding: 0.5rem 1rem 0.5rem;
font-size: $font-size-sm;
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index abd13a10368..dce944dc7b2 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -1,182 +1,324 @@
-.explore {
- flex: 1 1 auto;
+.icon-margin-right {
+ margin-right: 0.25em;
+}
- &-container {
- padding: $dashboard-padding;
+.icon-margin-left {
+ margin-left: 0.25em;
+}
+
+.run-icon {
+ transform: rotate(90deg);
+}
+
+.timepicker {
+ display: flex;
+}
+
+.timepicker-rangestring {
+ margin-left: 0.5em;
+}
+
+.datasource-picker {
+ .ds-picker {
+ min-width: 200px;
+ max-width: 200px;
+ }
+}
+
+.sidemenu-open {
+ .explore-toolbar-header {
+ padding: 0;
+ margin-left: 0;
}
- &-wrapper {
- display: flex;
-
- > .explore-split {
- width: 50%;
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
}
}
+}
- // Push split button a bit
- .explore-first-button {
- margin-left: 15px;
+.explore-toolbar {
+ background: inherit;
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: flex-start;
+ height: auto;
+ padding: 0px $dashboard-padding;
+ border-bottom: 1px solid #0000;
+ transition-duration: 0.35s;
+ transition-timing-function: ease-in-out;
+ transition-property: box-shadow, border-bottom;
+}
+
+.explore-toolbar-item {
+ position: relative;
+ align-self: center;
+}
+
+.explore-toolbar.splitted {
+ .explore-toolbar-item {
+ flex: 1 1 100%;
}
- .explore-panel {
- margin-top: $panel-margin;
+ .explore-toolbar-content-item:first-child {
+ padding-left: 0;
+ margin-right: auto;
}
+}
- .explore-panel__body {
- padding: $panel-padding;
- }
+.explore-toolbar-item:last-child {
+ flex: auto;
+}
- .explore-panel__header {
- padding: $panel-padding;
- padding-top: 5px;
- padding-bottom: 0;
- display: flex;
- cursor: pointer;
- margin-bottom: 5px;
- transition: all 0.1s linear;
- }
+.explore-toolbar-header {
+ display: flex;
+ flex: 1 1 0;
+ flex-flow: row nowrap;
+ font-size: 18px;
+ min-height: 55px;
+ line-height: 55px;
+ justify-content: space-between;
+ margin-left: $panel-margin * 3;
+}
- .explore-panel__header-label {
- font-weight: 500;
- margin-right: $panel-margin;
- font-size: $font-size-h6;
- box-shadow: $text-shadow-faint;
- }
+.explore-toolbar-header {
+ justify-content: space-between;
+ align-items: center;
+}
- .explore-panel__header-buttons {
- margin-right: $panel-margin;
- font-size: $font-size-lg;
- line-height: $font-size-h6;
- }
-
- // Make sure wrap buttons around on small screens
- .navbar {
- flex-wrap: wrap;
- height: auto;
- }
+.explore-toolbar-header-title {
+ color: darken($link-color, 5%);
.navbar-page-btn {
- margin-right: 1rem;
+ padding-left: $dashboard-padding;
+ }
- // Explore icon in header
- .fa {
- font-size: 100%;
- opacity: 0.75;
- margin-right: 0.5em;
+ .fa {
+ font-size: 100%;
+ opacity: 0.75;
+ margin-right: 0.5em;
+ }
+}
+
+.explore-toolbar-header-close {
+ margin-left: auto;
+}
+
+.explore-toolbar-content {
+ display: flex;
+ flex-flow: row wrap;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.explore-toolbar-content-item {
+ padding: 10px 2px;
+}
+
+.explore-toolbar-content-item:first-child {
+ padding-left: $dashboard-padding;
+ margin-right: auto;
+}
+
+@media only screen and (max-width: 1545px) {
+ .explore-toolbar.splitted {
+ .timepicker-rangestring {
+ display: none;
}
}
+}
- // Toggle mode
- .navbar-button.active {
- color: $btn-active-text-color;
- background-color: $btn-active-bg;
- }
-
- .navbar-button--no-icon {
- line-height: 18px;
- }
-
- .result-options {
- margin: 2 * $panel-margin 0;
- }
-
- .time-series-disclaimer {
- width: 300px;
- margin: $panel-margin auto;
- padding: 10px 0;
- border-radius: $border-radius;
- text-align: center;
- background-color: $panel-bg;
-
- .disclaimer-icon {
- color: $yellow;
- margin-right: $panel-margin/2;
- }
-
- .show-all-time-series {
- cursor: pointer;
- color: $external-link-color;
- }
- }
-
- .navbar .elapsed-time {
- position: absolute;
- left: 0;
- right: 0;
- top: 3.5rem;
- text-align: center;
- font-size: 0.8rem;
- }
-
- .graph-legend {
- flex-wrap: wrap;
- }
-
- .explore-panel__loader {
- height: 2px;
- position: relative;
- overflow: hidden;
- background: none;
- margin: $panel-margin / 2;
- transition: background-color 1s ease;
- }
-
- .explore-panel__loader--active {
- background: $text-color-faint;
- }
-
- .explore-panel__loader--active:after {
- content: ' ';
- display: block;
- width: 25%;
- top: 0;
- top: -50%;
- height: 250%;
- position: absolute;
- animation: loader 2s cubic-bezier(0.17, 0.67, 0.83, 0.67);
- animation-iteration-count: 100;
- background: $blue;
- }
-
- @keyframes loader {
- from {
- left: -25%;
- }
- to {
- left: 100%;
- }
- }
-
- .datasource-picker {
- min-width: 200px;
- }
-
+@media only screen and (max-width: 1070px) {
.timepicker {
- display: flex;
-
- &-rangestring {
- margin-left: 0.5em;
+ .timepicker-rangestring {
+ display: none;
}
}
- .run-icon {
- margin-left: 0.25em;
- transform: rotate(90deg);
+ .explore-toolbar-content {
+ justify-content: flex-start;
}
- .relative {
- position: relative;
+ .explore-toolbar.splitted {
+ .explore-toolbar-content-item {
+ padding: 2px 0;
+ margin: 0;
+ }
}
- .link {
- text-decoration: underline;
+ .explore-toolbar-content-item {
+ padding: 2px 2px;
}
}
+@media only screen and (max-width: 803px) {
+ .sidemenu-open {
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: 0;
+ }
+ }
+ }
+
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+
+ .btn-title {
+ display: none;
+ }
+}
+
+@media only screen and (max-width: 702px) {
+ .explore-toolbar-content-item:first-child {
+ padding-left: 2px;
+ margin-right: 0;
+ }
+}
+
+@media only screen and (max-width: 544px) {
+ .sidemenu-open {
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+ }
+
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+}
+
+.explore {
+ flex: 1 1 auto;
+}
+
.explore + .explore {
border-left: 1px dotted $table-border;
}
+.explore-container {
+ padding: $dashboard-padding;
+}
+
+.explore-wrapper {
+ display: flex;
+
+ > .explore-split {
+ width: 50%;
+ }
+}
+
+.explore-panel {
+ margin-top: $panel-margin;
+}
+
+.explore-panel__body {
+ padding: $panel-padding;
+}
+
+.explore-panel__header {
+ padding: $panel-padding;
+ padding-top: 5px;
+ padding-bottom: 0;
+ display: flex;
+ cursor: pointer;
+ margin-bottom: 5px;
+ transition: all 0.1s linear;
+}
+
+.explore-panel__header-label {
+ font-weight: 500;
+ margin-right: $panel-margin;
+ font-size: $font-size-h6;
+ box-shadow: $text-shadow-faint;
+}
+
+.explore-panel__header-buttons {
+ margin-right: $panel-margin;
+ font-size: $font-size-lg;
+ line-height: $font-size-h6;
+}
+
+.result-options {
+ margin: 2 * $panel-margin 0;
+}
+
+.time-series-disclaimer {
+ width: 300px;
+ margin: $panel-margin auto;
+ padding: 10px 0;
+ border-radius: $border-radius;
+ text-align: center;
+ background-color: $panel-bg;
+
+ .disclaimer-icon {
+ color: $yellow;
+ margin-right: $panel-margin/2;
+ }
+
+ .show-all-time-series {
+ cursor: pointer;
+ color: $external-link-color;
+ }
+}
+
+.navbar .elapsed-time {
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 3.5rem;
+ text-align: center;
+ font-size: 0.8rem;
+}
+
+.graph-legend {
+ flex-wrap: wrap;
+}
+
+.explore-panel__loader {
+ height: 2px;
+ position: relative;
+ overflow: hidden;
+ background: none;
+ margin: $panel-margin / 2;
+}
+
+.explore-panel__loader--active:after {
+ content: ' ';
+ display: block;
+ width: 25%;
+ top: 0;
+ top: -50%;
+ height: 250%;
+ position: absolute;
+ animation: loader 2s cubic-bezier(0.17, 0.67, 0.83, 0.67) 500ms;
+ animation-iteration-count: 100;
+ left: -25%;
+ background: $blue;
+}
+
+@keyframes loader {
+ from {
+ left: -25%;
+ opacity: 0.1;
+ }
+ to {
+ left: 100%;
+ opacity: 1;
+ }
+}
+
.query-row {
display: flex;
position: relative;
diff --git a/public/vendor/flot/jquery.flot.pie.js b/public/vendor/flot/jquery.flot.pie.js
index 6553c8ea3a8..dee47e6e504 100644
--- a/public/vendor/flot/jquery.flot.pie.js
+++ b/public/vendor/flot/jquery.flot.pie.js
@@ -73,6 +73,7 @@ More detail and specific examples can be found in the included HTML file.
centerLeft = null,
centerTop = null,
processed = false,
+ options = null,
ctx = null;
// interactive variables
diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index dd69f8139c8..411e00a1646 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -32,10 +32,12 @@ echo "Build arguments: $OPT"
# build only amd64 for enterprise
if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
fi
+
go run build.go -goos windows -cc ${CCWIN64} ${OPT} build
# Do not remove CC from the linux build, its there for compatibility with Centos6
@@ -67,6 +69,7 @@ rm tools/phantomjs/phantomjs
# build only amd64 for enterprise
if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+ go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index ac6aab0b867..5f42744082a 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -28,6 +28,7 @@ fi
echo "Build arguments: $OPT"
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
@@ -49,6 +50,7 @@ source /etc/profile.d/rvm.sh
echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
+go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
diff --git a/scripts/build/publish.go b/scripts/build/publish.go
deleted file mode 100644
index d5b19877724..00000000000
--- a/scripts/build/publish.go
+++ /dev/null
@@ -1,194 +0,0 @@
-package main
-
-import (
- "bytes"
- "encoding/json"
- "flag"
- "fmt"
- "io/ioutil"
- "log"
- "net/http"
- "os"
- "path/filepath"
- "regexp"
- "strings"
- "time"
-)
-
-var apiUrl = flag.String("apiUrl", "https://grafana.com/api", "api url")
-var apiKey = flag.String("apiKey", "", "api key")
-var version = ""
-var versionRe = regexp.MustCompile(`grafana-(.*)(\.|_)(arm64|armhfp|aarch64|armv7|darwin|linux|windows|x86_64)`)
-var debVersionRe = regexp.MustCompile(`grafana_(.*)_(arm64|armv7|armhf|amd64)\.deb`)
-var builds = []build{}
-var architectureMapping = map[string]string{
- "armv7": "armv7",
- "armhfp": "armv7",
- "armhf": "armv7",
- "arm64": "arm64",
- "aarch64": "arm64",
- "amd64": "amd64",
- "x86_64": "amd64",
-}
-
-func main() {
- flag.Parse()
- if *apiKey == "" {
- log.Fatalf("Require apiKey command line parameters")
- }
-
- err := filepath.Walk("dist", packageWalker)
- if err != nil {
- log.Fatalf("Cannot find any packages to publish, %v", err)
- }
-
- if version == "" {
- log.Fatalf("No version found")
- }
-
- if len(builds) == 0 {
- log.Fatalf("No builds found")
- }
-
- nightly := release{
- Version: version,
- ReleaseDate: time.Now(),
- Stable: false,
- Nightly: true,
- Beta: false,
- WhatsNewUrl: "",
- ReleaseNotesUrl: "",
- Builds: builds,
- }
-
- postRequest("/grafana/versions", nightly, fmt.Sprintf("Create Release %s", nightly.Version))
- postRequest("/grafana/versions/"+nightly.Version, nightly, fmt.Sprintf("Update Release %s", nightly.Version))
-
- for _, b := range nightly.Builds {
- postRequest(fmt.Sprintf("/grafana/versions/%s/packages", nightly.Version), b, fmt.Sprintf("Create Build %s %s", b.Os, b.Arch))
- postRequest(fmt.Sprintf("/grafana/versions/%s/packages/%s/%s", nightly.Version, b.Arch, b.Os), b, fmt.Sprintf("Update Build %s %s", b.Os, b.Arch))
- }
-}
-
-func mapPackage(path string, name string, shaBytes []byte) (build, error) {
- log.Printf("Finding package file %s", name)
- result := versionRe.FindSubmatch([]byte(name))
- debResult := debVersionRe.FindSubmatch([]byte(name))
-
- if len(result) > 0 {
- version = string(result[1])
- log.Printf("Version detected: %v", version)
- } else if len(debResult) > 0 {
- version = string(debResult[1])
- } else {
- return build{}, fmt.Errorf("Unable to figure out version from '%v'", name)
- }
-
- os := ""
- if strings.Contains(name, "linux") {
- os = "linux"
- }
- if strings.HasSuffix(name, "windows-amd64.zip") {
- os = "win"
- }
- if strings.HasSuffix(name, "darwin-amd64.tar.gz") {
- os = "darwin"
- }
- if strings.HasSuffix(name, ".rpm") {
- os = "rhel"
- }
- if strings.HasSuffix(name, ".deb") {
- os = "deb"
- }
- if os == "" {
- return build{}, fmt.Errorf("Unable to figure out os from '%v'", name)
- }
-
- arch := ""
- for archListed, archReal := range architectureMapping {
- if strings.Contains(name, archListed) {
- arch = archReal
- break
- }
- }
- if arch == "" {
- return build{}, fmt.Errorf("Unable to figure out arch from '%v'", name)
- }
-
- return build{
- Os: os,
- Arch: arch,
- Url: "https://s3-us-west-2.amazonaws.com/grafana-releases/master/" + name,
- Sha256: string(shaBytes),
- }, nil
-}
-
-func packageWalker(path string, f os.FileInfo, err error) error {
- if err != nil {
- log.Printf("error: %v", err)
- }
- if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") || strings.Contains(f.Name(), "latest") {
- return nil
- }
-
- shaBytes, err := ioutil.ReadFile(path + ".sha256")
- if err != nil {
- log.Fatalf("Failed to read sha256 file %v", err)
- }
-
- build, err := mapPackage(path, f.Name(), shaBytes)
- if err != nil {
- log.Printf("Could not map metadata from package: %v", err)
- return nil
- }
-
- builds = append(builds, build)
- return nil
-}
-
-func postRequest(url string, obj interface{}, desc string) {
- jsonBytes, _ := json.Marshal(obj)
- req, _ := http.NewRequest(http.MethodPost, (*apiUrl)+url, bytes.NewReader(jsonBytes))
- req.Header.Add("Authorization", "Bearer "+(*apiKey))
- req.Header.Add("Content-Type", "application/json")
-
- res, err := http.DefaultClient.Do(req)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
-
- if res.StatusCode == http.StatusOK {
- log.Printf("Action: %s \t OK", desc)
- } else {
-
- if res.Body != nil {
- defer res.Body.Close()
- body, _ := ioutil.ReadAll(res.Body)
- if strings.Contains(string(body), "already exists") || strings.Contains(string(body), "Nothing to update") {
- log.Printf("Action: %s \t Already exists", desc)
- } else {
- log.Printf("Action: %s \t Failed - Status: %v", desc, res.Status)
- log.Printf("Resp: %s", body)
- log.Fatalf("Quitting")
- }
- }
- }
-}
-
-type release struct {
- Version string `json:"version"`
- ReleaseDate time.Time `json:"releaseDate"`
- Stable bool `json:"stable"`
- Beta bool `json:"beta"`
- Nightly bool `json:"nightly"`
- WhatsNewUrl string `json:"whatsNewUrl"`
- ReleaseNotesUrl string `json:"releaseNotesUrl"`
- Builds []build `json:"-"`
-}
-
-type build struct {
- Os string `json:"os"`
- Url string `json:"url"`
- Sha256 string `json:"sha256"`
- Arch string `json:"arch"`
-}
diff --git a/scripts/build/release_publisher/externalrelease.go b/scripts/build/release_publisher/externalrelease.go
index 992cba38f90..64e879cace4 100644
--- a/scripts/build/release_publisher/externalrelease.go
+++ b/scripts/build/release_publisher/externalrelease.go
@@ -14,10 +14,10 @@ type releaseFromExternalContent struct {
artifactConfigurations []buildArtifact
}
-func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error) {
+func (re releaseFromExternalContent) prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error) {
version := re.rawVersion[1:]
beta := strings.Contains(version, "beta")
- var rt ReleaseType
+ var rt releaseType
if beta {
rt = BETA
} else if nightly {
@@ -28,11 +28,11 @@ func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl
builds := []build{}
for _, ba := range re.artifactConfigurations {
- sha256, err := re.getter.getContents(fmt.Sprintf("%s.sha256", ba.getUrl(baseArchiveUrl, version, rt)))
+ sha256, err := re.getter.getContents(fmt.Sprintf("%s.sha256", ba.getURL(baseArchiveURL, version, rt)))
if err != nil {
return nil, err
}
- builds = append(builds, newBuild(baseArchiveUrl, ba, version, rt, sha256))
+ builds = append(builds, newBuild(baseArchiveURL, ba, version, rt, sha256))
}
r := release{
@@ -41,8 +41,8 @@ func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl
Stable: rt.stable(),
Beta: rt.beta(),
Nightly: rt.nightly(),
- WhatsNewUrl: whatsNewUrl,
- ReleaseNotesUrl: releaseNotesUrl,
+ WhatsNewURL: whatsNewURL,
+ ReleaseNotesURL: releaseNotesURL,
Builds: builds,
}
return &r, nil
@@ -52,9 +52,9 @@ type urlGetter interface {
getContents(url string) (string, error)
}
-type getHttpContents struct{}
+type getHTTPContents struct{}
-func (getHttpContents) getContents(url string) (string, error) {
+func (getHTTPContents) getContents(url string) (string, error) {
response, err := http.Get(url)
if err != nil {
return "", err
diff --git a/scripts/build/release_publisher/localrelease.go b/scripts/build/release_publisher/localrelease.go
index 4f4575c4ff4..332654ee625 100644
--- a/scripts/build/release_publisher/localrelease.go
+++ b/scripts/build/release_publisher/localrelease.go
@@ -2,7 +2,6 @@ package main
import (
"fmt"
- "github.com/pkg/errors"
"io/ioutil"
"log"
"os"
@@ -10,6 +9,8 @@ import (
"regexp"
"strings"
"time"
+
+ "github.com/pkg/errors"
)
type releaseLocalSources struct {
@@ -17,11 +18,11 @@ type releaseLocalSources struct {
artifactConfigurations []buildArtifact
}
-func (r releaseLocalSources) prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error) {
+func (r releaseLocalSources) prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error) {
if !nightly {
- return nil, errors.New("Local releases only supported for nightly builds.")
+ return nil, errors.New("Local releases only supported for nightly builds")
}
- buildData := r.findBuilds(baseArchiveUrl)
+ buildData := r.findBuilds(baseArchiveURL)
rel := release{
Version: buildData.version,
@@ -29,8 +30,8 @@ func (r releaseLocalSources) prepareRelease(baseArchiveUrl, whatsNewUrl string,
Stable: false,
Beta: false,
Nightly: nightly,
- WhatsNewUrl: whatsNewUrl,
- ReleaseNotesUrl: releaseNotesUrl,
+ WhatsNewURL: whatsNewURL,
+ ReleaseNotesURL: releaseNotesURL,
Builds: buildData.builds,
}
@@ -42,13 +43,13 @@ type buildData struct {
builds []build
}
-func (r releaseLocalSources) findBuilds(baseArchiveUrl string) buildData {
+func (r releaseLocalSources) findBuilds(baseArchiveURL string) buildData {
data := buildData{}
- filepath.Walk(r.path, createBuildWalker(r.path, &data, r.artifactConfigurations, baseArchiveUrl))
+ filepath.Walk(r.path, createBuildWalker(r.path, &data, r.artifactConfigurations, baseArchiveURL))
return data
}
-func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifact, baseArchiveUrl string) func(path string, f os.FileInfo, err error) error {
+func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifact, baseArchiveURL string) func(path string, f os.FileInfo, err error) error {
return func(path string, f os.FileInfo, err error) error {
if err != nil {
log.Printf("error: %v", err)
@@ -73,7 +74,7 @@ func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifac
data.version = version
data.builds = append(data.builds, build{
Os: archive.os,
- Url: archive.getUrl(baseArchiveUrl, version, NIGHTLY),
+ URL: archive.getURL(baseArchiveURL, version, NIGHTLY),
Sha256: string(shaBytes),
Arch: archive.arch,
})
@@ -90,5 +91,5 @@ func grabVersion(name string, suffix string) (string, error) {
return string(match[2]), nil
}
- return "", errors.New("No version found.")
+ return "", errors.New("No version found")
}
diff --git a/scripts/build/release_publisher/main.go b/scripts/build/release_publisher/main.go
index 90acb2d3e62..6e1c8f782f0 100644
--- a/scripts/build/release_publisher/main.go
+++ b/scripts/build/release_publisher/main.go
@@ -9,8 +9,8 @@ import (
func main() {
var version string
- var whatsNewUrl string
- var releaseNotesUrl string
+ var whatsNewURL string
+ var releaseNotesURL string
var dryRun bool
var enterprise bool
var fromLocal bool
@@ -18,8 +18,8 @@ func main() {
var apiKey string
flag.StringVar(&version, "version", "", "Grafana version (ex: --version v5.2.0-beta1)")
- flag.StringVar(&whatsNewUrl, "wn", "", "What's new url (ex: --wn http://docs.grafana.org/guides/whats-new-in-v5-2/)")
- flag.StringVar(&releaseNotesUrl, "rn", "", "Grafana version (ex: --rn https://community.grafana.com/t/release-notes-v5-2-x/7894)")
+ flag.StringVar(&whatsNewURL, "wn", "", "What's new url (ex: --wn http://docs.grafana.org/guides/whats-new-in-v5-2/)")
+ flag.StringVar(&releaseNotesURL, "rn", "", "Grafana version (ex: --rn https://community.grafana.com/t/release-notes-v5-2-x/7894)")
flag.StringVar(&apiKey, "apikey", "", "Grafana.com API key (ex: --apikey ABCDEF)")
flag.BoolVar(&dryRun, "dry-run", false, "--dry-run")
flag.BoolVar(&enterprise, "enterprise", false, "--enterprise")
@@ -37,7 +37,7 @@ func main() {
if dryRun {
log.Println("Dry-run has been enabled.")
}
- var baseUrl string
+ var baseURL string
var builder releaseBuilder
var product string
@@ -46,7 +46,7 @@ func main() {
if enterprise {
product = "grafana-enterprise"
- baseUrl = createBaseUrl(archiveProviderRoot, "enterprise", product, nightly)
+ baseURL = createBaseURL(archiveProviderRoot, "enterprise", product, nightly)
var err error
buildArtifacts, err = filterBuildArtifacts([]artifactFilter{
{os: "deb", arch: "amd64"},
@@ -61,7 +61,7 @@ func main() {
} else {
product = "grafana"
- baseUrl = createBaseUrl(archiveProviderRoot, "oss", product, nightly)
+ baseURL = createBaseURL(archiveProviderRoot, "oss", product, nightly)
}
if fromLocal {
@@ -72,7 +72,7 @@ func main() {
}
} else {
builder = releaseFromExternalContent{
- getter: getHttpContents{},
+ getter: getHTTPContents{},
rawVersion: version,
artifactConfigurations: buildArtifacts,
}
@@ -80,18 +80,18 @@ func main() {
p := publisher{
apiKey: apiKey,
- apiUri: "https://grafana.com/api",
+ apiURI: "https://grafana.com/api",
product: product,
dryRun: dryRun,
enterprise: enterprise,
- baseArchiveUrl: baseUrl,
+ baseArchiveURL: baseURL,
builder: builder,
}
- if err := p.doRelease(whatsNewUrl, releaseNotesUrl, nightly); err != nil {
+ if err := p.doRelease(whatsNewURL, releaseNotesURL, nightly); err != nil {
log.Fatalf("error: %v", err)
}
}
-func createBaseUrl(root string, bucketName string, product string, nightly bool) string {
+func createBaseURL(root string, bucketName string, product string, nightly bool) string {
var subPath string
if nightly {
subPath = "master"
diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go
index 1d93c1e306e..8fd139c2638 100644
--- a/scripts/build/release_publisher/publisher.go
+++ b/scripts/build/release_publisher/publisher.go
@@ -4,7 +4,6 @@ import (
"bytes"
"encoding/json"
"fmt"
- "github.com/pkg/errors"
"io/ioutil"
"log"
"net/http"
@@ -14,20 +13,20 @@ import (
type publisher struct {
apiKey string
- apiUri string
+ apiURI string
product string
dryRun bool
enterprise bool
- baseArchiveUrl string
+ baseArchiveURL string
builder releaseBuilder
}
type releaseBuilder interface {
- prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error)
+ prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error)
}
-func (p *publisher) doRelease(whatsNewUrl string, releaseNotesUrl string, nightly bool) error {
- currentRelease, err := p.builder.prepareRelease(p.baseArchiveUrl, whatsNewUrl, releaseNotesUrl, nightly)
+func (p *publisher) doRelease(whatsNewURL string, releaseNotesURL string, nightly bool) error {
+ currentRelease, err := p.builder.prepareRelease(p.baseArchiveURL, whatsNewURL, releaseNotesURL, nightly)
if err != nil {
return err
}
@@ -62,23 +61,26 @@ func (p *publisher) postRelease(r *release) error {
return nil
}
-type ReleaseType int
+type releaseType int
const (
- STABLE ReleaseType = iota + 1
+ // STABLE is a release type constant
+ STABLE releaseType = iota + 1
+ // BETA is a release type constant
BETA
+ // NIGHTLY is a release type constant
NIGHTLY
)
-func (rt ReleaseType) beta() bool {
+func (rt releaseType) beta() bool {
return rt == BETA
}
-func (rt ReleaseType) stable() bool {
+func (rt releaseType) stable() bool {
return rt == STABLE
}
-func (rt ReleaseType) nightly() bool {
+func (rt releaseType) nightly() bool {
return rt == NIGHTLY
}
@@ -88,7 +90,7 @@ type buildArtifact struct {
urlPostfix string
}
-func (t buildArtifact) getUrl(baseArchiveUrl, version string, releaseType ReleaseType) string {
+func (t buildArtifact) getURL(baseArchiveURL, version string, releaseType releaseType) string {
prefix := "-"
rhelReleaseExtra := ""
@@ -100,7 +102,7 @@ func (t buildArtifact) getUrl(baseArchiveUrl, version string, releaseType Releas
rhelReleaseExtra = "-1"
}
- url := strings.Join([]string{baseArchiveUrl, prefix, version, rhelReleaseExtra, t.urlPostfix}, "")
+ url := strings.Join([]string{baseArchiveURL, prefix, version, rhelReleaseExtra, t.urlPostfix}, "")
return url
}
@@ -125,11 +127,21 @@ var completeBuildArtifactConfigurations = []buildArtifact{
arch: "armv7",
urlPostfix: "_armhf.deb",
},
+ {
+ os: "deb",
+ arch: "armv6",
+ urlPostfix: "_armel.deb",
+ },
{
os: "rhel",
arch: "armv7",
urlPostfix: ".armhfp.rpm",
},
+ {
+ os: "linux",
+ arch: "armv6",
+ urlPostfix: ".linux-armv6.tar.gz",
+ },
{
os: "linux",
arch: "armv7",
@@ -181,23 +193,23 @@ func filterBuildArtifacts(filters []artifactFilter) ([]buildArtifact, error) {
}
if !matched {
- return nil, errors.New(fmt.Sprintf("No buildArtifact for os=%v, arch=%v", f.os, f.arch))
+ return nil, fmt.Errorf("No buildArtifact for os=%v, arch=%v", f.os, f.arch)
}
}
return artifacts, nil
}
-func newBuild(baseArchiveUrl string, ba buildArtifact, version string, rt ReleaseType, sha256 string) build {
+func newBuild(baseArchiveURL string, ba buildArtifact, version string, rt releaseType, sha256 string) build {
return build{
Os: ba.os,
- Url: ba.getUrl(baseArchiveUrl, version, rt),
+ URL: ba.getURL(baseArchiveURL, version, rt),
Sha256: sha256,
Arch: ba.arch,
}
}
-func (p *publisher) apiUrl(url string) string {
- return fmt.Sprintf("%s/%s%s", p.apiUri, p.product, url)
+func (p *publisher) apiURL(url string) string {
+ return fmt.Sprintf("%s/%s%s", p.apiURI, p.product, url)
}
func (p *publisher) postRequest(url string, obj interface{}, desc string) error {
@@ -207,12 +219,12 @@ func (p *publisher) postRequest(url string, obj interface{}, desc string) error
}
if p.dryRun {
- log.Println(fmt.Sprintf("POST to %s:", p.apiUrl(url)))
+ log.Println(fmt.Sprintf("POST to %s:", p.apiURL(url)))
log.Println(string(jsonBytes))
return nil
}
- req, err := http.NewRequest(http.MethodPost, p.apiUrl(url), bytes.NewReader(jsonBytes))
+ req, err := http.NewRequest(http.MethodPost, p.apiURL(url), bytes.NewReader(jsonBytes))
if err != nil {
return err
}
@@ -254,14 +266,14 @@ type release struct {
Stable bool `json:"stable"`
Beta bool `json:"beta"`
Nightly bool `json:"nightly"`
- WhatsNewUrl string `json:"whatsNewUrl"`
- ReleaseNotesUrl string `json:"releaseNotesUrl"`
+ WhatsNewURL string `json:"whatsNewUrl"`
+ ReleaseNotesURL string `json:"releaseNotesUrl"`
Builds []build `json:"-"`
}
type build struct {
Os string `json:"os"`
- Url string `json:"url"`
+ URL string `json:"url"`
Sha256 string `json:"sha256"`
Arch string `json:"arch"`
}
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
index 2aea55d5ee1..bd2bbdce60e 100644
--- a/scripts/build/release_publisher/publisher_test.go
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -7,69 +7,69 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
cases := []struct {
version string
expectedVersion string
- whatsNewUrl string
- relNotesUrl string
+ whatsNewURL string
+ relNotesURL string
nightly bool
expectedBeta bool
expectedStable bool
expectedArch string
expectedOs string
- expectedUrl string
- baseArchiveUrl string
+ expectedURL string
+ baseArchiveURL string
buildArtifacts []buildArtifact
}{
{
version: "v5.2.0-beta1",
expectedVersion: "5.2.0-beta1",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: false,
expectedBeta: true,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "linux",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.0-beta1.linux-amd64.tar.gz",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.0-beta1.linux-amd64.tar.gz",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"linux", "amd64", ".linux-amd64.tar.gz"}},
},
{
version: "v5.2.3",
expectedVersion: "5.2.3",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: false,
expectedBeta: false,
expectedStable: true,
expectedArch: "amd64",
expectedOs: "rhel",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.3-1.x86_64.rpm",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.3-1.x86_64.rpm",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"rhel", "amd64", ".x86_64.rpm"}},
},
{
version: "v5.4.0-pre1asdf",
expectedVersion: "5.4.0-pre1asdf",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: true,
expectedBeta: false,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "rhel",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.x86_64.rpm",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.x86_64.rpm",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"rhel", "amd64", ".x86_64.rpm"}},
},
}
for _, test := range cases {
builder := releaseFromExternalContent{
- getter: mockHttpGetter{},
+ getter: mockHTTPGetter{},
rawVersion: test.version,
artifactConfigurations: test.buildArtifacts,
}
- rel, _ := builder.prepareRelease(test.baseArchiveUrl, test.whatsNewUrl, test.relNotesUrl, test.nightly)
+ rel, _ := builder.prepareRelease(test.baseArchiveURL, test.whatsNewURL, test.relNotesURL, test.nightly)
if rel.Beta != test.expectedBeta || rel.Stable != test.expectedStable {
t.Errorf("%s should have been tagged as beta=%v, stable=%v.", test.version, test.expectedBeta, test.expectedStable)
@@ -93,21 +93,21 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
t.Errorf("Expected os to be %v, but it was %v", test.expectedOs, build.Os)
}
- if build.Url != test.expectedUrl {
- t.Errorf("Expected url to be %v, but it was %v", test.expectedUrl, build.Url)
+ if build.URL != test.expectedURL {
+ t.Errorf("Expected url to be %v, but it was %v", test.expectedURL, build.URL)
}
}
}
-type mockHttpGetter struct{}
+type mockHTTPGetter struct{}
-func (mockHttpGetter) getContents(url string) (string, error) {
+func (mockHTTPGetter) getContents(url string) (string, error) {
return url, nil
}
func TestPreparingReleaseFromLocal(t *testing.T) {
- whatsNewUrl := "https://whatsnews.foo/"
- relNotesUrl := "https://relnotes.foo/"
+ whatsNewURL := "https://whatsnews.foo/"
+ relNotesURL := "https://relnotes.foo/"
expectedVersion := "5.4.0-123pre1"
expectedBuilds := 4
@@ -118,17 +118,17 @@ func TestPreparingReleaseFromLocal(t *testing.T) {
artifactConfigurations: completeBuildArtifactConfigurations,
}
- relAll, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewUrl, relNotesUrl, true)
+ relAll, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewURL, relNotesURL, true)
if relAll.Stable || !relAll.Nightly {
t.Error("Expected a nightly release but wasn't.")
}
- if relAll.ReleaseNotesUrl != relNotesUrl {
- t.Errorf("expected releaseNotesUrl to be %s, but it was %s", relNotesUrl, relAll.ReleaseNotesUrl)
+ if relAll.ReleaseNotesURL != relNotesURL {
+ t.Errorf("expected releaseNotesURL to be %s, but it was %s", relNotesURL, relAll.ReleaseNotesURL)
}
- if relAll.WhatsNewUrl != whatsNewUrl {
- t.Errorf("expected whatsNewUrl to be %s, but it was %s", whatsNewUrl, relAll.WhatsNewUrl)
+ if relAll.WhatsNewURL != whatsNewURL {
+ t.Errorf("expected whatsNewURL to be %s, but it was %s", whatsNewURL, relAll.WhatsNewURL)
}
if relAll.Beta {
@@ -155,7 +155,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) {
}},
}
- relOne, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewUrl, relNotesUrl, true)
+ relOne, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewURL, relNotesURL, true)
if len(relOne.Builds) != 1 {
t.Errorf("Expected 1 artifact, but was %v", len(relOne.Builds))
diff --git a/style_guides/frontend.md b/style_guides/frontend.md
new file mode 100644
index 00000000000..8d0849506a3
--- /dev/null
+++ b/style_guides/frontend.md
@@ -0,0 +1,62 @@
+# Frontend Style Guide
+
+Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/javascript/tree/master/react).
+
+## Table of Contents
+
+ 1. [Basic Rules](#basic-rules)
+ 1. [File & Component Organization](#Organization)
+ 1. [Naming](#naming)
+ 1. [Declaration](#declaration)
+ 1. [Props](#props)
+ 1. [Refs](#refs)
+ 1. [Methods](#methods)
+ 1. [Ordering](#ordering)
+
+## Basic rules
+
+* Try to keep files small and focused and break large components up into sub components.
+
+## Organization
+
+* Components and types that needs to be used by external plugins needs to go into @grafana/ui
+* Components should get their own folder under features/xxx/components
+ * Sub components can live in that component folders, so not small component needs their own folder
+ * Place test next to their component file (same dir)
+ * Mocks in __mocks__ dir
+ * Test utils in __tests__ dir
+ * Component sass should live in the same folder as component code
+* State logic & domain models should live in features/xxx/state
+* Containers (pages) can live in feature root features/xxx
+ * up for debate?
+
+## Props
+
+* Name callback props & handlers with a "on" prefix.
+
+```tsx
+// good
+onChange = () => {
+
+};
+
+render() {
+ return (
+