Commit Graph

2896 Commits

Author SHA1 Message Date
Torkel Ödegaard 3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Jakob van Santen 92d417f6b4 Handle query string in storage public_url (#9351) (#12555) 2018-07-17 11:10:12 -07:00
Augustin 05e060dee0 HTTP API documentation +fix when updating a playlist (#12612)
* get id from path param when updating a playlist

* add playlist http api documentation

* remove required condition for the id in update cmd
2018-07-17 07:45:38 -07:00
Torkel Ödegaard c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +02:00
Mark Meyer 0f6e5e2953 Allow settting of default org id to auto-assign to (#12401)
Author:    Mark Meyer <mark@ofosos.org>
2018-07-13 12:14:40 -07:00
Shane 756c08e713 changed you to your (#12590) 2018-07-12 23:56:37 -07:00
nikoalch f34f5008ba Update mac.md
added local login info
2018-07-11 08:15:23 -07:00
nikoalch a0e1f58815 Update windows.md 2018-07-11 08:14:25 -07:00
nikoalch bcb11d6747 Update rpm.md
added local login info
2018-07-11 08:13:48 -07:00
nikoalch e944803f10 Update debian.md
added local login info
2018-07-11 08:13:15 -07:00
Marcus Efraimsson d90d4ce55d Merge pull request #12402 from AustinWinstanley/macros/sql
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros

The $__timeFilter macro now uses a BETWEEN with timestamps instead of 
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format 
YYYY-MM-DDThh:mm:ssZ instead of epoch
2018-07-04 20:01:43 +02:00
Augustin Husson 86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson 991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson 01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
zicklam a89351e8e0 correct example (#12481)
foo.bar.com in description, but foo.bar in configuration.
Updated description, makes more sense then changing the configuration :)
2018-07-02 09:01:42 -07:00
Marcus Efraimsson 7a4858dd11 docs: update folders api 2018-06-29 20:24:02 +02:00
Austin Winstanley 59675dc564 Changed documentation for MSSQL and MySQL to reflect macro changes 2018-06-29 13:07:48 -05:00
Marcus Efraimsson 2835acf48c docs: update scripted dashboard for v5 2018-06-29 19:36:15 +02:00
Marcus Efraimsson 4530925b9f docs: update scripted dashboard for v5 2018-06-29 19:30:29 +02:00
Marcus Efraimsson cdaeb1578d docs: update organisation http api
make the distinction clearer between /api/org and /api/orgs and that
basic auth must be used for the /api/orgs resource
2018-06-29 19:10:42 +02:00
Marcus Efraimsson aae3b568f3 docs: upd windows installation 2018-06-29 18:21:56 +02:00
Dan Cech 3056d9a80e support passing api token in Basic auth password (#12416) 2018-06-28 03:08:32 -07:00
Marcus Efraimsson 6fa87e6278 docs: upd what's new in v5.2 2018-06-27 14:20:36 +02:00
Marcus Efraimsson b011444246 release 5.2.0 2018-06-27 11:39:04 +02:00
Marcus Efraimsson e378f6db88 docs: update index with link to what's new in 5.2 instead of 5.0 2018-06-27 11:35:53 +02:00
Marcus Efraimsson 8d535dd90d docs: upd what's new in v5.2
[skip ci]
2018-06-26 15:42:34 +02:00
Marcus Efraimsson e256c61b54 docs: upd what's new in v5.2 2018-06-26 15:37:22 +02:00
Marcus Efraimsson 5a2cf5863d Merge pull request #12399 from grafana/12140_docs
docs: update installation instructions
2018-06-26 10:37:22 +02:00
peng weikang e4669681c4 Fix typo 2018-06-26 14:04:54 +08:00
Marcus Efraimsson 31239f33ed docs: update installation instructions 2018-06-25 17:22:31 +02:00
Carl Bergquist e17944db15 Merge pull request #12325 from albundy83/patch-1
Fix error in InfluxDB query
2018-06-21 10:57:26 +02:00
Marcus Efraimsson 8b5d78a63e docs: what's new in v5.2 and docker installation updates
[skip ci]
2018-06-20 18:53:17 +02:00
Marcus Efraimsson f73c04086c docs: update installation instructions 2018-06-19 15:00:45 +02:00
Daniel Lee 94f39cb734 docs: Plugin review guidelines and datasource auth pages 2018-06-19 13:16:41 +02:00
Grégoire Bellon-Gervais 7b3652af67 Fix error in InfluxDB query
Minor error in sql query to retrieve annotations
2018-06-18 16:10:40 +02:00
Carl Bergquist 764a4247f5 Merge pull request #12274 from xapon/11607-cleanup
#11607 Cleanup time of temporary files is now configurable
2018-06-18 13:50:05 +02:00
bergquist 10d840b1cc docs: adds info about grafana-dev container 2018-06-15 11:07:23 +02:00
Marcus Efraimsson b62322b128 Merge pull request #12288 from mlclmj/master
docs: HTTP Endpoint for Deleting an Organization
2018-06-15 10:37:51 +02:00
Vincent Fuchs c8becf57fa list name is deleteDatasources, not delete_datasources
fixes https://github.com/grafana/grafana/issues/12293
2018-06-15 12:19:53 +05:30
Malcolm Jones 2765afc830 Document the endpoint for deleting an org 2018-06-14 15:28:54 -04:00
Anton Sergeyev 516839d7b2 #11607 Cleanup time of temporary files is now configurable 2018-06-14 12:35:22 +05:00
nikoalch 0cc8ccdaa5 Update graphite.md 2018-06-13 08:40:15 -04:00
Marcus Efraimsson c39979a557 Merge pull request #12255 from dehrax/docs-dev-grafana
Update "Building from source" docs
2018-06-13 12:46:45 +02:00
Tobias Skarhed c650b50c37 Docs: output location from build script 2018-06-13 09:37:14 +02:00
Carl Bergquist d3a3e7cfd1 Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references
removed QueryOptionsCtrl references
2018-06-13 09:34:02 +02:00
Ken Dombeck 110522307a Correct Provisioning documentation link
It was pointing to Prometheus documentation instead.
2018-06-12 09:01:25 -07:00
Tobias Skarhed 8155ce9804 Docs: Update Build from Source 2018-06-12 15:06:17 +02:00
Jiang Ye c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
Leonard Gram 9e7651a1b3 docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
Dan Cech 9b29a19609 update google auth config docs 2018-06-04 12:32:35 -04:00