Marcus Efraimsson
1c7aff7810
mssql: strip inkscape from logo
2018-03-16 15:17:25 +01:00
Marcus Efraimsson
69b9fb6d15
mssql: minor improvements of query editor help
2018-03-16 15:11:15 +01:00
Marcus Efraimsson
ccd57fbfa3
mssql: skip rendering of mssql logos until we have a valid logo
2018-03-16 14:47:43 +01:00
Marcus Efraimsson
673c8290fb
docker: add test dashboard for mssql tests based on test data generated by integration test
2018-03-16 14:44:26 +01:00
Marcus Efraimsson
e97b03e930
mssql: additional integration tests
...
Metric query of table having multiple value columns
Annotation query
2018-03-16 14:42:54 +01:00
Marcus Efraimsson
f0f8006d8d
mssql: support money, smallmoney and decimal data types
2018-03-16 14:37:16 +01:00
Marcus Efraimsson
a6e4ac5484
mssql: update plugin.json, added description and name MSSQL -> Microsft SQL Server
2018-03-16 14:26:05 +01:00
Carl Bergquist
1014f7c40a
Merge pull request #11260 from iksaif/master
...
alertmanager: handle resolved alerts, nodata, and execution errors + cleanups
2018-03-16 09:11:59 +01:00
Daniel Lee
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
Daniel Lee
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
Daniel Lee
5a3ba68a9c
database: fixes after xorm update
2018-03-16 00:09:29 +01:00
Daniel Lee
1c20126f87
database: update xorm to v0.6.4 and xorm core to v0.5.7
2018-03-16 00:02:50 +01:00
Mitsuhiro Tanda
c6fa0b90a7
prometheus editor: variable autocomplete support (PR #9988 )
...
* prometheus ace editor, template variable support
* minor fix
* support [[var]] notation
* don't remove last ] if token type is string
* Revert "don't remove last ] if token type is string"
This reverts commit bce5b2d56e10012f8ffe
2018-03-15 20:17:51 +03:00
Patrick O'Carroll
1094dc32bc
made a keyboard shortcut to duplicate panel
2018-03-15 17:22:11 +01:00
Marcus Efraimsson
7dfa159ba1
docs: update mssql documentation
2018-03-15 17:19:07 +01:00
Marcus Efraimsson
9144701fcc
mssql: disable mssql integration tests per default
2018-03-15 15:27:31 +01:00
Leonard Gram
3b03dce3c2
mssql: timeGroup fill support added.
2018-03-15 15:06:54 +01:00
Marcus Efraimsson
faf9e3f722
mssql: add timeGroup integration test
2018-03-15 14:26:53 +01:00
Corentin Chary
3d8f1a7439
alertmanager: /Creating/Sending/
2018-03-15 13:48:58 +01:00
Leonard Gram
571556e1d8
mssql: adds fill to timeGroup macro.
2018-03-15 13:11:26 +01:00
Corentin Chary
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
Mitja Zivkovic
5669596518
add regex search of username and password in urls, which are replaced by strings.Replace
2018-03-15 10:50:57 +01:00
Corentin Chary
d4d2b6d7da
notitfiers: avoid ShouldNotify duplication
2018-03-15 10:48:29 +01:00
Corentin Chary
777c1024c9
alertmanager: if there are no alerts to send, do nothing
2018-03-15 10:08:03 +01:00
Marcus Efraimsson
d2267643ed
Merge branch 'master' into mssql_datasource
2018-03-15 09:53:19 +01:00
Marcus Efraimsson
eef01e3703
docker: change port for prom random data scrape target
2018-03-15 09:52:53 +01:00
Marcus Efraimsson
3d0f97aab9
mssql datasource: wip
2018-03-15 09:51:29 +01:00
Marcus Efraimsson
ef3588c1f8
docker: mssql and mssql tests blocks with common build context
2018-03-15 09:49:53 +01:00
Carl Bergquist
18e498e0ff
Update README.md
...
Removes alpha
closes https://github.com/grafana/grafana/issues/11251
2018-03-14 21:07:55 +01:00
Marcus Efraimsson
61e1c12fee
docker: fake-data-gen:latest updates
...
fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block.
added big dashboard for graphite 1 and 1.1+ that can be imported to grafana
2018-03-14 20:47:52 +01:00
ilgizar
bd3d17ab8c
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-14 23:42:58 +05:00
ilgizar
9d7ab78d9f
Resolved conflict
2018-03-14 23:39:05 +05:00
bergquist
8efb39ee2b
docs: more details about slack notifier
...
closes #11059
2018-03-14 18:26:05 +01:00
bergquist
bdf6a75c91
docs: updates latest release for docs
2018-03-14 17:09:02 +01:00
bergquist
cf67584998
changelog: improve description of closed issues
2018-03-14 16:06:03 +01:00
Carl Bergquist
105f6ff88c
Merge pull request #11249 from bergquist/legacy_render_urls
...
Avoid redirecting internal rendering requests
2018-03-14 15:42:07 +01:00
bergquist
6cac7c2de9
renderer: avoid redirect render requests
...
closes #11180
2018-03-14 15:27:18 +01:00
bergquist
e4cca1943c
changelog: adds notes about 5.0.2
...
[ci skip]
2018-03-14 15:05:17 +01:00
Carl Bergquist
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
Carl Bergquist
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
Marcus Efraimsson
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
Carl Bergquist
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
Carl Bergquist
a0a57ac33a
Merge pull request #11236 from grafana/alerting_collapsed_panels
...
alerting: supports extracting alerts from collapsed panels
2018-03-14 14:16:50 +01:00
Daniel Lee
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
bergquist
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
Marcus Efraimsson
6503e482e3
docker: add test dashboard for mssql for visualizing data generated by fake-data-gen
2018-03-13 23:07:40 +01:00
Marcus Efraimsson
c87752102a
mssql datasource: support for timeGroup macro function
2018-03-13 22:49:49 +01:00
Carl Bergquist
9cae6f05b4
Merge pull request #11225 from flopp999/patch-1
...
Added icon for iOS web app
2018-03-13 21:54:55 +01:00
Marcus Efraimsson
91fa076fb3
folders: should be possible to browse folder using only uid
...
That is, the slug part of url should be optional.
2018-03-13 21:32:37 +01:00
Marcus Efraimsson
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
Marcus Efraimsson
Carl Bergquist
Daniel Lee
Mitsuhiro Tanda
Patrick O'Carroll
Leonard Gram
Corentin Chary
Mitja Zivkovic
ilgizar
bergquist