IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 16:15:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
27,359 Commits 5,442 Branches 554 Tags 1.9 GiB
ac3bf352d9
Commit Graph

561 Commits

Author SHA1 Message Date
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
Dan Cech
562aa58029
add docs for configuring OAuth with Auth0 and Azure AD 2018-01-19 14:00:17 -05:00
Daniel Lee
87064bff79 docs: small update to IIS proxy docs 2018-01-16 09:49:12 +01:00
Daniel Lee
77b5dee408 docs: Guide for IIS reverse proxy 2018-01-12 17:02:10 +01:00
Dan Cech
f31d6438a2 add docs for using oauth login with OneLogin (#10385) 2018-01-03 10:15:35 +01:00
Mahmoud Saada
af15e3c0d0 Implement Azure Blob external image uploader 2017-12-27 08:53:00 -05:00
bergquist
f6f9e58d45 docs: update latest version to 4.6.3 2017-12-14 13:45:44 +01:00
Carl Bergquist
35106537f2 Replace Read Only Editor role with ViewersCanEdit setting (#10166) 
* removes readonly editor role

* adds viewersCanEdit setting

This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards

* remove read only editor option from all dropdowns

* migrates all read only viewers to viewers

* docs: replace readOnlyEditor with viewersCanEdit
 2017-12-13 18:53:42 +01:00
Daniel Lee
02d3a9f365 docs: SSL Mode config settings for Postgres 2017-12-13 10:55:58 +01:00
bergquist
5006f9e4c5 dashboards as cfg: update docs to use /provisioning 2017-12-07 15:55:00 +01:00
bergquist
bbc8aa0525 docs: link from cfg page to provisioning 2017-12-05 18:44:31 +01:00
saady
767b460ff1 [GCS] Support for gcs path 2017-11-21 17:22:40 +00:00
Torkel Ödegaard
153a9bf43a docs: added versions_to_keep to config docs, #9671 2017-11-17 14:53:08 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg 
Datasources as configuration
 2017-11-16 16:13:02 +01:00
bergquist
5b674ce29c docs: release 4.6.2 2017-11-16 11:22:09 +01:00
bergquist
bfd8afaf13 docs: update metrics api path 2017-11-16 09:38:37 +01:00
bergquist
b4a89128b6 datasource as cfg: update docs to include globbig 2017-11-15 14:30:32 +01:00
Furtchet
a51b1e8951 Update the config key to database_log_queries so it is more descriptive, as suggested in #9785. 2017-11-06 08:01:31 -06:00
Furtchet
5fdfa3ff7e MySQL Performance when using GF_DATABASE_URL 
Set MaxIdleConn and MaxOpenConn when using the GF_DATABASE_URL configuration. Also added GF_DATABASE_DEBUG flag to print SQL statements and SQL execution times.
See #9784 for the details.
 2017-11-03 14:05:32 -05:00
bergquist
4dae217afc docs: update latest release to 4.6.1 2017-11-01 13:31:10 +01:00
Sven Klemm
a503c1d39c change default sslmode for postgres to verify-full (#9736) 2017-10-31 13:55:32 +01:00
Torkel Ödegaard
c78a9368f0 docs: updated download links 2017-10-26 13:17:51 +02:00
Daniel Lee
80903c162e docs: update docker installation docs 2017-10-25 14:21:32 +02:00
weijh
d0ace0bc13 Update rpm.md 
for error "The GPG keys listed for the "grafana" repository are already installed but they are not correct for this package."
 2017-10-13 12:00:22 +08:00
Patrick O'Carroll
68829a821e added insrtuctions for oauth2 okta bitbucket (#9471) 2017-10-09 15:41:14 +02:00
Patrick O'Carroll
81be4e2612 Update codebox (#9430) 
* updated the codeboxes in docs

* codebox change from json to http
 2017-10-05 19:01:03 +02:00
Ricard Clau
e4541a7fd1 support for s3 path (#9151) 2017-10-04 21:04:20 +02:00
Torkel Ödegaard
50d82155ed Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master 2017-09-27 09:37:26 +02:00
Tobias Hintze
af79d046db introduce smtp config option for EHLO identity 2017-09-24 20:48:20 +02:00
Torkel Ödegaard
ca0085f429 docs: update docs 2017-09-22 14:05:25 +02:00
Andreas Kohn
3b565dccd8 Explicitly refer to Github 'OAuth' applications 
A 'Github Application' is now something else, and will not work with Grafana.
 2017-09-19 13:21:15 +02:00
William
88a8991722 config bucket and region for s3 uploader 
this is to support cn-north-1 region as it can get s3 url programatically.
also keeps support 'bucket_url' for backward compatiblity
 2017-09-19 04:57:25 -04:00
Torkel Ödegaard
a081f90403 Merge branch 'master' of github.com:grafana/grafana 2017-09-18 09:08:42 +02:00
ParadoxalManiak
c94f5b456a Update upgrading.md (#9263) 
Fixed some minor writing issues.
 2017-09-15 22:15:12 +02:00
Konstantin Chukhlomin
7e3c9fcc1c Reduced OAuth scope to read_write 2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
fcdf282090 GCS support via JSON API 2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
72d7c4d620 Added GCS support #8370 2017-09-15 16:11:02 +02:00
Daniel Lee
f534ea057c 4.5.1 docs + update version to 5.0.0-pre1 2017-09-15 11:27:16 +02:00
Torkel Ödegaard
a5c08a72fb docs: update download links 2017-09-14 11:28:59 +02:00
Daniel Lee
379f984293 docs: windows - add note about ini comments 2017-09-12 11:08:28 +02:00
Torkel Ödegaard
93be16b106 docs: minor docs update 2017-09-07 16:55:36 +02:00
Patrick O'Carroll
de647c4100 docs: uppdated getting started with images and text, added info on query inspector to version45 and trouble shooting (#9193) 2017-09-07 16:32:55 +02:00
Torkel Ödegaard
b333ad9481 docs: updated docs with v4.5 beta links 2017-09-05 16:01:28 +02:00
Daniel Lee
d19aa89ec0 docs: .ini file semicolon is comment 
ref #7725
 2017-08-21 21:28:49 +02:00
Daniel Lee
ee835242ca Merge branch 'v4.4.x' 2017-08-07 13:14:24 +02:00
Daniel Lee
def45f55da docs: update installation for version 4.4.3 2017-08-07 13:11:57 +02:00
Torkel Ödegaard
ae3e869d70 updated download links in docs 2017-08-01 10:18:48 +02:00
Torkel Ödegaard
d46fd890a5 Merge branch 'v4.4.x' 2017-07-24 12:38:39 +02:00
Torkel Ödegaard
8ca08d65e7 docs: updated configuration docs with new defaults, #8743 2017-07-24 12:37:58 +02:00
Nicholas Nadeau
1a25b78ef2 homogenized docker run command (#8907) 
There are three locations where the `docker run` command is referenced:
- 2x http://docs.grafana.org/installation/docker/
- 1x https://grafana.com/grafana/download?platform=docker

The fix syncs the given `docker run` command arguments with the other two.
 2017-07-21 21:46:54 +02:00
Daniel Lee
a4266319ad packaging: v4.4.1 2017-07-05 22:14:03 +02:00
Daniel Lee
de9ebc9a74 packaging: updates for v4.4.0 2017-07-05 22:12:51 +02:00
Daniel Lee
36a1ab48c5 packaging: updates for v4.4.0 2017-07-05 22:04:27 +02:00
Daniel Lee
10127e8ac9 docs: small updates 2017-06-26 17:42:50 +02:00
Haidara Mohamed El Mouctar
bc6a57ce32 [Docs] Add documentation for max_idle_conn and max_open_conn (#8675) 2017-06-21 10:41:56 -04:00
Daniel Lee
a8e9700334 docs: add whitelist option for auth.proxy 2017-06-08 13:38:18 +02:00
Torkel Ödegaard
d4048e1423 docs: updated download links 2017-05-23 16:18:37 +02:00
Torkel Ödegaard
423ad4d36e docs: updated docs 2017-05-23 12:45:15 +02:00
Daniel Lee
88d4fde815 docs: v4.3.0-beta1 updates 2017-05-12 13:36:42 +02:00
Torkel Ödegaard
823b40a360 docs: added bash and http syntax highlighting 2017-05-08 08:02:08 +02:00
Jon Freedman
6ebb31bed4 chore: add comment to clarify that org_id usage 
As described here: https://community.grafana.com/t/many-to-many-group-dn-org-role-mapping-in-ldap-config/729/2 org_id can be used to allow multiple group_dn's to map to the same org_role provided the org_id differs.
 2017-05-02 15:45:48 +01:00
Torkel Ödegaard
c46b73538c docs: minor update to troubleshooting guide, closes #8242 2017-04-28 11:16:05 +02:00
Torkel Ödegaard
0ac9ec8f7e docs: added restore instructions to backup section in upgrading doc article, closes #5680 2017-04-28 11:05:14 +02:00
Torkel Ödegaard
26f4a8e5a4 docs: added links to upgrading article 2017-04-28 10:58:26 +02:00
Torkel Ödegaard
a93fa0acde docs: Added general upgrading docs / guide, closes #5905 2017-04-28 10:52:50 +02:00