2c4ab4af02
Mac grafana wrapper script ( #5779 )
...
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.
* add instructions for installing grafana HEAD from git with homebrew back to the docs
2016-08-11 07:36:14 +02:00
4fd8b2ace4
Merge branch 'master' into alerting
2016-08-10 12:53:41 +02:00
c5d0c9f088
Merge branch 'v3.1.x'
2016-08-10 08:42:30 +02:00
c0301349fb
docs(): update mac docs
2016-08-10 08:39:57 +02:00
624e30e743
fix(docs): minor doc fixes, fixes #5751
2016-08-10 08:38:08 +02:00
34ea7312bc
docs(): added missing snapshot config options, fixes #5708
2016-08-02 09:35:15 +02:00
2bfccd77d4
docs(): updated release links
2016-08-01 12:47:55 +02:00
84d7305d37
docs(): updated release links
2016-08-01 12:45:31 +02:00
c675ffc682
Merge branch 'master' into alerting
2016-07-27 09:45:16 +02:00
62e162c44c
Update dashboard.md ( #5640 )
...
The key returned by `GET /api/dashboards/db/:slug` is "dashboard" (not "model").
2016-07-23 11:46:20 +02:00
b0fe69822a
Merge branch 'master' into alerting
...
Conflicts:
public/app/core/services/alert_srv.ts
public/app/partials/confirm_modal.html
2016-07-18 18:22:35 +02:00
4bb4d7f7d3
Merge branch 'v3.1.x'
2016-07-12 15:54:31 +02:00
6c2a61001a
docs(): updated download links
2016-07-12 13:19:20 +02:00
d9096110f8
Merge branch 'master' into alerting
...
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +02:00
08202dcb83
Merge branch 'v3.1.x'
2016-07-11 09:39:17 +02:00
5a8efa9a52
Update configuration.md ( #5527 )
...
Insert missing backtick.
2016-07-08 07:12:26 +02:00
a6554a85c0
grammar fix in docs
2016-07-02 08:27:31 -07:00
16e2c660ac
Update debian.md
2016-06-28 15:58:00 +03:00
4ed6b99d9a
Merge branch 'alerting_notifications' into alerting
2016-06-26 04:05:56 +02:00
346ca3fc89
Merge branch 'master' into alerting
2016-06-25 09:56:57 -04:00
9435e70b37
docs(): spelling fix
2016-06-23 17:31:22 +02:00
c3e1955792
docs(): updated export docs
2016-06-23 13:21:30 +02:00
1d35b90484
docs(): updated download links
2016-06-23 10:35:47 +02:00
53c424caf8
docs(): title change
2016-06-21 18:25:24 +02:00
23cfbac4ec
feat(docs): updated import / export docs
2016-06-21 18:24:25 +02:00
ef9766eb96
docs(3.1): initial post about whats new in 3.1
2016-06-21 16:29:17 +02:00
3b47b1ecbd
Add Prometheus annotations doc
2016-06-20 18:36:05 +02:00
403fdebca3
docs(alerting): rewrite alert docs
2016-06-20 17:05:16 +02:00
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
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
f3003a97ef
Added required documentation
2016-06-13 04:34:23 -07:00
ef9500a8f0
update pricing to include 1 million free API requests per month
2016-06-12 11:41:43 -04:00
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
22a7eaf2e7
Merge branch 'master' into export-dashboard
2016-05-27 13:52:53 +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
ba6573af61
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +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
cac723dab3
Merge branch 'master' into export-dashboard
2016-05-19 08:48:24 +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
6632f883c0
Merge branch 'master' into export-dashboard
...
Conflicts:
.floo
.flooignore
2016-05-18 08:08:15 +02:00
Jeremy Bingham
Torkel Ödegaard
Peter Bonney
Fraser Savage
joe miller
Rakotomandimby Mihamina
bergquist
Wadim Kruse
utkarshcmu
hailthemelody
Tim Bielawa
Zdenek Styblik
Mitsuhiro Tanda