Marcus Efraimsson
540d540ea9
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
...
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
2017-11-16 16:19:01 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg
...
Datasources as configuration
2017-11-16 16:13:02 +01:00
bergquist
c60915c146
datasources as cfg: adds docs for all jsondata and secure_json fields
2017-11-16 14:22:52 +01:00
bergquist
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +01:00
Torkel Ödegaard
119f5427af
fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876
2017-11-16 13:06:24 +01:00
bergquist
5b674ce29c
docs: release 4.6.2
2017-11-16 11:22:09 +01:00
bergquist
bfd8afaf13
docs: update metrics api path
2017-11-16 09:38:37 +01:00
bergquist
e15fed10e2
changelog: adds note about closing #1871
2017-11-15 15:04:29 +01:00
Patrick O'Carroll
d800e64368
fixes : #1871 Dropdown starred ( #9490 )
...
adding the ability to star dashboard in search and dashboard-list
closes #1871
2017-11-15 15:01:44 +01:00
Sven Klemm
26ab25b7c0
dont loose subsecond precision when dealing with timestamp or ( #9851 )
...
timestamptz
2017-11-15 14:50:32 +01:00
bergquist
6267ef1391
datasource as cfg: fixes typos
2017-11-15 14:30:32 +01:00
bergquist
6e82dbafbc
docs: format cfg mgt tools as table
2017-11-15 14:30:32 +01:00
bergquist
29dff8b6cd
docs: adds more info about provisioning
2017-11-15 14:30:32 +01:00
bergquist
b4a89128b6
datasource as cfg: update docs to include globbig
2017-11-15 14:30:32 +01:00
bergquist
06a37d0023
datasource as cfg: show deletes first in example
2017-11-15 14:30:32 +01:00
bergquist
ebbfc529e0
datasource as cfg: support globbing
2017-11-15 14:30:32 +01:00
bergquist
0f136a940c
datasource as cfg: enable editable ds's
2017-11-15 14:30:32 +01:00
bergquist
b72cdae563
datasource as cfg: add org_id to example config
2017-11-15 14:30:32 +01:00
Dan Cech
0b6b5bac30
tweak docs
2017-11-15 14:30:32 +01:00
bergquist
36676e23c1
datasource as cfg: adds readonly datasources
2017-11-15 14:30:32 +01:00
bergquist
c6a6ae261f
datasource as cfg: refactor to use bus
2017-11-15 14:30:32 +01:00
bergquist
dc002abe4c
datasource as cfg: test for reading all properties
2017-11-15 14:30:32 +01:00
bergquist
5d49846e1d
datasource as cfg: adds provisioning docs
2017-11-15 14:30:32 +01:00
bergquist
665df676a5
datasource as cfg: rename feature to provisioning
2017-11-15 14:30:32 +01:00
bergquist
c9bfa781fd
datasource as cfg: improve name for this feature
2017-11-15 14:30:32 +01:00
bergquist
ba4bbd1d47
datasource as cfg: refactor tests to use yaml files
2017-11-15 14:30:32 +01:00
bergquist
3f0eb52389
datasource as cfg: ignore datasource all ready exist for inserts
2017-11-15 14:30:32 +01:00
bergquist
5910411845
datasource as cfg: add support for securedata field
2017-11-15 14:30:32 +01:00
bergquist
930da63173
datasource as cfg: setting for purging datasources not in cfg
2017-11-15 14:30:32 +01:00
bergquist
0f29b8ac83
datasources as cfg: tests for insert/updating datasources
2017-11-15 14:30:32 +01:00
bergquist
39b6c04643
datasource as cfg: basic implementation
2017-11-15 14:30:32 +01:00
Bruno Binet
014f6d5a75
More energy units ( #9743 )
...
* Add mA, mV, mW energy units
* Update case to be consistent with other energy units
2017-11-15 14:23:42 +01:00
Ryan McKinley
41be15ee4e
Add feet to the length menu ( #9889 )
2017-11-15 14:06:17 +01:00
Daniel Lee
0d85c63fff
middleware: recovery handles panics in all handlers
...
Also, changes the order of the middleware so that recovery is after the
gzip middleware. Otherwise, a 200 OK is returned instead of a 500 error.
2017-11-15 13:57:33 +01:00
Daniel Lee
b2fbb2691b
sql: small fix to error handling
2017-11-15 13:57:33 +01:00
bergquist
4301463c82
changelog: make prom fixes more explicit
2017-11-15 11:42:53 +01:00
bergquist
7834eca394
changelog: adds note about closing #9777
2017-11-15 11:27:11 +01:00
Carl Bergquist
5d6ed6c45f
prom: add support for default step param ( #9866 )
...
Alerting for prometheus have been depending on the step parameter from each query.
In https://github.com/grafana/grafana/pull/9226 we changed the behavior for step in the
frontend which caused problems for alerting. This commit fixes that by introducing a default
min interval value so alerting always have something to depend on.
closes #9777
2017-11-15 11:22:00 +01:00
Sven Klemm
9e6a7dcb90
properly escape components of connection string ( #9850 )
2017-11-15 10:55:08 +01:00
Torkel Ödegaard
1a3170373a
Merge branch 'alertList-notOK'
2017-11-15 10:48:20 +01:00
Torkel Ödegaard
ba8c02f594
refactor: changed string slicing to strings.TrimPrefix, #9862
2017-11-15 10:48:03 +01:00
Torkel Ödegaard
a534ac4948
build: fixed jshint error
2017-11-14 12:42:45 +01:00
Sven Klemm
108f582ec4
sync documentation, add remark about to_timestamp and redshift ( #9841 )
2017-11-14 11:33:55 +01:00
Torkel Ödegaard
b1a6c7814d
Update CHANGELOG.md
2017-11-14 11:30:39 +01:00
Torkel Ödegaard
6a976a3f48
Merge branch 'master' of github.com:grafana/grafana
2017-11-14 11:27:57 +01:00
Torkel Ödegaard
012b72cdbf
fix: Html escaping caused issue in InfluxDB query editor, could not pick greater than or less then operators, fixes #9871
2017-11-14 11:27:36 +01:00
bergquist
9fc7303ddf
changelog: adds note about closing #8523
2017-11-14 11:14:27 +01:00
bergquist
0e67d5e327
Merge branch 'anthu-master'
2017-11-14 11:05:09 +01:00
bergquist
3bb704144d
teams: removes print statement
2017-11-14 11:05:01 +01:00
Anton Huck
fd2451823b
Add Microsoft Teams notifier
2017-11-14 11:05:01 +01:00