Commit 6e2348d2 by Torkel Ödegaard

renamed graphite panel to graph

parent 525c4d52
vNext
# vNext
#### New features or improvements
- New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
- Allow special characters in serie names (influxdb datasource), PR #390 - thx @majst01
- Refactoring of filterSrv (Issue #428), thx @Tetha
......@@ -12,7 +14,10 @@ vNext
- Improvement to InfluxDB query editor and function/value column selection (Issue #473)
- Initial support for filtering (templated queries) for InfluxDB (PR #375) - thx @mavimo
# Fixes
#### Changes
- Graphite panel is now renamed graph (Existing dashboards will still work)
#### Fixes
- Filter option loading when having muliple nested filters now works better.
Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447),
After an option is changed and a nested template param is also reloaded, if the current value
......
<div ng-controller='graphite'
<div ng-controller='graph'
ng-init="init()"
style="min-height:{{panel.height || row.height}}"
ng-class="{'panel-fullscreen': fullscreen}">
......@@ -16,7 +16,7 @@
</div>
<div ng-if="panel.legend" class="grafana-legend-container">
<div ng-include="'app/panels/graphite/legend.html'"></div>
<div ng-include="'app/panels/graph/legend.html'"></div>
</div>
<div class="clearfix"></div>
......
......@@ -33,10 +33,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
'use strict';
var module = angular.module('kibana.panels.graphite', []);
var module = angular.module('kibana.panels.graph', []);
app.useModule(module);
module.controller('graphite', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {
module.controller('graph', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {
$scope.panelMeta = {
modals : [],
......@@ -52,11 +52,11 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
},
{
title:'Axes & Grid',
src:'app/panels/graphite/axisEditor.html'
src:'app/panels/graph/axisEditor.html'
},
{
title:'Display Styles',
src:'app/panels/graphite/styleEditor.html'
src:'app/panels/graph/styleEditor.html'
}
],
fullscreenEdit: true,
......
......@@ -138,6 +138,14 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
});
}
_.each(dashboard.rows, function(row) {
_.each(row.panels, function(panel) {
if (panel.type === 'graphite') {
panel.type = 'graph';
}
});
});
return dashboard;
};
......
......@@ -76,7 +76,7 @@ function (Settings) {
panel_names: [
'text',
'graphite'
'graph'
]
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment