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
Trent White
8c05f9cf3e
Merge pull request #11 from mattttt/trent-update
...
add text panel page
2015-08-11 16:52:15 -04:00
Trent White
ebcab0f26e
add text panel page
2015-08-11 16:50:33 -04:00
Matt
14996bd08b
Update templating.md
2015-08-11 15:57:36 -04:00
Matt
dd9fb9d526
Update templating.md
2015-08-11 15:56:18 -04:00
Matt
f3ffed673b
Merge pull request #10 from mattttt/build-patch-1
...
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:47:38 -04:00
Matt Toback
5b342dd229
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:41:12 -04:00
Trent White
04795709a3
formatting tweak, added datasource overview blurb.
2015-08-11 15:30:13 -04:00
Matt Toback
511a592ec8
Added patch from ct
2015-08-11 14:58:30 -04:00
Matt
d132d3abfd
Merge pull request #7 from mattttt/mattttt-docs
...
Mattttt docs
2015-08-11 14:41:21 -04:00
Trent White
fb9b5e4274
Merge pull request #6 from mattttt/trent-docs-update
...
openTSDB image was broken
2015-08-11 14:32:03 -04:00
Trent White
8dcc5645db
openTSDB image was broken
2015-08-11 14:26:32 -04:00
raj dutt
c6798892b8
Update screencasts.md
...
tweaks
2015-08-11 14:26:04 -04:00
Matt Toback
eea5b026ce
Sanity checked and verified for merge
2015-08-11 14:17:56 -04:00
raj dutt
331e858ed3
Update gettingstarted.md
2015-08-11 14:04:14 -04:00
Trent White
3d602a2558
Merge remote-tracking branch 'origin/master'
2015-08-11 14:01:03 -04:00
Trent White
14386a2f62
Merge branch 'trent-docs'
...
Conflicts:
docs/sources/reference/templating.md
2015-08-11 13:59:46 -04:00
raj dutt
4e91e05470
Update gettingstarted.md
2015-08-11 13:58:44 -04:00
Trent White
ea0bec8bf2
update content on annotations
2015-08-11 13:51:27 -04:00
raj dutt
c2e8a1d733
Update singlestat.md
2015-08-11 13:49:24 -04:00
raj dutt
c6155723a1
Update playlist.md
2015-08-11 13:43:36 -04:00
Trent White
8c64afc81e
update to templating doc
2015-08-11 13:42:40 -04:00
raj dutt
eafd1d8c53
Update templating.md
2015-08-11 13:33:01 -04:00
raj dutt
df0673f907
Update templating.md
2015-08-11 13:31:49 -04:00
raj dutt
ed536f18ee
Update basic_concepts.md
2015-08-11 13:07:30 -04:00
Matt Toback
96590f591c
Updates to dashlist article
2015-08-11 12:34:18 -04:00
Trent White
32bfcbcdbc
updates to screencasts page, with descriptions of each
2015-08-11 11:43:45 -04:00
Trent White
3af451caeb
Merge pull request #4 from mattttt/trent-docs
...
added pages, touched up some images and content in data-sources section
2015-08-11 10:15:59 -04:00
Trent White
ae953f2420
added pages, touched up some images and content in data-sources section
2015-08-11 10:12:58 -04:00
Torkel Ödegaard
809562c874
updated install docs for 2.1.1 release
2015-08-11 11:12:06 +02:00
Matt
e53c8100a3
Merge pull request #3 from mattttt/mattttt-docs
...
Adding additional pages and updates from google doc
2015-08-10 23:20:15 -04:00
Matt Toback
2b59724ea8
Adding additional pages and updates from google doc
2015-08-10 18:19:56 -04:00
Trent White
ca65671553
add basic concpets doc
2015-08-10 17:51:29 -04:00
Trent White
a4be75f410
adding Raj edits/additions as well as initial round of pages I created
2015-08-10 17:44:08 -04:00
Denis Doria
696f8451cf
Update documentation with $col alias
2015-08-10 08:12:12 +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
Torkel Ödegaard
49c1d1a4ca
docs(ldap): fixed minor issue in ldap example config doc
2015-08-01 10:32:36 +02:00
Torkel Ödegaard
66a37aa945
docs(): updated whats new in 2.1 doc
2015-07-31 15:22:13 +02:00
Torkel Ödegaard
0d3321c686
docs(): updated whats new in grafana 2.1 article
2015-07-31 10:09:32 +02:00
Torkel Ödegaard
be6ddb08bd
docs(): added auth proxy to config docs
2015-07-30 10:37:49 +02:00
Torkel Ödegaard
fb81a4f318
Merge pull request #2299 from espenfjo/kairosdb-sensible-tag-values
...
KairosDB: Update the template functionality to cohere with the very closely related OpenTSDB plugin
2015-07-29 20:46:13 +02:00
Torkel Ödegaard
95bce39751
docs(): updates to whats new arcticle, and changed one screenshot
2015-07-29 15:36:04 +02:00
Torkel Ödegaard
a34af84176
docs(): fixed wording in sentence in whats new in 2.1 article
2015-07-29 15:00:53 +02:00
Torkel Ödegaard
610a94ea03
docs(): lots of updates to whats new in 2.1 doc article
2015-07-29 10:24:46 +02:00
Torkel Ödegaard
cd832ea77c
Merge pull request #2384 from sbengo/improved_http_api_doc
...
Added docs to http_api
2015-07-23 09:43:02 +02:00
sbengo
82c7764679
Added docs to http_api
...
Finished the documentation of API HTTP
Notes:
· Data source proxy calls not documented - Too long request/response text.
· Dashboard from JSON file no do documented - Need more study to underestand how it works.
2015-07-22 13:11:55 +02:00
Torkel Ödegaard
a386733c04
docs(): updates to docs
2015-07-21 16:19:49 +02:00
Trent White
381e9dac34
new images for regex color and negative y transform
2015-07-21 16:19:49 +02:00
