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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-09-22 08:42:07 +02:00
parent 41e01184aa 79b873e40e
commit 18337f610d
418 changed files with 24139 additions and 3267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
///<reference path="../../headers/common.d.ts" />
import angular from 'angular';
import config from 'app/core/config';
import $ from 'jquery';
import _ from 'lodash';
@@ -10,7 +9,6 @@ import {PanelCtrl} from './panel_ctrl';
import * as rangeUtil from 'app/core/utils/rangeutil';
import * as dateMath from 'app/core/utils/datemath';
import {Subject} from 'vendor/npm/rxjs/Subject';
import {metricsTabDirective} from './metrics_tab';
class MetricsPanelCtrl extends PanelCtrl {

4
public/app/features/panel/metrics_tab.ts
View File

@@ -1,6 +1,5 @@
///<reference path="../../headers/common.d.ts" />
import _ from 'lodash';
import {DashboardModel} from '../dashboard/model';
import Remarkable from 'remarkable';
@@ -22,7 +21,7 @@ export class MetricsTabCtrl {
queryOptions: any;
/** @ngInject */
constructor($scope, private $sce, private datasourceSrv, private backendSrv, private $timeout) {
constructor($scope, private $sce, datasourceSrv, private backendSrv) {
this.panelCtrl = $scope.ctrl;
$scope.ctrl = this;
@@ -74,7 +73,6 @@ export class MetricsTabCtrl {
return;
}
var target: any = {isNew: true};
this.panelCtrl.addQuery({isNew: true, datasource: option.datasource.name});
this.addQueryDropdown = {text: 'Add Query', value: null, fake: true};
}

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

@@ -2,7 +2,6 @@
import config from 'app/core/config';
import _ from 'lodash';
import angular from 'angular';
import $ from 'jquery';
import {profiler} from 'app/core/profiler';
import Remarkable from 'remarkable';

3
public/app/features/panel/panel_directive.ts
View File

@@ -1,10 +1,7 @@
///<reference path="../../headers/common.d.ts" />
import angular from 'angular';
import $ from 'jquery';
import _ from 'lodash';
import Drop from 'tether-drop';
import {appEvents} from 'app/core/core';
var module = angular.module('grafana.directives');

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

@@ -1,7 +1,6 @@
///<reference path="../../headers/common.d.ts" />
import angular from 'angular';
import config from 'app/core/config';
var directiveModule = angular.module('grafana.directives');

2
public/app/features/panel/panel_header.ts
View File

@@ -1,7 +1,5 @@
///<reference path="../../headers/common.d.ts" />
import $ from 'jquery';
import angular from 'angular';
import {coreModule} from 'app/core/core';
var template = `

3
public/app/features/panel/query_ctrl.ts
View File

@@ -1,6 +1,5 @@
///<reference path="../../headers/common.d.ts" />
import angular from 'angular';
import _ from 'lodash';
export class QueryCtrl {
@@ -12,7 +11,7 @@ export class QueryCtrl {
error: string;
isLastQuery: boolean;
constructor(public $scope, private $injector) {
constructor(public $scope, public $injector) {
this.panel = this.panelCtrl.panel;
this.isLastQuery = _.indexOf(this.panel.targets, this.target) === (this.panel.targets.length - 1);
}

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

@@ -1,7 +1,6 @@
///<reference path="../../headers/common.d.ts" />
import angular from 'angular';
import _ from 'lodash';
var module = angular.module('grafana.directives');