From 8e0bba4f99e7a62ec7b17962b4039a198fcc1113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 1 Dec 2015 09:01:44 +0100 Subject: [PATCH] fix(templating): minor fix to default property name, fixes #3378 --- docs/sources/reference/dashboard.md | 8 ++++---- public/app/features/templating/editorCtrl.js | 2 +- public/dashboards/template_vars.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/sources/reference/dashboard.md b/docs/sources/reference/dashboard.md index 5b18b9e26ad..93adf5cd789 100644 --- a/docs/sources/reference/dashboard.md +++ b/docs/sources/reference/dashboard.md @@ -1,5 +1,5 @@ ---- -page_title: Dashboard JSON +page_title: Dashboard JSON page_description: Dashboard JSON Reference page_keywords: grafana, dashboard, json, documentation --- @@ -363,7 +363,7 @@ Usage of the fields is explained below: ], "query": "tag_values(cpu.utilization.average,env)", "refresh": false, - "refresh_on_load": false, + "refresh": false, "type": "query" }, { @@ -390,7 +390,7 @@ Usage of the fields is explained below: } ], "query": "tag_values(cpu.utilization.average,app)", - "refresh_on_load": false, + "refresh": false, "regex": "", "type": "query" } @@ -413,7 +413,7 @@ Usage of the above mentioned fields in the templating section is explained below | **name** | name of variable | | **options** | array of variable text/value pairs available for selection on dashboard | | **query** | datasource query used to fetch values for a variable | -| **refresh_on_load** | TODO | +| **refresh** | TODO | | **regex** | TODO | | **type** | type of variable, i.e. `custom`, `query` or `interval` | diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index 852de52655d..a6de887101a 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -12,7 +12,7 @@ function (angular, _) { var replacementDefaults = { type: 'query', datasource: null, - refresh_on_load: false, + refresh: false, name: '', options: [], includeAll: false, diff --git a/public/dashboards/template_vars.json b/public/dashboards/template_vars.json index 43e9e37836c..fbf2ae0dc9d 100644 --- a/public/dashboards/template_vars.json +++ b/public/dashboards/template_vars.json @@ -241,7 +241,7 @@ { "type": "query", "datasource": null, - "refresh_on_load": false, + "refresh": false, "name": "metric", "options": [], "includeAll": true,