IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,694 Commits 5,454 Branches 554 Tags 1.9 GiB
62174c81c8
Commit Graph

13694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson
62174c81c8 mssql: cleanup and minor changes 2018-03-19 13:06:46 +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
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... 

![<3](https://media.giphy.com/media/dTJd5ygpxkzWo/giphy.gif)
 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
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
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 bce5b2d56e.

* Revert "support [[var]] notation"

This reverts commit 10012f8ffe.

* fix token type and regex
 2018-03-15 20:17:51 +03: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
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
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