Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Daniel Lee
7c74111187
search: add expanded folders
2017-11-17 15:30:21 +01:00
Torkel Ödegaard
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
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
303e3de488
fix: fix for avatar images when gzip is turned on, fixes #5952
2017-11-17 13:13:58 +01:00
Alexander Zobnin
a55be07ea5
dashboard history clean up: avoid potential SQL injections
2017-11-17 10:51:50 +03:00
Daniel Lee
f47673ab5c
search: refactor search sql into a builder class
2017-11-17 00:16:33 +01:00
bergquist
0f69e06fcf
removes invalid comment
2017-11-16 16:55:02 +01:00
Marcus Efraimsson
909601d6ab
api: fix so that datasources functions returns Response
2017-11-16 16:29:05 +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
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +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
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
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
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
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
Alexander Zobnin
59d89e422b
dashboard history clean up: add tests
2017-11-15 13:38:44 +03:00
Alexander Zobnin
a0a1f4aacd
dashboard history: refactor after review
2017-11-15 13:36:36 +03: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
Alexander Zobnin
08e2bbef83
dashboard history: clean up dashboard version history
2017-11-14 18:22:18 +03:00
Sven Klemm
108f582ec4
sync documentation, add remark about to_timestamp and redshift ( #9841 )
2017-11-14 11:33:55 +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
Mitsuhiro Tanda
52e1c4113b
fix cloudwatch ec2_instance_attribute ( #9718 )
...
* fix cloudwatch ec2_instance_attribute
* add test
* minor fix
2017-11-13 13:07:46 +01:00
Patrick O'Carroll
9ad186bcc9
not ok option to alert list, fixes : #9754
2017-11-13 10:30:11 +01:00
Carl Bergquist
c44f6e2ec2
Merge pull request #9854 from drenalin23/drenalin-add-networkelb-cloudwatch
...
Add AWS/NetworkELB to cloudwatch definitions
2017-11-13 07:50:45 +01:00
Mitsuhiro Tanda
6488ccd113
return empty array for no datapoints
2017-11-12 00:48:54 +09:00
Scott Nelson Windels
343143e95f
Add AWS/NetworkELB to cloudwatch definitions
2017-11-10 15:13:09 -08:00
Carl Bergquist
48d77ea2a8
Merge pull request #9785 from certusoft/mysql_performance
...
MySQL Performance when using GF_DATABASE_URL
2017-11-09 18:07:22 +01:00
Carl Bergquist
56fe1308ce
Merge pull request #9826 from agnivade/hexencoding
...
Use hex.EncodeToString to encode to hex
2017-11-09 17:58:35 +01:00
bergquist
d4e8e22fda
test: adds tests for password encodiing
2017-11-09 17:55:12 +01:00
Agniva De Sarker
143b56b5ac
Use hex.EncodeToString to encode to hex
...
Using the EncodeToString function from the encoding/hex package
is much faster than calling the fmt.Sprintf with %x
Benchmark results below with the following code
func BenchmarkHexPrint(b *testing.B) {
data := []byte("hellothere")
for n := 0; n < b.N; n++ {
// _ = fmt.Sprintf("%x", data)
_ = hex.EncodeToString(data)
}
}
name old time/op new time/op delta
HexPrint-4 188ns ± 1% 99ns ± 1% -47.40% (p=0.008 n=5+5)
name old alloc/op new alloc/op delta
HexPrint-4 64.0B ± 0% 64.0B ± 0% ~ (all equal)
name old allocs/op new allocs/op delta
HexPrint-4 2.00 ± 0% 2.00 ± 0% ~ (all equal)
2017-11-08 22:44:31 +05:30
Furtchet
a51b1e8951
Update the config key to database_log_queries so it is more descriptive, as suggested in #9785 .
2017-11-06 08:01:31 -06:00
