Torkel Ödegaard
9b5a0a54cf
minor docs fix
2015-10-09 08:28:33 +02:00
Torkel Ödegaard
f11785001c
docs: minor fix
2015-10-06 17:51:22 +02:00
Torkel Ödegaard
106fe4854f
Merge branch 'prometheus' of github.com:grafana/grafana
...
Conflicts:
pkg/models/datasource.go
public/app/plugins/datasource/prometheus/datasource.js
public/app/plugins/datasource/prometheus/partials/query.editor.html
public/app/plugins/datasource/prometheus/queryCtrl.js
2015-10-06 16:36:58 +02:00
Torkel Ödegaard
318af9b418
small docs structure change, moved build from source into install section and CLA into project, and about into project
2015-10-06 10:38:19 +02:00
Jimmi Dyson
7cadb9012a
Switch to png image
2015-09-30 16:45:38 +01:00
Jimmi Dyson
0c222c4e8c
Fix Prometheus test connection
2015-09-30 16:44:24 +01:00
Jimmi Dyson
59dbe45784
Fix typo in docs
2015-09-30 14:20:58 +01:00
Jimmi Dyson
055efa3904
Add prometheus docs
2015-09-30 12:42:48 +01:00
Torkel Ödegaard
3eddfc028e
Merge branch 'patch-2' of https://github.com/cagdascirit/grafana
2015-09-21 11:32:36 +02:00
Torkel Ödegaard
8d87db58c6
docs(): added link to external install tutorial / article
2015-09-21 09:04:59 +02:00
Cagdas Cirit
c26209d579
Update debian.md
2015-09-17 18:25:36 +02:00
Torkel Ödegaard
7c25edc7b2
docs(): fixed iframe snapshot links in docs, fixes #2682
2015-09-08 15:24:20 +02:00
Torkel Ödegaard
2725053c82
docs(): fixed iframe snapshot links in docs, fixes #2682
2015-09-08 15:19:59 +02:00
Torkel Ödegaard
f29471521c
Merge pull request #2663 from victorhooi/patch-1
...
Add note about phantomjs binary and PNG rendering.
2015-09-04 08:40:53 +02:00
Julien Danjou
63f9dc826f
doc: fix link to basic concepts
2015-09-03 14:01:32 +02:00
Victor Hooi
b80adcc00a
Add note about phantomjs libraries.
2015-09-03 16:35:49 +10:00
Victor Hooi
68a7c3fa3b
Add note about phantomjs binary and PNG rendering.
2015-09-03 16:29:58 +10:00
Torkel Ödegaard
f9b98767e7
docs(reference): removed link to non existant text panel page, fixes #2632
2015-09-01 13:07:42 +02:00
Baptiste Fontaine
28474d9340
influxdb doc: typo fixed
2015-09-01 12:47:26 +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
952a69abca
docs(tutorial): updated hubot tutorial
2015-08-19 13:53:15 +02:00
Trent White
2f5115ca45
Update hubot_howto.md
2015-08-18 09:37:51 -04:00
Trent White
66878a9b48
Update hubot_howto.md
2015-08-18 09:34:31 -04:00
Trent White
333952a231
Update hubot_howto.md
2015-08-18 09:34:08 -04:00
Torkel Ödegaard
4f8cea6e2d
docs(): added tutorial article on hubot and grafana integration
2015-08-18 14:39:04 +02:00
Torkel Ödegaard
d4432ddd64
feat(mixed datasources): feature ready to merge to master, closes #436
2015-08-18 08:22:00 +02:00
Torkel Ödegaard
2f849be9d8
docs(): minor tweaks to new tutorial
2015-08-14 09:41:07 +02:00
Torkel Ödegaard
f784551e20
docs(): Began work on stack install and config tutorial
2015-08-13 08:52:50 +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
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
