Torkel Ödegaard
|
aaa465a100
|
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
|
2017-11-17 14:16:49 +01:00 |
|
Torkel Ödegaard
|
908be13c03
|
Update CHANGELOG.md
|
2017-11-17 13:26:36 +01:00 |
|
Torkel Ödegaard
|
b481ff27b2
|
Update CHANGELOG.md
|
2017-11-17 13:22:49 +01:00 |
|
Torkel Ödegaard
|
303e3de488
|
fix: fix for avatar images when gzip is turned on, fixes #5952
|
2017-11-17 13:13:58 +01:00 |
|
Torkel Ödegaard
|
7ccc8ae298
|
elasticsearch: default version to 5.x
|
2017-11-17 12:23:40 +01:00 |
|
Torkel Ödegaard
|
f591bea696
|
Merge branch 'graphite-series-by-tags'
|
2017-11-17 12:15:21 +01:00 |
|
Alexander Zobnin
|
a55be07ea5
|
dashboard history clean up: avoid potential SQL injections
|
2017-11-17 10:51:50 +03:00 |
|
bergquist
|
fe42f81441
|
changelog: note about closing #9798
|
2017-11-16 16:55:02 +01:00 |
|
bergquist
|
0f69e06fcf
|
removes invalid comment
|
2017-11-16 16:55:02 +01:00 |
|
Carl Bergquist
|
03c23dd9c1
|
Merge pull request #9901 from grafana/fix_annotations_api
fix: return id from api when creating new annotation, fixes #9798
|
2017-11-16 16:51:41 +01:00 |
|
Marcus Efraimsson
|
909601d6ab
|
api: fix so that datasources functions returns Response
|
2017-11-16 16:29:05 +01:00 |
|
bergquist
|
dcffcbb6d3
|
changelog: note about closing #1789
|
2017-11-16 16:21:14 +01:00 |
|
Torkel Ödegaard
|
26577ab600
|
Merge branch 'master' into graphite-series-by-tags
|
2017-11-16 16:20:44 +01:00 |
|
Marcus Efraimsson
|
89b27b35ba
|
fix: Use Response as return type
|
2017-11-16 16:19:01 +01:00 |
|
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 |
|
Torkel Ödegaard
|
3ae0cfa1d0
|
graphite: minor changes
|
2017-11-16 14:16:37 +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 |
|
Torkel Ödegaard
|
3b18adfe1a
|
graphite: progress on new query editor
|
2017-11-15 14:35:22 +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 |
|