Commit Graph

457 Commits

Author SHA1 Message Date
Wadim Kruse
3b47b1ecbd Add Prometheus annotations doc 2016-06-20 18:36:05 +02:00
Torkel Ödegaard
ec0b09450c Merge branch 'export-dashboard'
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
utkarshcmu
f3003a97ef Added required documentation 2016-06-13 04:34:23 -07:00
hailthemelody
ef9500a8f0 update pricing to include 1 million free API requests per month 2016-06-12 11:41:43 -04:00
Torkel Ödegaard
1059a35bbc feat(instrumentation): documented instrumentation options, closes #4696 2016-06-03 18:38:19 +02:00
Torkel Ödegaard
22a7eaf2e7 Merge branch 'master' into export-dashboard 2016-05-27 13:52:53 +02:00
Tim Bielawa
2b9d260686 docs(rebuild): Include new http api preferences docs in menus (#5194)
This updates the mkdocs.yml source file such that the HTTP Preferences
API is included in the website navigation bar and in the HTTP API
overview page.

This commit also refreshes the docs/README.md file with more verbose
instructions for building and viewing the documentation locally.

* Original issue: #5069 Document org & user preferences HTTP docs
* Original PR: #5087

Closes #5193
2016-05-27 08:58:42 +02:00
Torkel Ödegaard
ba6573af61 Merge branch 'master' into export-dashboard
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +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
Torkel Ödegaard
fd08c821f9 Merge branch 'v3.0.x'
Conflicts:
	package.json
2016-05-24 07:52:27 +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
cac723dab3 Merge branch 'master' into export-dashboard 2016-05-19 08:48:24 +02:00
Tim Bielawa
24a410ae8f docs(preferences): Document user and org preferences (#5087)
closes #5069
2016-05-18 18:31:59 +02:00
Mitsuhiro Tanda
392cb2a714 (cloudwatch) update changelog (#5080)
* update cloudwatch.md

* update changelog
2016-05-18 13:27:19 +02:00
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard
Conflicts:
	.floo
	.flooignore
2016-05-18 08:08:15 +02:00
bergquist
b5fc12fb80 docs(opentsdb): add working image of add datasource for opentsdb
closes #4984
2016-05-17 15:32:33 +02:00
Torkel Ödegaard
df50fa2332 feat(export): export dashboard modal 2016-05-17 11:17:11 +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
959714a6ef feat(docs): updated what's new article 2016-05-10 20:33:42 +02:00
Torkel Ödegaard
d676840258 docs(): added homebrew info to mac install docs 2016-05-10 16:02:00 +02:00
minkikim89
0c5abc491d Update index.md (#4956) 2016-05-10 08:44:18 +02:00
LaszloHont
a5e2e59385 Clarify admin_password (#4948)
Closes #4923
2016-05-09 13:44:11 +02:00
Carl Bergquist
e30745f19c Merge pull request #4881 from mmckinst/kairosdb_broken_image
fix broken link for kairosdb image
2016-05-04 11:05:05 +02:00
Mark McKinstry
37907e4110 fix broken link for kairosdb image 2016-05-02 12:31:39 -04:00
Torkel Ödegaard
3889052c31 docs(): added whats new in v3 guide 2016-05-02 15:35:49 +02:00
Torkel Ödegaard
43182cb1eb updated 2016-05-02 14:49:50 +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
Tyler Mitchell
21d2a51cd3 typo
tabs != tags
2016-04-23 22:00:42 -07:00
Dan Cech
25b0773a94 fix broken link to grafana.net, standardize on https://grafana.net for links 2016-04-22 12:13:39 -04:00
Torkel Ödegaard
4832ecf3e7 docs(): updated download links 2016-04-15 09:25:09 -04:00
Torkel Ödegaard
f6d53df282 Merge branch 'master' of github.com:grafana/grafana 2016-04-13 17:33:17 -04:00
Torkel Ödegaard
e4374b1d56 docs(): updated download links 2016-04-13 17:33:03 -04:00
Torkel Ödegaard
7302ddaba5 docs(): fixed docs fixes #46688 2016-04-13 16:43:00 -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
f93b039e42 change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases 2016-04-11 18:05:28 -04:00
utkarshcmu
41dcefb174 Fixed typos, lang 2016-04-06 07:26:22 -07:00
Daniel Lee
b39aa02b52 fix(plugins): Fix broken link in plugins readme
Another link to setup instructions that it is broken.
2016-04-05 12:05:14 +02:00
Daniel Lee
860e771493 fix(plugins): Fix broken link in plugins readme
Can't find the DEVELOPMENT.md file so linked to 
http://docs.grafana.org/project/building_from_source/ instead.
2016-04-05 12:01:13 +02:00
Torkel Ödegaard
e027770213 docs(): updated links to beta2 2016-04-04 17:49:33 -04:00
Torkel Ödegaard
171f6422b1 docs(): corrected version 2016-03-31 07:05:44 -07:00
Torkel Ödegaard
601e90f5fe docs(): updated install instructions 2016-03-31 06:23:52 -07:00
Torkel Ödegaard
32bed83a17 docs(): updated 2016-03-30 08:01:54 -07:00