IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 11:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1507 from ryan-williams/typos

Browse Source 
typo fixes, .gitignore tweak
This commit is contained in:
Torkel Ödegaard 2015-02-22 08:31:24 +01:00
commit afeaa9fecd
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,6 +13,7 @@ src/css/*.min.css
*.sublime-workspace *.sublime-workspace
*.swp *.swp
.idea/ .idea/
*.iml
/data/* /data/*
/bin/* /bin/*

6
src/dashboards/scripted.js
View File

@ -3,7 +3,7 @@
/* /*
* Complex scripted dashboard * Complex scripted dashboard
* This script generates a dashboard object that Grafana can load. It also takes a number of user * This script generates a dashboard object that Grafana can load. It also takes a number of user
* supplied URL parameters (int ARGS variable) * supplied URL parameters (in the ARGS variable)
* *
* Return a dashboard object, or a function * Return a dashboard object, or a function
* *
@ -13,7 +13,7 @@
'use strict'; 'use strict';
// accessable variables in this scope // accessible variables in this scope
var window, document, ARGS, $, jQuery, moment, kbn; var window, document, ARGS, $, jQuery, moment, kbn;
// Setup some variables // Setup some variables
@ -31,7 +31,7 @@ dashboard = {
dashboard.title = 'Scripted dash'; dashboard.title = 'Scripted dash';
// Set default time // Set default time
// time can be overriden in the url using from/to parameteres, but this is // time can be overriden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization // handled automatically in grafana core during dashboard initialization
dashboard.time = { dashboard.time = {
from: "now-6h", from: "now-6h",

8
src/dashboards/scripted_async.js
View File

@ -3,7 +3,7 @@
/* /*
* Complex scripted dashboard * Complex scripted dashboard
* This script generates a dashboard object that Grafana can load. It also takes a number of user * This script generates a dashboard object that Grafana can load. It also takes a number of user
* supplied URL parameters (int ARGS variable) * supplied URL parameters (in the ARGS variable)
* *
* Global accessable variables * Global accessable variables
* window, document, $, jQuery, ARGS, moment * window, document, $, jQuery, ARGS, moment
@ -11,12 +11,12 @@
* Return a dashboard object, or a function * Return a dashboard object, or a function
* *
* For async scripts, return a function, this function must take a single callback function, * For async scripts, return a function, this function must take a single callback function,
* call this function with the dasboard object * call this function with the dashboard object
*/ */
'use strict'; 'use strict';
// accessable variables in this scope // accessible variables in this scope
var window, document, ARGS, $, jQuery, moment, kbn; var window, document, ARGS, $, jQuery, moment, kbn;
return function(callback) { return function(callback) {
@ -34,7 +34,7 @@ return function(callback) {
dashboard.title = 'Scripted dash'; dashboard.title = 'Scripted dash';
// Set default time // Set default time
// time can be overriden in the url using from/to parameteres, but this is // time can be overriden in the url using from/to parameters, but this is
// handled automatically in grafana core during dashboard initialization // handled automatically in grafana core during dashboard initialization
dashboard.time = { dashboard.time = {
from: "now-6h", from: "now-6h",

4
src/dashboards/scripted_gen_and_save.js
View File

@ -3,7 +3,7 @@
/* /*
* Complex scripted dashboard * Complex scripted dashboard
* This script generates a dashboard object that Grafana can load. It also takes a number of user * This script generates a dashboard object that Grafana can load. It also takes a number of user
* supplied URL parameters (int ARGS variable) * supplied URL parameters (in the ARGS variable)
* *
* Return a dashboard object, or a function * Return a dashboard object, or a function
* *
@ -13,7 +13,7 @@
'use strict'; 'use strict';
// accessable variables in this scope // accessible variables in this scope
var window, document, ARGS, $, jQuery, moment, kbn, services, _; var window, document, ARGS, $, jQuery, moment, kbn, services, _;
// default datasource // default datasource