Leonard Gram
0fde19552f
Missed thanks in changelog
2018-03-19 11:27:08 +01:00
Leonard Gram
4ca15ae71e
Adds pagerduty api update to changelog.
2018-03-19 11:25:57 +01:00
Marcus Efraimsson
8c2f3f761b
mssql: update readme
2018-03-19 11:20:17 +01:00
Marcus Efraimsson
03d15f7955
mssql: update test dashboard
2018-03-19 11:08:53 +01:00
Marcus Efraimsson
294ee5a610
Merge branch 'master' into mssql_datasource
2018-03-19 11:03:13 +01:00
Marcus Efraimsson
74a98d46eb
mssql: remove logos for now
2018-03-19 11:02:55 +01:00
Marcus Efraimsson
e1c4a27d1d
docs: mssql documentation will go into another branch targeting next minor version
2018-03-19 11:02:01 +01:00
Leonard Gram
148b71846f
Updated roadmap for 5.1
2018-03-19 10:43:26 +01:00
Carl Bergquist
930d00b513
Merge pull request #11284 from flopp999/patch-1
...
Changed Swedish and Icelandic currency
2018-03-19 08:15:34 +01:00
Daniel Lee
72f4341305
Merge pull request #11289 from DavidLambauer/patch-1
...
Minor format changes
2018-03-19 07:56:47 +01:00
DavidLambauer
b90c323e31
Minor format changes
...
Just fixed some minor inconsistencies in the format of the file. There were some configurations uncommented like so:
```
; container_name =
```
and some other like so:
```
;container_name =
```
So there is a need for a small perfection here!
I also removed some unnecessary line breaks, bullying my eyes...
2018-03-18 10:17:48 +01:00
flopp999
6718915a23
Changed Swedish and Icelandic currency
...
Swedish krone -> Swedish krona
Icelandic krone - > Icelandic króna
2018-03-16 19:46:20 +01:00
Alexander Zobnin
205714759e
fix failed tests for dashboard view state
2018-03-16 21:45:31 +03:00
Alexander Zobnin
0e5b790b54
dashboard: fix rendering link to panel in collapsed row
2018-03-16 21:03:49 +03:00
Daniel Lee
4bf285c3d1
docs: update install docs for 5.0.3
2018-03-16 18:39:34 +01:00
Daniel Lee
e7bbc6e624
changelog: 5.0.3
2018-03-16 17:42:23 +01:00
Marcus Efraimsson
d26d8c713e
Merge branch 'master' into mssql_datasource
2018-03-16 15:19:19 +01:00
Marcus Efraimsson
06afd24a10
mssql: add alternative logo without text
2018-03-16 15:18:05 +01:00
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
