f0f8006d8d
mssql: support money, smallmoney and decimal data types
2018-03-16 14:37:16 +01:00
3ca1e06509
session: fork Macaron mysql session middleware
...
This changes forks the mysql part of the Macaron session middleware.
In the forked mysql file:
- takes in a config setting for SetConnMaxLifetime (this solves wait_timeout
problem if it is set to a shorter interval than wait_timeout)
- removes the panic when an error is returned in the Exist function.
- retries the exist query once
- retries the GC query once
2018-03-16 01:19:28 +01:00
9cdd7cb04c
database: expose SetConnMaxLifetime as config setting
...
For MySQL, setting this to be shorter than the wait_timeout MySQL setting
solves the issue with connection errors after the session has timed out for
the connection to the database via xorm.
2018-03-16 01:09:00 +01:00
5a3ba68a9c
database: fixes after xorm update
2018-03-16 00:09:29 +01:00
1c20126f87
database: update xorm to v0.6.4 and xorm core to v0.5.7
2018-03-16 00:02:50 +01:00
9144701fcc
mssql: disable mssql integration tests per default
2018-03-15 15:27:31 +01:00
3b03dce3c2
mssql: timeGroup fill support added.
2018-03-15 15:06:54 +01:00
faf9e3f722
mssql: add timeGroup integration test
2018-03-15 14:26:53 +01:00
3d8f1a7439
alertmanager: /Creating/Sending/
2018-03-15 13:48:58 +01:00
571556e1d8
mssql: adds fill to timeGroup macro.
2018-03-15 13:11:26 +01:00
a04c4ba454
allow any database for influx proxy
2018-03-15 13:01:17 +01:00
ad88e5398c
remove
2018-03-15 12:57:09 +01:00
c8da1a46c5
alertmanager: handle resolved alerts, nodata, and execution errors
...
- Resolved alerts will be sent to the AM the first time they move
from Alerting to OK
- Errors are forwarded
- NoData is not ignored anymore
- The summary annotation is set (with the alertname)
- The image annotation is set (when available)
2018-03-15 12:02:29 +01:00
5669596518
add regex search of username and password in urls, which are replaced by strings.Replace
2018-03-15 10:50:57 +01:00
d4d2b6d7da
notitfiers: avoid ShouldNotify duplication
2018-03-15 10:48:29 +01:00
777c1024c9
alertmanager: if there are no alerts to send, do nothing
2018-03-15 10:08:03 +01:00
d2267643ed
Merge branch 'master' into mssql_datasource
2018-03-15 09:53:19 +01:00
3d0f97aab9
mssql datasource: wip
2018-03-15 09:51:29 +01:00
ef3588c1f8
docker: mssql and mssql tests blocks with common build context
2018-03-15 09:49:53 +01:00
4f8ee9f5a7
merge with master
2018-03-14 23:52:24 +01:00
105f6ff88c
Merge pull request #11249 from bergquist/legacy_render_urls
...
Avoid redirecting internal rendering requests
2018-03-14 15:42:07 +01:00
6cac7c2de9
renderer: avoid redirect render requests
...
closes #11180
2018-03-14 15:27:18 +01:00
6d1e3613f7
Merge pull request #11246 from grafana/11227_import
...
dashboard: fix import dashboard with alert rule(s)
2018-03-14 14:38:29 +01:00
a8918047a2
Merge pull request #11238 from grafana/11155-mysql-issue
...
middleware: recover and retry on session start
2018-03-14 14:29:47 +01:00
87284d284e
dashboard: fix import dashboard with alert rule
...
Importing a dashboard with alert rule(s) should be possible without receiving invalid
alert data error. This fix reverts the import logic to how it worked before Grafana v5.0,
that is import will allow dashboard with alert rule(s) but no alerts will be created.
After an import the user will need to update the dashboard for the alerts to be created.
Fixes #11227
2018-03-14 14:24:56 +01:00
0ef94ea403
Merge pull request #11232 from grafana/11231_dash_url
...
Should be possible to browse dashboard using only uid
2018-03-14 14:18:58 +01:00
5f511deefc
middleware: recover and retry on session start
...
Partial fix for #11155 - the Macaron session middleware
panics if mysql returns an error. This fix recovers from
the panic and retries once
2018-03-14 12:26:59 +01:00
be7ec310b1
alerting: supports extracting alerts from collapsed panels
...
collapsed rows wrap the hidden rows within itself. This caused
the extractor to miss the panel and therefore delete the alert
accosiated with the graph.
closes #11222
2018-03-14 11:23:16 +01:00
c87752102a
mssql datasource: support for timeGroup macro function
2018-03-13 22:49:49 +01:00
5fbfd67b94
dashboards: should be possible to browse dashboard using only uid
...
That is, the slug part of url should be optional.
Closes #11231
2018-03-13 21:06:25 +01:00
57d46a706c
mssql datasource: additional data type tests
2018-03-13 19:54:29 +01:00
d4beee2bb0
Merge branch 'master' into mssql_datasource
2018-03-13 16:03:02 +01:00
87bc60b9d7
alerting: adds back the link to grafana.
2018-03-13 13:29:57 +01:00
aba6f627c5
Fix CI
2018-03-13 13:29:57 +01:00
89557dd67b
Modify Grafana Pagerduty notifier to use Pagerduty API V2
2018-03-13 13:29:57 +01:00
061a418f0f
style: dont expose func outside package
2018-03-13 11:24:10 +01:00
3f2c086e6f
teams: removes quota on route
...
Got added by mistake a year ago.
2018-03-13 10:56:35 +01:00
5a368f99ec
Fix urls in plugin update_checker logs
2018-03-12 14:38:37 +01:00
a83ede0193
support POST for query and query_range
2018-03-12 13:25:05 +09:00
a589f701ad
Merge pull request #10925 from mtanda/cw_high_resolution
...
(cloudwatch) support high resolution query
2018-03-08 18:06:08 +01:00
5153d8e535
Merge pull request #11161 from DanCech/quota-refactor
...
move quota to dedicated service
2018-03-08 15:21:16 +01:00
87db2d1183
Merge pull request #11130 from DanCech/context-refactor
...
move Context and session out of middleware
2018-03-08 10:21:34 +01:00
bbd6adabbf
move quota to dedicated service
2018-03-07 17:19:35 -05:00
abef722265
Fix indent
2018-03-07 14:41:05 -05:00
380aa26ea3
Fix the code to match the documentation.
...
Permit for LDAP groups to be groupofuniquenames composed of uniquename (DN).
For this, propose DN as group_search_filter_user_attribute and DN also for the member_of in the server.attributes section.
DN is processed as a special attribute name which returns the LdapSearchResult.DN field instead of a member of attr array.
2018-03-07 18:14:18 +01:00
e3b86637f9
Merge pull request #11146 from grafana/go1.10
...
Upgrade golang to 1.10
2018-03-07 18:00:37 +01:00
c0ecdee375
rename Context to ReqContext
2018-03-07 11:54:50 -05:00
eecbdc89eb
fix, set default highResolution setting
2018-03-08 01:18:11 +09:00
d220516664
Merge pull request #11145 from grafana/alerting-invalid-data
...
alerting: fixes validation error when saving alerts in dash
2018-03-07 17:06:19 +01:00
d07aff8991
Merge pull request #11127 from DanCech/oauth-jwt-email
...
only use jwt token if it contains an email address
2018-03-07 17:01:12 +01:00
Marcus Efraimsson
Daniel Lee
Leonard Gram
Corentin Chary
ryan
Mitja Zivkovic
Carl Bergquist
bergquist
John Baublitz
Dobrosław Żybort
Mitsuhiro Tanda
Dan Cech
Dan Cech
Sébastien BERNARD