small fixes

pull/7/head
Torkel Ödegaard 12 years ago
parent bcc3efffcf
commit a0cee35309
  1. 2
      src/app/components/require.config.js
  2. 3
      src/app/dashboards/blank.json
  3. 2
      src/app/panels/graphite/module.html
  4. 7
      src/app/services/graphite/gfunc.js
  5. 2
      src/vendor/bootstrap/less/grafana.less

@ -5,7 +5,7 @@ require.config({
baseUrl: 'app', baseUrl: 'app',
// urlArgs: 'r=@REV@', // urlArgs: 'r=@REV@',
paths: { paths: {
config: '../config.dev', config: '../config',
settings: 'components/settings', settings: 'components/settings',
kbn: 'components/kbn', kbn: 'components/kbn',

@ -11,5 +11,6 @@
}, },
"rows": [], "rows": [],
"editable": true, "editable": true,
"failover": false "failover": false,
"panel_hints": true
} }

@ -1,7 +1,7 @@
<div ng-controller='graphite' <div ng-controller='graphite'
ng-init="init()" ng-init="init()"
style="min-height:{{panel.height || row.height}}" style="min-height:{{panel.height || row.height}}"
ng-class='{"panel-fullscreen": fullscreen}'> ng-class="{'panel-fullscreen': fullscreen}">
<style> <style>
.histogram-legend { .histogram-legend {

@ -117,6 +117,13 @@ function (_) {
defaultParams: ['1d'] defaultParams: ['1d']
}); });
addFuncDef({
name: 'summarize',
category: categories.Transform,
params: [ { name: "interval", type: "string" }],
defaultParams: ['1h']
});
_.each(categories, function(funcList, catName) { _.each(categories, function(funcList, catName) {
categories[catName] = _.sortBy(funcList, 'name'); categories[catName] = _.sortBy(funcList, 'name');
}); });

@ -122,7 +122,7 @@
.panel-fullscreen { .panel-fullscreen {
z-index: 1500; z-index: 1500;
display: block important; display: block !important;
position: fixed; position: fixed;
left: 0px; left: 0px;
right: 0px; right: 0px;

Loading…
Cancel
Save