Marcus Efraimsson
3932e4db5a
Merge remote-tracking branch 'origin/master' into concurrent-sql
2018-10-02 17:44:33 +02:00
Marcus Efraimsson
e5c376aead
docs: connection limits for sql datasources
2018-10-02 17:43:54 +02:00
Steven Arnott
043d5f1c05
Update ldap.md
2018-10-01 11:41:19 -04:00
Leonard Gram
b29ac5c509
docs: stackdriver version notice.
2018-10-01 14:35:20 +02:00
Erik Sundell
0507ff69fb
stackdriver: resolve merge conflict
2018-09-27 10:32:30 +02:00
Erik Sundell
c14c848819
stackdriver: update docs so that they align with alignment period rules in stackdriver gui
2018-09-27 10:23:37 +02:00
Daniel Lee
d405d8f255
stackdriver: publish docs to v5.3 (not root)
2018-09-27 10:14:10 +02:00
Daniel Lee
66c95991c1
Merge remote-tracking branch 'origin/master' into stackdriver-plugin
2018-09-26 17:59:56 +02:00
Daniel Lee
4c695dbd57
stackdriver: docs update
2018-09-26 17:54:32 +02:00
Carl Bergquist
af0f3f2119
Merge pull request #13391 from grafana/provisioning-interval
...
provisioning: changed update interval default 3 to 10 seconds
2018-09-25 22:43:34 +02:00
Carl Bergquist
4520962ac2
Merge pull request #13401 from grafana/render-limits
...
Concurrent render limits
2018-09-25 15:28:57 +02:00
Axel Pirek
d2f2c3f220
Fix spelling of your and you're
2018-09-25 12:38:02 +02:00
Torkel Ödegaard
cb96c6d942
Changed setting to be an alerting setting
2018-09-25 12:17:04 +02:00
Torkel Ödegaard
98dad530e2
provisioning: changed provisioning default update interval from 3 to 10 seconds
2018-09-22 10:06:57 +02:00
Marcus Efraimsson
7641c37dfc
docs: improve oauth generic azure ad instructions
2018-09-21 16:57:39 +02:00
Marcus Efraimsson
87bee3d983
Merge branch 'master' into patch-1
2018-09-21 16:55:09 +02:00
Torkel Ödegaard
855a2a9259
docs: changed Json Web Token wording to be just JSON key file
2018-09-21 11:30:57 +02:00
Torkel Ödegaard
c282f39121
Merge branch 'master' into stackdriver-plugin
2018-09-21 10:17:13 +02:00
Ben Doyle
7a95791025
Fix misspelled authentication in Auth overview doc
2018-09-20 14:16:43 +01:00
bergquist
6938fd5fff
Merge branch 'brian2222-patch-1'
...
* brian2222-patch-1:
removes testdata from getting started
Update getting_started.md
2018-09-17 11:51:48 +02:00
bergquist
d84a0ec3e7
removes testdata from getting started
2018-09-17 11:50:22 +02:00
Carl Bergquist
f22f1d46c8
Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var
...
annotations: allows template variables to be used in tag filter
2018-09-17 10:34:38 +02:00
Marcus Efraimsson
6ffca7f184
docs: add version disclaimer for postgres query editor
2018-09-17 10:32:28 +02:00
Marcus Efraimsson
112f03a6ab
Merge pull request #13293 from svenklemm/postgres-docs-query-builder
...
Add documentation for postgres query builder
2018-09-17 10:28:39 +02:00
bergquist
7588283287
docs: template variable support for annotations
2018-09-17 09:30:03 +02:00
brian2222
02dd27333e
Update getting_started.md
...
list of datasources updated in section: dashboards, panels, the buildingblocks of grafana...
2018-09-16 18:22:09 -07:00
Sven Klemm
138e7ab264
Add documentation for PostgreSQL query builder
2018-09-14 21:58:02 +02:00
Torkel Ödegaard
5fbe8eff4f
ldap: made minor change to group search, and to docs
2018-09-14 11:28:17 +02:00
Daniel Lee
b8231b2903
stackdriver: ux for config page, docs updated
2018-09-14 09:39:16 +02:00
Daniel Lee
b1db6a7d1e
docs: first draft for stackdriver datasource
2018-09-14 09:35:27 +02:00
Marcus Efraimsson
c56ca57df5
docs: include active directory ldap example and restructure
2018-09-12 17:54:47 +02:00
Mike Sollanych
55e42b5fff
Adding Centrify configuration for Oauth
...
Just some simple directions for configuring Centrify to enable oauth login!
2018-09-10 13:30:29 -07:00
Matthias Loibl
d561104b64
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:45:23 +02:00
Bob Shannon
f257ff0216
Allow oauth email attribute name to be configurable ( #13006 )
...
* Allow oauth email attribute name to be configurable
Signed-off-by: Bob Shannon <bshannon@palantir.com>
* Document e-mail determination steps for generic oauth
* Add reference to email_attribute_name
* Re-add e-mail determination docs to new generic-oauth page
* Inherit default e-mail attribute from defaults.ini
2018-09-10 09:45:07 +02:00
Sven Klemm
7c78b64a36
Document required order for time series queries ( #13204 )
2018-09-10 09:33:06 +02:00
Marcus Efraimsson
479e073451
docs: what's new in v5.3 placeholder
2018-09-06 15:22:03 +02:00
Marcus Efraimsson
26756f86aa
Merge pull request #13148 from svenklemm/postgres-min-interval
...
Add min time interval support for SQL datasources
2018-09-06 14:05:39 +02:00
Marcus Efraimsson
db639684bb
docs: sql datasources min time interval
2018-09-06 13:52:16 +02:00
Carl Bergquist
3c0b1ef581
Merge pull request #13170 from bergquist/alerting_default_setting
...
make default values for alerting configurable
2018-09-06 13:26:42 +02:00
Torkel Ödegaard
e364119774
docs: minor fixes
2018-09-06 13:21:11 +02:00
Torkel Ödegaard
320947359c
Merge branch '12886-docs-authentication-section'
2018-09-06 13:16:17 +02:00
Torkel Ödegaard
d6f9ebab63
docs: Updated auth docs
2018-09-06 13:15:36 +02:00
Torkel Ödegaard
a25b594506
docs: updated
2018-09-06 12:13:23 +02:00
bergquist
1e33a3780f
spelling errors
2018-09-06 11:51:24 +02:00
bergquist
3ce89cad71
make default values for alerting configurable
2018-09-06 11:26:14 +02:00
Leonard Gram
500a4b5f35
docs: default paths in the docker container.
2018-09-05 16:46:22 +02:00
Leonard Gram
5d87aa2fa4
Merge pull request #13031 from bergquist/golang_1.11
...
upgrade to golang 1.11
2018-09-05 15:31:43 +02:00
Sven Klemm
cb526d4557
Add min time interval to mysql and mssql
2018-09-05 12:02:57 +02:00
Sven Klemm
fd269945c9
document postgres min time interval
2018-09-05 09:57:09 +02:00
Marcus Efraimsson
8fcc9b1891
docs: postgres provisioning
2018-09-04 11:33:43 +02:00
