Torkel Ödegaard
c675ffc682
Merge branch 'master' into alerting
2016-07-27 09:45:16 +02:00
Peter Bonney
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
Torkel Ödegaard
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
Torkel Ödegaard
4bb4d7f7d3
Merge branch 'v3.1.x'
2016-07-12 15:54:31 +02:00
Torkel Ödegaard
6c2a61001a
docs(): updated download links
2016-07-12 13:19:20 +02:00
Torkel Ödegaard
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
Torkel Ödegaard
08202dcb83
Merge branch 'v3.1.x'
2016-07-11 09:39:17 +02:00
Fraser Savage
5a8efa9a52
Update configuration.md ( #5527 )
...
Insert missing backtick.
2016-07-08 07:12:26 +02:00
joe miller
a6554a85c0
grammar fix in docs
2016-07-02 08:27:31 -07:00
Rakotomandimby Mihamina
16e2c660ac
Update debian.md
2016-06-28 15:58:00 +03:00
bergquist
4ed6b99d9a
Merge branch 'alerting_notifications' into alerting
2016-06-26 04:05:56 +02:00
Torkel Ödegaard
346ca3fc89
Merge branch 'master' into alerting
2016-06-25 09:56:57 -04:00
Torkel Ödegaard
9435e70b37
docs(): spelling fix
2016-06-23 17:31:22 +02:00
Torkel Ödegaard
c3e1955792
docs(): updated export docs
2016-06-23 13:21:30 +02:00
Torkel Ödegaard
1d35b90484
docs(): updated download links
2016-06-23 10:35:47 +02:00
Torkel Ödegaard
53c424caf8
docs(): title change
2016-06-21 18:25:24 +02:00
Torkel Ödegaard
23cfbac4ec
feat(docs): updated import / export docs
2016-06-21 18:24:25 +02:00
bergquist
ef9766eb96
docs(3.1): initial post about whats new in 3.1
2016-06-21 16:29:17 +02:00
Wadim Kruse
3b47b1ecbd
Add Prometheus annotations doc
2016-06-20 18:36:05 +02:00
bergquist
403fdebca3
docs(alerting): rewrite alert docs
2016-06-20 17:05:16 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +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
f36a44c49a
Merge branch 'master' into alerting_definitions
...
Conflicts:
conf/defaults.ini
pkg/api/dashboard.go
2016-06-06 08:43:01 +02:00
Torkel Ödegaard
1059a35bbc
feat(instrumentation): documented instrumentation options, closes #4696
2016-06-03 18:38:19 +02:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +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
bergquist
ef4f5147be
Merge branch 'master' into alerting_definitions
2016-05-19 08:05:35 +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
495404ef73
Merge branch 'master' into alerting_definitions
2016-05-16 14:12:56 +02:00
Torkel Ödegaard
7f0fe31881
docs(): updated download links
2016-05-16 13:41:50 +02:00
bergquist
31698a1c55
Merge branch 'master' into alerting_definitions
2016-05-16 09:28:14 +02:00
Dan Cech
dac62ec560
fix rpm download link
2016-05-11 14:09:03 -04:00
bergquist
e69658128c
docs(alerting): change api url layout
2016-05-11 14:08:45 +02:00
bergquist
c76c2f30a8
tech(alerting): add default values for alerts
2016-05-11 13:04:03 +02:00
