root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity
13,860 Commits 1,415 Branches 627 Tags 2.6 GiB
Commit Graph

121 Commits

Author SHA1 Message Date
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
Daniel Lee cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +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
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
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 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
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
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 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
Sven Klemm a503c1d39c change default sslmode for postgres to verify-full (#9736) 2017-10-31 13:55:32 +01: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
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
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 d19aa89ec0 docs: .ini file semicolon is comment 
ref #7725
 2017-08-21 21:28:49 +02:00
Torkel Ödegaard 8ca08d65e7 docs: updated configuration docs with new defaults, #8743 2017-07-24 12:37:58 +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 b14c3d63e4 docs: added missing white space to config docs, #7073 2017-04-28 09:21:47 +02:00
Tyghe Vallard 1edeaa5e7e duplicate keys for auth.github for allow_sign_up 2017-04-25 11:11:32 -05:00
Daniel Lee 6538e86793 webdav: add tests + path.join for public url param 
Fixes #7914. Fixes #7921
 2017-04-25 17:22:18 +02:00
fir4 6d9e8bd147 webdav: allow specification of a different public_url than upload url 2017-04-25 17:22:18 +02:00
Seuf 319b8d8fca Configurable signout menu activation (#7968) 2017-03-29 11:33:28 +02:00
Torkel Ödegaard 98554e9fbe docs: added config entry for ldap allow_sign_up option, #7972 2017-03-29 08:42:10 +02:00
Jens L 5785bfe0cc Add more information for generic oauth2 (#7880) 
Add reference to OpenID's userinfo_endpoint (as in #6351)
 2017-03-20 08:36:43 +01:00
Torkel Ödegaard 6af62abd41 docs(): added router_logging to configuration options, closes #7723 2017-03-06 08:26:36 +01:00
Rickard von Essen 573bcdde12 Added some details about Sessions in Postgres 2017-03-01 11:35:12 +01:00
Aaron Roydhouse 4039e5edbc Improve 'external_image_storage.s3' documentation (#7623) 
Add documentation for 'external_image_storage.s3' to explain how to specify the AWS region for the S3 bucket, and the requires S3/IAM permissions.
 2017-02-21 10:09:50 +01:00
Daniel Lee 6dfdcd7ca5 email: change default from name to Grafana 
Changes default from name in smtp settings
from Grafana Admin to Grafana.

Fix for integration test (which is skipped but that
did not work)
 2017-02-15 11:02:46 +01:00