diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js index 966ee7f8c01..0fb65e4cb80 100644 --- a/src/app/components/require.config.js +++ b/src/app/components/require.config.js @@ -53,8 +53,8 @@ require.config({ }, rq: { - deps: ['setImmediate'], - exports: 'RQ' + deps: ['setImmediate'], + exports: 'RQ' }, angular: { diff --git a/src/app/components/settings.js b/src/app/components/settings.js index b283dd16aeb..8d255530162 100644 --- a/src/app/components/settings.js +++ b/src/app/components/settings.js @@ -12,8 +12,8 @@ function (_) { var defaults = { elasticsearch : "http://"+window.location.hostname+":9200", panel_names : [], - kibana_index : 'kibana-int', - graphiteUrl : null, + kibana_index : 'kibana-int', + graphiteUrl : null, default_route : '/dashboard/file/default.json' }; diff --git a/src/app/controllers/zoom.js b/src/app/controllers/zoom.js index d46f638d006..21135f9f3aa 100644 --- a/src/app/controllers/zoom.js +++ b/src/app/controllers/zoom.js @@ -1,9 +1,10 @@ define([ 'angular', 'app', - 'underscore' + 'underscore', + 'moment', ], -function (angular, app, _) { +function (angular, app, _, moment) { 'use strict'; var module = angular.module('kibana.controllers'); @@ -30,6 +31,7 @@ function (angular, app, _) { if(factor > 1) { filterSrv.removeByType('time'); } + filterSrv.set({ type:'time', from:moment.utc(_from).toDate(), diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index 183397d4b08..76ea9b2b3c5 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -54,7 +54,7 @@ "spyable": true, "targets": [ { - "target": "summarize(sum(prod.apps.tradera_site.*.counters.global.request_status.code_404.count), '30s')" + "target": "" } ] } diff --git a/src/app/panels/graphite/graphiteSrv.js b/src/app/panels/graphite/graphiteSrv.js index 0c2731510f7..4828d9bd56d 100644 --- a/src/app/panels/graphite/graphiteSrv.js +++ b/src/app/panels/graphite/graphiteSrv.js @@ -66,7 +66,7 @@ function ($, RQ, config) { until: $.plot.formatDate(options.range.to, '%H%:%M_%Y%m%d'), targets: options.targets, maxDataPoints: options.maxDataPoints - } + }; var graphiteParameters = build_graphite_options(graphOptions, true); getGraphiteData(graphiteParameters) @@ -76,7 +76,7 @@ function ($, RQ, config) { .fail(function() { requestion(null, 'Error in ajax call to graphite'); }); - } + }; } function getGraphiteData(parameters) { diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html index 72838b91356..45689dfaf33 100644 --- a/src/app/panels/graphite/module.html +++ b/src/app/panels/graphite/module.html @@ -56,10 +56,6 @@ View |  - - - Zoom Out -