public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,453 Commits 655 Branches 650 Tags
7ca3d32a104f06d6daba320ca81e35072b4e9ddd
Commit Graph
253 Commits
Author SHA1 Message Date
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
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
Calle Pettersson a79102b42d Fix ldap ca_cert example/docs for proper syntax (#8044) 2017-04-06 09:53:11 +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
Torkel Ödegaard b404f32a09 docs: updated download links 2017-03-22 14:26:57 +01:00