Commit Graph

525 Commits

Author SHA1 Message Date
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
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
Daniel Lee
69bec98962 chore: update all grafana.org urls to .com 2017-03-21 15:37:55 +01: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
50718b592c docs: added aliases 2017-03-18 08:25:26 +01:00
Torkel Ödegaard
b471e7e448 updated 2017-03-13 20:17:46 +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
bergquist
86789c0b69 docs: update docs for 4.2.0 beta release 2017-02-27 12:44:55 +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
Torkel Ödegaard
bc9165bdfc Merge branch 'master' into rebrand-docs 2017-02-20 12:11:22 +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
Jacob Bednarz
6a9247500a
Update documentation to include information about from_name values 2017-02-15 08:07:29 +11:00
bergquist
c7560edba5 docs: release 4.1.2 for windows 2017-02-13 14:17:26 +01:00
bergquist
89fdcc84de docs: release 4.1.2 2017-02-13 13:52:42 +01:00
Torkel Ödegaard
0a17217d59 docs(): updating links 2017-02-08 08:23:23 +01:00
Daniel Lee
5e9653f935 docs(): adds missing index pages + link fix 2017-02-07 10:22:14 +01:00
Torkel Ödegaard
8a92861133 docs(): fixes for rebranded docs site 2017-02-07 09:09:51 +01:00
Torkel Ödegaard
3398c28ab2 docs(): fixing redirects for moved doc pages, updating links to point to new urls 2017-02-06 18:04:53 +01:00
Torkel Ödegaard
f196ffa07d updated docs 2017-01-25 13:33:27 +01:00
bergquist
35db025b0a docs(installation): updates docs for 4.1.1 2017-01-12 10:38:23 +01:00
bergquist
5e14f4a16e tech(build): changes build for 4.1 release 2017-01-11 11:07:01 +01:00
bergquist
50b937dcb1 tech(build): updates docs to 4.1.0 2017-01-10 15:36:54 +01:00
James Blackburn
f98e07e012 Fix auto_assign_org_role = Read Only Editor docs (#7057)
`auto_assign_org_role` should be `Read Only Editor` rather than `Read-Only Editor`
2016-12-23 09:41:28 +01:00
bergquist
fef511d403 docs(conf): adds docs about supporting database_url
closes #1878
2016-12-21 23:39:08 +01:00
bergquist
c18741c605 docs(ldap): adds note about special chars in password
closes #5337
2016-12-21 22:02:34 +01:00
bergquist
02bf83b37e docs: fixes broken code formating 2016-12-21 15:35:55 +01:00
bergquist
1c8865e702 docs: updates links to windows beta build 2016-12-20 16:08:05 +01:00
bergquist
afa5e9507a docs: updates install links for 4.1.0 beta 2016-12-20 13:15:59 +01:00
bergquist
86f148be48 docs(paths): updates relative path on /installation/ page 2016-12-16 17:42:40 +01:00
bergquist
30022b0d0b docs(paths): adds aliase for rpm and debian install
got reports on twitter about broken links.
2016-12-16 17:36:01 +01:00
Torkel Ödegaard
435f474e8a docs(): minor fix for docker docs 2016-12-14 22:30:20 +01:00
Torkel Ödegaard
c59fd2e8f6 fix(docs): fixed support for old docs url, fixes #6960 2016-12-14 21:21:21 +01:00
Torkel Ödegaard
80d88d302c fix(config): changed default for oauth and allow_sign_up setting, #6928 2016-12-12 16:35:42 +01:00
bergquist
49827de278 docs: release 4.0.2 2016-12-08 15:05:37 +01:00
bergquist
464553a453 docs: explains how to use comment chars in passwords 2016-12-06 09:48:56 +01:00
bergquist
8134724b8a docs: update links to 4.0.1 2016-12-02 17:17:33 +01:00
bergquist
b00e9390d3 docs(v4): update docs for v4 2016-11-29 19:03:33 +01:00
Torkel Ödegaard
092f0c4b62 docs(): fixed windows link 2016-11-21 10:58:45 +01:00
Torkel Ödegaard
a5c0295a0e docs(): updated doc download links 2016-11-21 10:18:43 +01:00
Torkel Ödegaard
f52c6aafe7 docs(): minor update to centos docs about font packages needed for phantomjs 2016-11-16 18:49:14 +01:00
Torkel Ödegaard
62ff85e774 docs(): fixed ldap link 2016-11-14 11:34:58 +01:00
Torkel Ödegaard
fff26086d5 docs(): updated install links with beta links as well 2016-11-09 13:53:20 +01:00
Torkel Ödegaard
b658f38036 docs(): added what new in v4 article and initial draf of alerting docs, #6490 2016-11-08 11:09:10 +01:00
bergquist
8ca18b511f docs(alerting): add docs for alert notifications 2016-11-08 10:58:59 +01:00
Mani Soundararajan
db77dfea7a Update github auth docs
In Github's "allowed organizations" scenario, it makes sense to have
`allow_sign_up` to be `true` as most administrators will expect their
org's github users to be able to sign in without further steps like
creating a local user first.
2016-11-06 20:48:14 +05:30
Torkel Ödegaard
2d19af601a fix(alerting): various alerting fixes 2016-11-06 15:40:02 +01:00
Torkel Ödegaard
2b81b204aa docs(): fixing image urls in docs 2016-11-04 20:29:17 +01:00
Torkel Ödegaard
1581bf8d5b fix(docs): added api_url to configuration docs, fixes #6351 2016-10-22 08:51:32 +02:00
Torkel Ödegaard
96008c9738 Squashed commit of the following:
commit 4113ed00782590187d19dd2f8cbae683f164142c
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Fri Oct 21 10:47:35 2016 +0200

    docs(): minor fix for docs index page

commit 45478d120571519462fac905aadeab5954696690
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:28:21 2016 +0200

    updated

commit c9c1c1d5a462f85e8001a45218f24102583d7aee
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:27:34 2016 +0200

    docs(): updated image refs

commit 5fa0f27963968d77bbbbb7edd973847ea72135e3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Wed Oct 19 14:33:04 2016 +0200

    docs is almost done

commit 6b988c90cb08563e2c27212338c2947e69f6fcc3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 20:45:28 2016 +0200

    almost done

commit 17757c21ed813892ddb1f289f2e52613caf7bcef
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 16:45:48 2016 +0200

    making progress on docs

commit f06c815991dd81b8893912a6da04a17b80b63fda
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 14:30:55 2016 +0200

    progress on new docs

commit 5197237426252623de2d8b9cc22ddbbdbb240763
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 13:25:26 2016 +0200

    making progress

commit 33e2b6b617f16f65878141cf11e54b2817a2ea96
Merge: de385e5 ecb4a99
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 12:17:58 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit ecb4a99dd54aa39f17d9bf4d7e132a389812f8fd
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 10:39:59 2016 +0200

    keep urls for now

commit de385e56d86b071cf2150ccf9f1aa06ec5187277
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:56:18 2016 +0200

    more progress

commit 8469ebc239ab2316cbbc01862e5026737f272f00
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:08:06 2016 +0200

    progress on new docs

commit e755f656b12534cfcb23bad11f1fa696e43f7428
Merge: 4644a35 35cce3b
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:27 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit 4644a35102555204787e91041b50dcbfe0f7a213
Merge: 25c4bef 977cdd5
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:11 2016 +0200

    Merge branch 'master' of github.com:grafana/grafana into new-docs

commit 35cce3bef802fac020a53693b02c112a91a096fc
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 17 09:31:17 2016 +0200

    progress on #6170

commit 25c4bef629de7d77218ba95cc3bd25fb50bb19d6
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Sun Oct 16 15:05:30 2016 +0200

    fix for osx

commit 6c6b52f975630be87da23dd51beafaecb820cec2
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 16 12:56:39 2016 +0200

    progress on new docs

commit 6a09633981ab26191d5542dbe3a788846ac6b73d
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 15 11:39:49 2016 +0200

    progress on new docs

commit 7d533fbc23e41b86fd1ba9c955dd17ae1ad977e5
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 10 09:25:12 2016 +0200

    making progress on new docs site

commit 50392ce98edfa201977716e92e4a86f9d48ae386
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 9 20:02:28 2016 +0200

    feat(new docs): progress on new docs site

commit 81a3d3d0952d3a5d790412e90d01ac5a247e0686
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Fri Oct 7 07:52:11 2016 +0200

    new docs site experiment

commit 704adc98664665b3624087ab38ce29fc9da005f1
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 1 20:46:53 2016 +0200

    new docs poc
2016-10-21 11:01:34 +02:00
bergquist
a3c91450d5 tech(config): add log.filters to default and sample 2016-10-07 10:39:01 +02:00
Wolfram Kroll
7e6595acaf hint about how to override settings from default section (#6181) 2016-10-07 08:48:57 +02:00
Torkel Ödegaard
0ab2113fab docs(config): added missing smtp config section, fixes #6155 2016-09-30 07:40:58 +02:00
Torkel Ödegaard
2750c8a801 feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423 2016-09-28 15:27:08 +02:00
bergquist
6a699d13c4 docs(configuration): add note about snapshot configuration 2016-09-26 14:46:03 +02:00
Steven Arnott
6e4ed4debd Altered DB for Prefix (#6062) 2016-09-19 17:12:43 +02:00
Torkel Ödegaard
852fd66c4c Update debian.md 2016-09-16 10:42:15 +02:00
Zihao Yu
6d843e3db5 update github oauth docs (#6042) 2016-09-15 11:29:03 +02:00
bergquist
811b7188c4 docs(config): add docs for how to run grafana behind a reverse proxy 2016-09-12 14:47:21 +02:00
Chen Chenglong
7b1c374f64 support connect ldap server with starttls (#5969)
* support connect ldap server with starttls

* add more doc for start_tls option
2016-09-10 09:40:56 +02:00
bergquist
10b3ee362c docs(oauth): add generic_auth to docs 2016-09-07 11:06:59 +02:00
bergquist
a5d49c9820 docs(config): add note about poodle vulnerabillity in <3.0
closes #3483
2016-08-31 08:34:15 +02:00
Torkel Ödegaard
6fae5a3b4e Merge branch 'v3.1.x' 2016-08-17 10:02:08 +02:00
Torkel Ödegaard
093563ac37 fix(metrics): restored prefix default to prod.grafana.. 2016-08-17 10:01:55 +02:00
Jeremy Bingham
7150571e60 Mac grafana wrapper script (#5779)
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
2016-08-11 07:37:35 +02:00
Jeremy Bingham
2c4ab4af02 Mac grafana wrapper script (#5779)
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
2016-08-11 07:36:14 +02:00
Torkel Ödegaard
c5d0c9f088 Merge branch 'v3.1.x' 2016-08-10 08:42:30 +02:00
Torkel Ödegaard
c0301349fb docs(): update mac docs 2016-08-10 08:39:57 +02:00
Torkel Ödegaard
624e30e743 fix(docs): minor doc fixes, fixes #5751 2016-08-10 08:38:08 +02:00
Torkel Ödegaard
34ea7312bc docs(): added missing snapshot config options, fixes #5708 2016-08-02 09:35:15 +02:00
Torkel Ödegaard
2bfccd77d4 docs(): updated release links 2016-08-01 12:47:55 +02:00
Torkel Ödegaard
84d7305d37 docs(): updated release links 2016-08-01 12:45:31 +02:00
Torkel Ödegaard
4bb4d7f7d3 Merge branch 'v3.1.x' 2016-07-12 15:54:31 +02:00
Torkel Ödegaard
6c2a61001a docs(): updated download links 2016-07-12 13:19:20 +02:00
Fraser Savage
5a8efa9a52 Update configuration.md (#5527)
Insert missing backtick.
2016-07-08 07:12:26 +02:00
Rakotomandimby Mihamina
16e2c660ac Update debian.md 2016-06-28 15:58:00 +03:00
Torkel Ödegaard
1d35b90484 docs(): updated download links 2016-06-23 10:35:47 +02:00
bergquist
ef9766eb96 docs(3.1): initial post about whats new in 3.1 2016-06-21 16:29:17 +02:00
Torkel Ödegaard
1059a35bbc feat(instrumentation): documented instrumentation options, closes #4696 2016-06-03 18:38:19 +02:00
Torkel Ödegaard
f923edc424 Merge branch 'v3.0.x' 2016-05-25 12:29:35 +02:00
Torkel Ödegaard
3312a042dd docs(): updated download links 2016-05-25 11:50:00 +02:00
Torkel Ödegaard
dc9dcd045d Merge branch 'master' of github.com:grafana/grafana 2016-05-24 08:11:52 +02:00
Zdenek Styblik
fff5aa3020 Add missing option Read-Only Editor to auto_assign_org_role description (#5139)
Commit adds missing option `Read-Only Editor` to `auto_assign_org_role` description.
2016-05-23 21:24:23 +02:00
Torkel Ödegaard
9e6056551d docs(): updated download links 2016-05-23 14:13:30 +02:00
Torkel Ödegaard
9eec68985d docs(): updated download links 2016-05-23 11:49:07 +02:00
Torkel Ödegaard
7f0fe31881 docs(): updated download links 2016-05-16 13:41:50 +02:00
Dan Cech
dac62ec560 fix rpm download link 2016-05-11 14:09:03 -04:00
Torkel Ödegaard
03663c5b28 docs(): updated download links 2016-05-11 10:23:17 +02:00
Torkel Ödegaard
d676840258 docs(): added homebrew info to mac install docs 2016-05-10 16:02:00 +02:00
LaszloHont
a5e2e59385 Clarify admin_password (#4948)
Closes #4923
2016-05-09 13:44:11 +02:00
Torkel Ödegaard
af95993d6d feat(): updated download links 2016-05-02 09:54:11 +02:00
Torkel Ödegaard
6c340dcb65 docs(): updated download links 2016-04-29 11:24:43 +02:00
Torkel Ödegaard
4832ecf3e7 docs(): updated download links 2016-04-15 09:25:09 -04:00
Torkel Ödegaard
e4374b1d56 docs(): updated download links 2016-04-13 17:33:03 -04:00
Torkel Ödegaard
917fabbc9b docs(): updated links again 2016-04-12 09:52:12 -04:00
Torkel Ödegaard
782c484cad docs(): updated release links 2016-04-12 09:20:27 -04:00
Torkel Ödegaard
e027770213 docs(): updated links to beta2 2016-04-04 17:49:33 -04:00
Torkel Ödegaard
601e90f5fe docs(): updated install instructions 2016-03-31 06:23:52 -07:00
bergquist
0b6fee138a docs(configuration): add redis as session storage 2016-03-10 14:49:37 +01:00
Paul Mestemaker
d6ecf74db4 Update ldap.md
Added clearer language on which versions offer LDAP support.
2016-03-09 11:25:42 -08:00
Torkel Ödegaard
08a45e9a3b docs(): docs update 2016-03-07 08:52:16 +01:00
Andrew MacDonald
ce6c67f9bc Fix the path to grafana-webserver in the Debian install docs. 2016-02-23 16:06:56 -08:00
utkarshcmu
c3fc340c09 Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac 2016-02-10 23:12:41 -08:00
utkarshcmu
4ff6748eb4 Linked docs from main nav 2016-02-05 01:47:34 -08:00
utkarshcmu
616a6bec38 Added api heading in the main menu 2016-02-05 01:15:09 -08:00
Kevin Pike
15fb56e607 Add github api_url to github auth docs 2016-02-04 13:46:02 -08:00
Daniel Low
ea566fff24 Add TLS for mysql
Use ssl_mode for mysql and add docs
add docs for the new parameters in config

Tolerate ssl_mode without client authentication

Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Carl Bergquist
333f9101a0 Merge pull request #3458 from improbable-io/use-memcache-for-session
Add memcache as session provider
2015-12-17 15:56:15 +01:00
Torkel Ödegaard
33395d530d docs(): updated downloads for 2.6 and whats new in 2.6 article 2015-12-14 15:45:00 +01:00
Daniel Low
ed16914715 Add memcache as session provider 2015-12-08 13:35:09 +00:00
Torkel Ödegaard
4cc61d10ff fix(docs): fixed typo in installing docs fixes #3379 2015-12-01 08:59:30 +01:00
Christoph Krybus
b0c01369c5 Fix recommended graphite version for better performance
There is no 0.9.13 graphite release, only 0.9.14.
2015-11-19 13:44:46 +01:00
Torkel Ödegaard
1685e7cea4 docs(): update to install docs and whats new in 2.5 2015-10-28 11:08:12 +01:00
Torkel Ödegaard
da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Utkarsh Bhatnagar
54be4c5e2c Made installation doc consistent 2015-10-23 23:21:00 -07:00
ubhatnagar
45cdbe0a18 Rearranged installation docs for OpenSuse 2015-10-23 23:03:58 -07:00
ubhatnagar
6c76e9728e Added OpenSuse installation command 2015-10-23 22:53:30 -07:00
ubhatnagar
1e2e4ba3ad Fixed other docs typos 2015-10-21 22:09:07 -07:00
anryko
b68987dcde Fixed configuration example for Github OAuth team_ids. 2015-10-09 17:05:46 +02:00
Torkel Ödegaard
f11785001c docs: minor fix 2015-10-06 17:51:22 +02:00
Cagdas Cirit
c26209d579 Update debian.md 2015-09-17 18:25:36 +02:00
Torkel Ödegaard
3e0c66edab docs(): updated download links in docs 2015-08-24 10:05:05 +02:00
Torkel Ödegaard
a4ff1e4f33 docs(): updated version in install docs 2015-08-20 15:20:26 +02:00
Torkel Ödegaard
a3d9169930 docs(): minor update 2015-08-13 08:00:27 +02:00
Torkel Ödegaard
5aee981590 Merge branch 'master' of https://github.com/mattttt/grafana
Conflicts:
	docs/sources/installation/debian.md
	docs/sources/installation/ldap.md
2015-08-12 16:30:48 +02:00
Anton Gilgur
e4baef94bc docs(ldap): Clarify LDAP features and sample config
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
2015-08-11 19:57:53 -07:00
Matt Toback
511a592ec8 Added patch from ct 2015-08-11 14:58:30 -04:00
Torkel Ödegaard
809562c874 updated install docs for 2.1.1 release 2015-08-11 11:12:06 +02:00
Torkel Ödegaard
bf6444c585 docs(): docker upgrade notice 2015-08-04 20:42:14 +02:00
Torkel Ödegaard
8c1b145358 docs(): updated install docs with 2.1 download links 2015-08-04 17:00:26 +02:00