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
25,590 Commits 5,454 Branches 554 Tags 1.9 GiB
e8e280c83e
Commit Graph

525 Commits

Author SHA1 Message Date
Ryan McKinley
6335509a23 Annotations: use a single row to represent a region (#17673) 
* SQLite migrations

* cleanup

* migrate end times

* switch to update with a query

* real migration

* anno migrations

* remove old docs

* set isRegion from time changes

* use <> for is not

* add comment and fix index decleration

* single validation place

* add test

* fix test

* add upgrading docs

* use AnnotationEvent

* fix import

* remove regionId from typescript
 2019-08-16 10:49:30 +02:00
Torkel Ödegaard
286b52f5e7
Docs: Update upgrading guide (#18547) 
* Docs: Update upgrading docs

* Docs: updated spelling
 2019-08-16 10:29:22 +02:00
Kyle Brandt
f689b60426
remotecache: support SSL with redis (#18511) 
* update go-redis lib from v2 -> v5
* add ssl option to the redis connection string
fixes #18498
 2019-08-13 06:51:13 -04:00
Marcus Efraimsson
5459e7c9af
Docs: Adds a new security section (#18508) 
Co-Authored-By: Leonard Gram <leo@xlson.com>
 2019-08-12 13:23:20 +02:00
Alexandre de Verteuil
d5e7ef2317 Update behind_proxy.md with linkback to nginx.com (#18150) 2019-08-06 09:47:08 +02:00
Gautham Pai
6e5898ac79 Docs: sudo is required on the apt-key add not on wget (#18180) 
Running the command as given in the current doc throws the error:

```
sudo wget -q -O - https://packages.grafana.com/gpg.key | apt-key add -
ERROR: This command can only be used by root.
```

The proposed change fixes this issue.
 2019-07-20 12:57:18 +02:00
Torkel Ödegaard
1e058424b0
Docs: Simplify download links & instructions and make download link clearer (#18090) 
* put the version number in the docs

* add links to download page

* Docs: Make download link more clear

* Docs: minor tweaks
 2019-07-12 18:12:50 +02:00
Marcus Efraimsson
0833f26b43
Elasticsearch: Fix default max concurrent shard requests (#17770) 
Elasticsearch v7.0 changed the behavior of max concurrent shard
requests and the default to 5. v5.6 and before 7.0 the default
is 256. This adds some additional behavior given certain
version is selected when configure the datasource to set
default max concurrent shard requests.
Changing from a version pre-v7.0+ to v7.0+ sets max
concurrent shard requests to 5.
Changing from a version v7.0+ to a pre-v7.0 sets max
concurrent shard requests to 256.

Fixes #17454
 2019-06-28 18:38:16 +02:00
Marcus Efraimsson
c392a492ae
Docs: Add v6.3 version notes and encryption format information (#17825) 
Adds version note for alert rule tags.
Adds version note for graph data links.
Adds information about secret_key and encryption format in use

Fixes #17815
Fixes #17803
 2019-06-28 16:32:42 +02:00
Jared Burns
6fd4aa4b46 Docs: Flag serve_from_sub_path as available in 6.3 (#17674) 
Follow-up to PR #17048. Flag the new serve_from_sub_path option as available in 6.3.
 2019-06-20 07:06:09 +02:00
Zayn-ul-Abdin
df917663e6 Docs feedback: installation/debian.md (#17563) 
Closes #17129
 2019-06-13 09:52:44 +02:00
Kyle Brandt
599514ad68
middleware: add security related HTTP(S) response headers (#17522) 
* x_xss_protection
  * strict_transport_security (HSTS)
  * x_content_type_options

these are currently defaulted to false (off) until the next minor release.

fixes #17509
 2019-06-12 13:15:50 +02:00
Johannes Schill
3da8cff6e9
Chore: Hugo upgrade (#17494) 
* Fix: Upgrade hugo wip

* Chore: Rename index to _index for latest hugo

* Chore: Use relative refs, no starting slash

* Feat: Add possibility to mount layouts from grafana.org project
 2019-06-12 08:01:44 +02:00
Abhilash Gnan
04d473b3e5 HTTP Server: Serve Grafana with a custom URL path prefix (#17048) 
Adds a new [server] setting `serve_from_sub_path`. By enabling 
this setting and using a subpath in `root_url` setting, e.g.
`root_url = http://localhost:3000/grafana`, Grafana will be accessible 
on `http://localhost:3000/grafana`. By default it is set to `false` 
for compatibility reasons.

Closes #16623
 2019-05-27 17:47:29 +02:00
Jannik F
8196642f25 Adjusted documentation for gcs to reflect the code (#16947) 
The key name for the bucket in GCS configuration is called bucket, not bucket name or bucket_name.
 2019-05-16 11:11:08 +02:00
Carl Bergquist
51c99fc68d
Docs: adds note about removing session storage (#17003) 
closes #17000
 2019-05-14 10:30:05 +02:00
Marcus Efraimsson
70abb19537
docs: what's new in v6.2 (#16909) 
Draft of What's new in v6.2 for the beta.

Closes #16902
 2019-05-07 13:47:05 +02:00
Marcus Efraimsson
1c1427520d
Security: Add new setting allow_embedding (#16853) 
When allow_embedding is false (default) the Grafana backend 
will set the http header `X-Frame-Options: deny` in all responses 
to non-static content which will instruct browser to not allow 
Grafana to be embedded in `<frame>`, `<iframe>`, 
`<embed>` or `<object>`.

Closes #14189
 2019-05-06 09:56:23 +02:00
Reiner Gerecke
928f9516de docs: explain correct access control model of GCS buckets (#16792) 2019-04-28 11:49:36 +02:00
Marcus Efraimsson
f4a8240d0d
docs: fix upgrade instructions 2019-04-23 16:53:28 +02:00
Oleg Gaidarenko
db584b3d28
Chore: remove session storage references (#16445) 
* Chore: remove session storage references

* Small refactoring of the settings module

* Update docs - remove references for the session storage

* Update config files (sample and default configs)

* Add tests for warning during the config load on defined storage cache

* Remove all references to session storage

* Remove macaron session dependency

* Remove leftovers

* Fix: address review comments

* Fix: remove old deps

* Fix: add skipStaticRootValidation = true to tests

* Fix: improve the docs and warning message

As per discussion in here - https://github.com/grafana/grafana/pull/16445/files#r273026255

* Chore: make linter happy

Fixes #16148
Ref #16114
 2019-04-22 18:58:24 +03:00
Torkel Ödegaard
d4bb92a3c5 Docs: minor docs update for old urls 2019-04-15 14:13:03 +02:00
Andrej Ocenas
66f6e16916
Security: Store datasource passwords encrypted in secureJsonData (#16175) 
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
 2019-04-15 11:11:17 +02:00
Dennis Hoppe
15383510c8 Use package libfontconfig1, instead of libfontconfig (#16548) 2019-04-15 08:20:42 +02:00
Ryan McKinley
3c21a121eb Plugins: Unifying alpha state & options for all plugins (#16530) 
* app pages

* app pages

* workign example

* started alpha support

* remove app stuff

* show warning on alpha/beta panels

* put app back on plugin file

* fix go

* add enum for PluginType and PluginIncludeType

* Refactoring and moving settings to plugins section

fixes #16529
 2019-04-12 13:46:42 +02:00
Pedro Gomes
6e54a7ae05 Docs: Suggest add-apt-repository to install APT repos (#16333) 
* Suggest add-apt-repository to install APT repos
* typo
 2019-04-02 07:02:58 +02:00
Zzy
1b84a924a3 Alerting: Makes timeouts and retries configurable (#16259) 
Adds new alert settings for configuring timeouts and retries named 
evaluation_timeout_seconds, notification_timeout_seconds 
and max_attempts.

Closes #16240
 2019-03-29 12:58:37 +07:00
Dennis Hoppe
749c76f2a1 Docs: Fix rpm dependencies example (#16272) 
The current version of Grafana requires the package ```urw-fonts```.
 2019-03-28 10:12:22 +01:00
Hugo Häggmark
b9cf09a296 docs: First take on describing feature toggle 2019-03-19 14:01:11 +01:00
Andrej Ocenas
697a87b7b2 Add check so that header is not sent for anonymous users 2019-03-14 16:33:21 +01:00
Andrej Ocenas
6587a967eb Update config docs 2019-03-14 16:33:20 +01:00
Carl Bergquist
291ffcb75b
Merge pull request #15457 from bergquist/distributed_cache 
Distributed cache
 2019-03-14 16:16:39 +01:00
Torkel Ödegaard
06f7a49a61 Refactoring / fixing password hint PR #15868 2019-03-11 13:33:57 +01:00
bergquist
085b631099 add docs about remote cache settings 2019-03-11 10:49:56 +01:00
Shaffer John
272b561958
Update upgrading.md for wrong spell 2019-03-07 11:09:17 +08:00
Bruno
b488892f5f Added enable_gzip documentation (#15322) 2019-02-17 17:38:56 -03:00
Marcus Efraimsson
88fbe3adca
docs: fix header 2019-02-15 11:27:21 +01:00
bergquist
191f9c8407 whats new: rename security section 2019-02-14 19:42:39 +01:00
bergquist
7f7cc85ef0 docs: adds note about new login cookie name 2019-02-14 13:24:41 +01:00
Marcus Efraimsson
1bd9573f8e
docs: add upgrade notes for v6.0 2019-02-13 19:53:55 +01:00
Marcus Efraimsson
c71904e326
Merge pull request #15239 from grafana/auth_token_middleware_refactor 
Auth token package and middleware refactoring
 2019-02-07 14:24:23 +01:00
Marcus Efraimsson
80d0943d9d
document login, short-lived tokens and secure cookie configurations 2019-02-05 21:10:56 +01:00
Daniel Lee
139fb65fa9 docs: fixes #14940 2019-02-05 12:36:12 +01:00
Torkel Ödegaard
05a976fdb1 added docs entry for check_for_updates config flag, fixes ##14940 2019-01-23 18:24:57 +01:00
Torkel Ödegaard
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Leonard Gram
023e496108 docs: rpm/deb beta repo. 2019-01-08 16:49:29 +01:00
Leonard Gram
dd6f606cda docs: updated debian and centos repo. 2019-01-04 16:36:32 +01:00
bergquist
74124ec8ed makes cache mode configurable 
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
 2018-12-27 10:48:11 +01:00
Bob Shannon
dcc48860b8 Fix formatting and remove enabled toggle 2018-11-14 17:37:32 -05:00
Bob Shannon
362b3740ed Add basic authentication support to metrics endpoint 2018-11-14 16:27:41 -05:00
Marcus Efraimsson
ead6a051df
docs: update debian installation instructions 2018-10-22 18:31:31 +02:00
Leonard Gram
cd96ef3590 docs: installing custom plugins in docker. 
[skip ci]
 2018-10-17 14:34:40 +02:00
Daniel Lee
8b5d03096d
Merge pull request #13587 from grafana/nikoalch-patch-4 
Update mac.md
 2018-10-10 13:35:19 +02:00
Daniel Lee
7bbd303c23
Merge pull request #13586 from grafana/nikoalch-patch-3 
Update windows.md
 2018-10-10 11:54:52 +02:00
Daniel Lee
7c2efbac0d
Merge pull request #13585 from grafana/nikoalch-patch-2 
Update rpm.md
 2018-10-10 11:54:20 +02:00
Daniel Lee
bbd5e19a34
Merge pull request #13584 from grafana/nikoalch-patch-1 
Update debian.md
 2018-10-10 08:34:33 +02:00
dadosch
2500fe27f1
Fix "appropriate"-typo 2018-10-02 19:20:48 +00:00
dadosch
b138ae9d4c
Update configuration doc to include socket@server 
`protocol=socket` and `socket=` path in [server]

fixes https://github.com/grafana/grafana/issues/8701
 2018-10-02 18:59:55 +00:00
Torkel Ödegaard
cb96c6d942 Changed setting to be an alerting setting 2018-09-25 12:17:04 +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
Marcus Efraimsson
db2264c554
docs: v5.2 upgrade notice, ref #13084 2018-09-03 15:12:17 +02:00
Torkel Ödegaard
1e2fde238c docs: corrected docs description for setting 2018-08-29 13:26:23 +02:00
Marcus Efraimsson
f55aad0ec9
Merge pull request #12919 from grafana/11580-how-to-start-grafana-docs 
docs: How to get started with Grafana for the first time
 2018-08-28 11:01:00 +02:00
Marcus Efraimsson
b218290f3a
docs: changes 2018-08-23 17:39:39 +02:00
Patrick O'Carroll
76bd173a36 created a section under administration for authentication, moved ldap guide here, created pages for auth-proxy, oauth, anonymous auth, ldap sync with grafana ee, and overview, moved authentication guides from configuration to, added linksin configuration page to guides 2018-08-23 15:58:37 +02:00
Patrick O'Carroll
d38c159893 added link to getting started to all, changed wording 2018-08-23 14:39:50 +02:00
Leonard Gram
0ce8a6a69d docs: cleanup. 2018-08-16 13:48:19 +02:00
Leonard Gram
d244b59cc1 docs: docker and restarts. 
Closes #10784
 2018-08-16 13:48:19 +02:00
Marcus Efraimsson
189de87619
docs: add grafana version note for gitlab oauth 2018-08-14 14:24:02 +02:00
Benoît Knecht
5a91e670d8 docs: gitlab: add note about more restrictive API scope 
If `allowed_groups` is not used with GitLab authentication, the
*read_user* scope can be used instead of *api*.
 2018-08-14 14:11:48 +02:00
Benoît Knecht
47cb0c47fd docs: document GitLab authentication backend 2018-08-14 14:11:48 +02:00
Patrick O'Carroll
e6ea8f7e0b added guide for logging in to grafana for the first and how to add a datasource 2018-08-14 13:21:52 +02:00
Marcus Efraimsson
4cebf38ff2
Merge pull request #12807 from nyxi/master 
Support client certificates for LDAP servers
 2018-08-13 15:48:39 +02:00
Wade Robson
62a25a4f28
Add example OR search_filter to docs 2018-08-08 09:13:28 -07:00
dadosch
4e33314c14 unix socket docs 2018-08-06 14:40:30 +02:00
Emil Flink
5bea54eaaa Support client certificates for LDAP servers 2018-08-03 12:00:20 +02:00
Leonard Gram
59c1705399 docs: mentation that config changes requires restart. 2018-07-24 10:34:11 +02:00
Torkel Ödegaard
913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
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
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
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
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
aae3b568f3
docs: upd windows installation 2018-06-29 18:21:56 +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
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
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
Anton Sergeyev
516839d7b2 #11607 Cleanup time of temporary files is now configurable 2018-06-14 12:35:22 +05: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
Leonard Gram
e562ae753b
docs: docker secrets support. (#12141) 
Closes #12132
 2018-06-04 11:49:12 +02:00
Daniel Lee
75993971c6 docs: installation pages for 5.1.3 2018-05-16 21:48:26 +02:00
bergquist
ca25a25386 docs: removes notes about beeing introduced in 5.0 2018-05-14 09:51:23 +02:00
Marcus Efraimsson
486aaca109
docs: update installation instructions targeting v5.1.2 stable 2018-05-09 14:03:22 +02:00
Marcus Efraimsson
23c88a3b3f
docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Dan Cech
29c9d3f74c fix root_url in docs & comments (#11819) 
* fix root_url in docs & comments

* include ports in docker-compose config
 2018-05-07 14:18:21 +02:00
Dan Cech
543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Leonard Gram
ec23816df6
docs: further documents changes to the docker image. (#11763) 
* docs: further documents changes to the docker image.
* docs: explains the changes to user id better.
 2018-04-27 17:06:08 +02:00
Marcus Efraimsson
6fa7ffc23f
docs: update installation instructions targeting v5.1.0 stable 2018-04-26 18:56:44 +02:00
Daniel Lee
f4f12c1e84 Merge remote-tracking branch 'upstream/master' into docs-5.1 2018-04-20 15:15:42 +02:00
bergquist
e168bfe03e docs: release 5.1.0-beta1 2018-04-20 13:23:45 +02:00
Leonard Gram
abed9c055f docs: new docker image in Grafana 5.1.0. 2018-04-16 15:33:15 +02:00
Mario Trangoni
638f7d23d4 docs: fix codespell issues 2018-04-13 20:31:29 +02:00
Torkel Ödegaard
d60c7b2013 docs: updated debian distro in install docs to stretch, closes #11527 2018-04-09 08:18:58 +02:00
Angus Burroughs
e645c51f7c
Fixed typo in upgrading.md 
Line 26: 'you' to 'your' in "make a backup of you 'grafana.db'"
 2018-03-28 16:26:15 +02:00
Daniel Lee
86776154cc docs: rpm install page - update to centos 7 2018-03-28 15:35:51 +02:00
Daniel Lee
485d0f1c95 docs: install pages for v5.0.4 2018-03-28 15:19:46 +02:00
Daniel Lee
1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm 2018-03-20 19:21:58 +01:00
Daniel Lee
4bf285c3d1 docs: update install docs for 5.0.3 2018-03-16 18:39:34 +01:00
Daniel Lee
9cdd7cb04c database: expose SetConnMaxLifetime as config setting 
For MySQL, setting this to be shorter than the wait_timeout MySQL setting
solves the issue with connection errors after the session has timed out for
the connection to the database via xorm.
 2018-03-16 01:09:00 +01:00
bergquist
bdf6a75c91 docs: updates latest release for docs 2018-03-14 17:09:02 +01:00
bergquist
e11437ff56 docs: update latest to 5.0.1 2018-03-08 11:06:21 +01:00
Daniel Lee
cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +01:00
Daniel Lee
f46f43dc32 docs: update install pages for v5.0.0 2018-03-01 09:20:52 +01:00
Laurent Godet
59704ee939 Fix Github OAuth not working with private Organizations (#11028) 
* Fix Github OAuth not working with private organizations

* Update documentation
 2018-02-28 13:08:15 +01:00
jganseman
7d91b73774
grammar fix, add dir, and remove redundant info 2018-02-27 13:26:53 +01:00
Daniel Lee
6f4c043dd6 docs: update to install pages for beta5 2018-02-26 11:05:37 +01:00
Marco Tulio R Braga
1a170133ca [doc] Fix extra alerting options in installation->configuration 2018-02-26 03:04:39 -03:00
Daniel Lee
fe49182b9d snapshots: fixes cleanup of old snapshots 
Snapshot cleanup did not work due to time.Now syntax error. Added test
for it as well to catch any future errors.

Added error and debug logging so that it is possible to see any errors in the future.

Removed an unused configuration value and deprecated the remove expired snapshots
setting.
 2018-02-22 16:12:16 +01:00
Torkel Ödegaard
2f6e77af1e Merge branch 'master' into docs_v5.0 2018-02-21 10:47:14 +01:00
Torkel Ödegaard
c5461fe2e2 docs: updated for changelog and docs with beta4 2018-02-19 15:41:59 +01:00
Torkel Ödegaard
577a00e3cf docs: updated to beta3 2018-02-16 14:43:36 +01:00
Torkel Ödegaard
39fdfb7922 Merge branch 'master' of github.com:grafana/grafana 2018-02-16 09:14:44 +01:00
Scott Brenner
43baf20dcd
Update ldap.md 2018-02-15 10:41:04 -08:00
Torkel Ödegaard
6b930df4d4 updated download links 2018-02-15 14:48:11 +01:00
Torkel Ödegaard
7f5e195cb4 Merge branch 'master' into docs_v5.0 2018-02-05 16:29:49 +01:00
Torkel Ödegaard
b2f62ae19c docs: update docs with download links 2018-02-05 16:02:17 +01:00
Marcus Efraimsson
49c02aa8d2 Merge branch 'master' into docs_v5.0 2018-02-05 15:23:32 +01:00
Torkel Ödegaard
50bd9eee55 docs: removed section with session table sql, that is not needed anymore 2018-02-01 13:16:39 +01:00
Torkel Ödegaard
17c1e7bac7 docs: added permissions page and updated folder docs 2018-01-31 16:07:27 +01:00
Torkel Ödegaard
1cc5349bfd docs: fixed order of sidemenu 2018-01-31 08:49:04 +01:00
Torkel Ödegaard
7cd379ac9f docs: fixed order of sidemenu 2018-01-30 16:14:28 +01:00
Tobias Svehagen
f129754a96 docs: Add haproxy example for running behind reverse-proxy 2018-01-24 20:03:46 +01:00
Torkel Ödegaard
a24aa3ae28 Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana 2018-01-23 12:44:27 +01:00
bergquist
5546828b9f cfg: adds info about local img uploader to docs 2018-01-22 11:11:30 +01:00