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
Ivan Babrou
0dc0e03c4c
Add suggest_tagk() and suggest_tagv() to OpenTSDB datasource ( #2840 )
2015-10-04 12:54:43 +01: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
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
Trent White
736aadb186
formatting and some hr to make it more organized
2015-07-21 16:19:49 +02:00
Torkel Ödegaard
4acfa1faef
Merge pull request #2378 from sbengo/improved_http_api_doc
...
Added details on api documentation
2015-07-21 12:15:22 +02:00
sbengo
b9085c1522
Added details on api documentation
...
Added example request and example response of sections: Dashboard, Datasources, Organisation.
If you agree, I will complete the documentation following the same formatting.
2015-07-21 12:01:04 +02:00
raj dutt
0c25c1f0ca
Update templating.md
2015-07-20 20:05:56 -04:00
Matt
a7a2a166e6
Relative link for What's New in v2 was incorrect
2015-07-20 17:09:58 -04:00
Torkel Ödegaard
5b0585ac7f
feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450
2015-07-16 12:58:30 +02:00
Torkel Ödegaard
9afdea8d2a
feat(ldap): added config options for ssl skip verify, and ssl server name, #1450
2015-07-16 11:59:26 +02:00
raj dutt
a065f93777
Update singlestat.md
2015-07-15 14:27:55 -07:00
Torkel Ödegaard
e1345337ac
docs(): small fix to time range doc page
2015-07-15 17:41:45 +02:00
Torkel Ödegaard
b891677ba5
docs(ldap): added ldap integration docs and config examples, #1450
2015-07-15 14:48:39 +02:00
Torkel Ödegaard
567a42a756
docs(http_api): updated http docs and mentioned basic auth option
2015-07-13 22:20:58 +02:00
Torkel Ödegaard
ca1cd89190
Updated singlestat docs again
2015-07-10 15:53:39 +02:00
Torkel Ödegaard
9f8eae908d
Updated singlestat docs
2015-07-10 15:34:54 +02:00
Matt
3774114a4c
Update Singlestat Docs
...
Need some additional clarification in Spark Line and Value to text before this is merged.
2015-07-10 09:13:45 -04:00
Torkel Ödegaard
4bc5b37c09
Merge pull request #2321 from gmembre/master
...
Adding GOPATH
2015-07-10 13:33:15 +02:00
Torkel Ödegaard
83b67c0693
Fixed link to CLA, Fixes #2326
2015-07-10 13:31:21 +02:00
gmembre
3fa228dcbb
Correcting typo
2015-07-09 22:49:27 +02:00
gmembre
14e25100d4
Adding GOPATH
2015-07-09 22:17:12 +02:00
Torkel Ödegaard
b2c0eefbbc
Merge pull request #2313 from alaverty/master
...
Fixed invalid json example, added missing comma
2015-07-09 22:05:35 +02:00
Torkel Ödegaard
8eee0d574c
Merge branch 'influxdb-09-fields-enhancements'
2015-07-09 17:17:46 +02:00
