0c7294593c
update the updated column!
2018-03-22 20:05:04 +01:00
d554c6f9be
using circle as my tester
2018-03-22 19:44:47 +01:00
fa021b547a
using circle as my tester
2018-03-22 19:39:30 +01:00
db91033b6e
adding tests, but they arent running locally
2018-03-22 19:33:33 +01:00
20353db966
convert epoch to milliseconds
2018-03-22 16:21:47 +01:00
a2bbd89a9e
adding updated column
2018-03-22 15:52:09 +01:00
df94b380f4
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master:
Make golint happier
2018-03-22 14:59:14 +01:00
7aab6a8887
Make golint happier
2018-03-22 12:40:21 +01:00
3898ea02e6
adding created column
2018-03-22 02:22:58 +01:00
92388f7faf
session: update defaults for ConnMaxLifetime
...
to be the same as the 5.0.3 release defaults
2018-03-20 19:31:01 +01:00
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
f64c6e490a
Merge pull request #11258 from mitjaziv/hide-credentials
...
add regex search/replace of username/password in urls
2018-03-20 09:37:09 +01:00
192e913b7b
mssql: add integration test to verify stored procedure usage
2018-03-19 19:56:34 +01:00
8f6626e805
mssql: encrypt password in database
2018-03-19 17:32:51 +01:00
449a307575
mssql: remove dynamic construction of metric column and other columns
...
This seems like a niche feature which can be solved by defining multiple queries. In the future
we'll probably add support for defining series name by alias field similar to how other datasources
have solved that, e.g. prometheus.
2018-03-19 17:14:01 +01:00
d14946a135
mssql: cleanup and minor refactor
2018-03-19 13:32:04 +01:00
24c0f28f41
mssql: allow host without port and fallback to default port 1433
2018-03-19 13:24:31 +01:00
d26d8c713e
Merge branch 'master' into mssql_datasource
2018-03-16 15:19:19 +01:00
e97b03e930
mssql: additional integration tests
...
Metric query of table having multiple value columns
Annotation query
2018-03-16 14:42:54 +01:00
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
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
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
ryan
Julian Kornberger
Daniel Lee
Carl Bergquist
Marcus Efraimsson
Leonard Gram
Corentin Chary
Mitja Zivkovic
bergquist
John Baublitz