IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-08 05:47:30 +02:00
commit 2a7d2ffccb
5 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/grafana_app.ts
View File

@ -17,7 +17,7 @@ export class GrafanaCtrl {
$scope._ = _;
$rootScope.profilingEnabled = store.getBool('profilingEnabled');
$rootScope.profilingEnabled = store.getBool('profilingEnabled') || config.buildInfo.env === 'development';
$rootScope.performance = { loadStart: new Date().getTime() };
$rootScope.appSubUrl = config.appSubUrl;

8
public/app/features/dashboard/dashboardCtrl.js
View File

@ -60,6 +60,14 @@ function (angular, $, config, moment) {
$scope.updateSubmenuVisibility();
$scope.setWindowTitleAndTheme();
if ($scope.profilingEnabled) {
$scope.performance.panels = [];
$scope.performance.panelCount = 0;
$scope.dashboard.rows.forEach(function(row) {
$scope.performance.panelCount += row.panels.length;
});
}
$scope.appEvent("dashboard-loaded", $scope.dashboard);
}).catch(function(err) {
if (err.data && err.data.message) { err.message = err.data.message; }

7
public/app/features/dashboard/viewStateSrv.js
View File

@ -51,6 +51,13 @@ function (angular, _, $) {
$scope.onAppEvent('panel-initialized', function(evt, payload) {
self.registerPanel(payload.scope);
if ($scope.profilingEnabled) {
$scope.performance.panelsInitialized++;
if ($scope.performance.panelsInitialized === $scope.performance.panelCount) {
$scope.performance.allPanelsInitialized = new Date().getTime();
}
}
});
this.update(this.getQueryStringState());

1
public/app/features/panel/metrics_panel_ctrl.ts
View File

@ -95,7 +95,6 @@ class MetricsPanelCtrl extends PanelCtrl {
}
setTimeQueryStart() {
this.timing = {};
this.timing.queryStart = new Date().getTime();
}

17
public/app/features/panel/panel_ctrl.ts
View File

@ -31,6 +31,7 @@ export class PanelCtrl {
height: any;
containerHeight: any;
events: Emitter;
timing: any;
constructor($scope, $injector) {
this.$injector = $injector;
@ -38,6 +39,7 @@ export class PanelCtrl {
this.$timeout = $injector.get('$timeout');
this.editorTabIndex = 0;
this.events = new Emitter();
this.timing = {};
var plugin = config.panels[this.panel.type];
if (plugin) {
@ -58,6 +60,20 @@ export class PanelCtrl {
renderingCompleted() {
this.$scope.$root.performance.panelsRendered++;
this.timing.renderEnd = new Date().getTime();
if (this.$scope.$root.profilingEnabled) {
this.$scope.$root.performance.panels.push({
panelId: this.panel.id,
query: this.timing.queryEnd - this.timing.queryStart,
render: this.timing.renderEnd - this.timing.renderStart,
});
if (this.$scope.$root.performance.panelsRendered === this.$scope.$root.performance.panelCount) {
this.$scope.$root.performance.allPanelsRendered = new Date().getTime();
var timeTaken = this.$scope.$root.performance.allPanelsRendered - this.$scope.$root.performance.dashboardLoadStart;
console.log("Dashboard::Performance - All panels rendered in " + timeTaken + " ms");
}
}
}
refresh() {
@ -169,6 +185,7 @@ export class PanelCtrl {
}
this.calculatePanelHeight();
this.timing.renderStart = new Date().getTime();
this.events.emit('render', payload);
}