Torkel Ödegaard 12 gadi atpakaļ
vecāks
revīzija
a0cee35309

+ 1 - 1
src/app/components/require.config.js

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

+ 2 - 1
src/app/dashboards/blank.json

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

+ 1 - 1
src/app/panels/graphite/module.html

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

+ 7 - 0
src/app/services/graphite/gfunc.js

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

+ 1 - 1
src/vendor/bootstrap/less/grafana.less

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