f36a44c49a
Merge branch 'master' into alerting_definitions
...
Conflicts:
conf/defaults.ini
pkg/api/dashboard.go
2016-06-06 08:43:01 +02:00
1059a35bbc
feat(instrumentation): documented instrumentation options, closes #4696
2016-06-03 18:38:19 +02:00
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
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
f923edc424
Merge branch 'v3.0.x'
2016-05-25 12:29:35 +02:00
3312a042dd
docs(): updated download links
2016-05-25 11:50:00 +02:00
dc9dcd045d
Merge branch 'master' of github.com:grafana/grafana
2016-05-24 08:11:52 +02:00
fd08c821f9
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-24 07:52:27 +02:00
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
9e6056551d
docs(): updated download links
2016-05-23 14:13:30 +02:00
9eec68985d
docs(): updated download links
2016-05-23 11:49:07 +02:00
ef4f5147be
Merge branch 'master' into alerting_definitions
2016-05-19 08:05:35 +02:00
24a410ae8f
docs(preferences): Document user and org preferences ( #5087 )
...
closes #5069
2016-05-18 18:31:59 +02:00
392cb2a714
(cloudwatch) update changelog ( #5080 )
...
* update cloudwatch.md
* update changelog
2016-05-18 13:27:19 +02:00
b5fc12fb80
docs(opentsdb): add working image of add datasource for opentsdb
...
closes #4984
2016-05-17 15:32:33 +02:00
495404ef73
Merge branch 'master' into alerting_definitions
2016-05-16 14:12:56 +02:00
7f0fe31881
docs(): updated download links
2016-05-16 13:41:50 +02:00
31698a1c55
Merge branch 'master' into alerting_definitions
2016-05-16 09:28:14 +02:00
dac62ec560
fix rpm download link
2016-05-11 14:09:03 -04:00
e69658128c
docs(alerting): change api url layout
2016-05-11 14:08:45 +02:00
c76c2f30a8
tech(alerting): add default values for alerts
2016-05-11 13:04:03 +02:00
18bf2b2391
docs(alerting): add syles for optional params
2016-05-11 10:47:51 +02:00
03663c5b28
docs(): updated download links
2016-05-11 10:23:17 +02:00
959714a6ef
feat(docs): updated what's new article
2016-05-10 20:33:42 +02:00
dd47f7382a
docs(alerting): initial info
2016-05-10 16:40:46 +02:00
d676840258
docs(): added homebrew info to mac install docs
2016-05-10 16:02:00 +02:00
0c5abc491d
Update index.md ( #4956 )
2016-05-10 08:44:18 +02:00
a5e2e59385
Clarify admin_password ( #4948 )
...
Closes #4923
2016-05-09 13:44:11 +02:00
35c73902da
Merge branch 'master' into alerting_definitions
2016-05-09 11:34:56 +02:00
74d5410a38
feat(alerting): add inital doc page
2016-05-06 15:59:38 +02:00
e30745f19c
Merge pull request #4881 from mmckinst/kairosdb_broken_image
...
fix broken link for kairosdb image
2016-05-04 11:05:05 +02:00
37907e4110
fix broken link for kairosdb image
2016-05-02 12:31:39 -04:00
3889052c31
docs(): added whats new in v3 guide
2016-05-02 15:35:49 +02:00
43182cb1eb
updated
2016-05-02 14:49:50 +02:00
af95993d6d
feat(): updated download links
2016-05-02 09:54:11 +02:00
6c340dcb65
docs(): updated download links
2016-04-29 11:24:43 +02:00
21d2a51cd3
typo
...
tabs != tags
2016-04-23 22:00:42 -07:00
25b0773a94
fix broken link to grafana.net, standardize on https://grafana.net for links
2016-04-22 12:13:39 -04:00
4832ecf3e7
docs(): updated download links
2016-04-15 09:25:09 -04:00
f6d53df282
Merge branch 'master' of github.com:grafana/grafana
2016-04-13 17:33:17 -04:00
e4374b1d56
docs(): updated download links
2016-04-13 17:33:03 -04:00
7302ddaba5
docs(): fixed docs fixes #46688
2016-04-13 16:43:00 -04:00
917fabbc9b
docs(): updated links again
2016-04-12 09:52:12 -04:00
782c484cad
docs(): updated release links
2016-04-12 09:20:27 -04:00
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
41dcefb174
Fixed typos, lang
2016-04-06 07:26:22 -07:00
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
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
e027770213
docs(): updated links to beta2
2016-04-04 17:49:33 -04:00
171f6422b1
docs(): corrected version
2016-03-31 07:05:44 -07:00
