IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 20:54:22 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,787 Commits 5,113 Branches 538 Tags 1.9 GiB
4e15e61b39
Commit Graph

157 Commits

Author SHA1 Message Date
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