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' of github.com:jklukas/grafana into jklukas-master

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-20 09:08:00 +01:00
commit a5951592f7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/dashboards/scripted.js
View File

@ -23,7 +23,7 @@ var dashboard, timspan;
var ARGS; var ARGS;
// Set a default timespan if one isn't specified // Set a default timespan if one isn't specified
timspan = '1d'; timspan = ARGS.from || 'now-1d';
// Intialize a skeleton with nothing but a rows array and service object // Intialize a skeleton with nothing but a rows array and service object
dashboard = { dashboard = {
@ -33,7 +33,7 @@ dashboard = {
// Set a title // Set a title
dashboard.title = 'Scripted dash'; dashboard.title = 'Scripted dash';
dashboard.time = { dashboard.time = {
from: "now-" + (ARGS.from || timspan), from: timspan,
to: "now" to: "now"
}; };

4
src/app/dashboards/scripted_async.js
View File

@ -25,7 +25,7 @@ return function(callback) {
var dashboard, timspan; var dashboard, timspan;
// Set a default timespan if one isn't specified // Set a default timespan if one isn't specified
timspan = '1d'; timspan = ARGS.from || 'now-1d';
// Intialize a skeleton with nothing but a rows array and service object // Intialize a skeleton with nothing but a rows array and service object
dashboard = { dashboard = {
@ -36,7 +36,7 @@ return function(callback) {
// Set a title // Set a title
dashboard.title = 'Scripted dash'; dashboard.title = 'Scripted dash';
dashboard.time = { dashboard.time = {
from: "now-" + (ARGS.from || timspan), from: timspan,
to: "now" to: "now"
}; };

4
src/app/dashboards/scripted_templated.js
View File

@ -23,7 +23,7 @@ var dashboard, timspan;
var ARGS; var ARGS;
// Set a default timespan if one isn't specified // Set a default timespan if one isn't specified
timspan = '1d'; timspan = ARGS.from || 'now-1d';
// Intialize a skeleton with nothing but a rows array and service object // Intialize a skeleton with nothing but a rows array and service object
dashboard = { dashboard = {
@ -33,7 +33,7 @@ dashboard = {
// Set a title // Set a title
dashboard.title = 'Scripted dash'; dashboard.title = 'Scripted dash';
dashboard.time = { dashboard.time = {
from: "now-" + (ARGS.from || timspan), from: timspan,
to: "now" to: "now"
}; };
dashboard.templating = { dashboard.templating = {