Commit Graph

9895 Commits

Author SHA1 Message Date
Daniel Lee
61844cb0da Merge branch 'master' into v4.2.x 2017-03-08 17:09:33 +01:00
Daniel Lee
5037dae959 docs: move #7469 to v4.2.0 2017-03-08 17:09:08 +01:00
Daniel Lee
dc6d55a59f docs: changelog for 4.2.0
Adds notes for:
- ref #7694
- ref  #7681
- ref #7736
- ref #7743
- ref #7696
- ref #3536
- ref #6365
- ref #7591
- ref #7276
- ref #7723
- ref #7739
- ref #7680
2017-03-08 11:16:14 +01:00
Daniel Lee
9efb6e76e9 users: adds search and pagination (#7753)
ref #7469. Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
2017-03-07 16:03:54 +01:00
Torkel Ödegaard
140a0982e8 Merge branch 'master' into v4.2.x 2017-03-07 13:12:59 +01:00
Daniel Lee
8e3f22d307 docs: adds note about closing #7695 2017-03-07 11:23:57 +01:00
Daniel Lee
4ee262fe65 Merge pull request #7720 from mitjaziv/cubic_decimetre
added cubic decimetre - dm3 #7695
2017-03-07 10:41:27 +01:00
Ross Lodge
70c2586c80 Use other variable dependencies in regex filter for datasource variable (#7547) 2017-03-07 08:39:19 +01:00
Joseph Pintozzi
a37a2259b3 Allowing "Unique Count"s of any data type (#7704) 2017-03-07 08:36:33 +01:00
Mitsuhiro Tanda
a24ac012c4 support full resolution for $interval variable (#7696) 2017-03-07 08:35:29 +01:00
Patric Kanngießer
3735a1ace7 remember scroll position (https://github.com/grafana/grafana/issues/7680) (#7728) 2017-03-07 08:19:34 +01:00
Wouter Smit
125ee865b6 Spelling mistake (#7739) 2017-03-06 21:08:45 +01:00
Mitsuhiro Tanda
b387a8759e use session.NewSession() (#7745) 2017-03-06 21:08:16 +01:00
Pranay Kanwar
6ab90425c4 Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified (#7743) 2017-03-06 16:19:37 +01:00
Torkel Ödegaard
c3202d3f99 sessions: start session gc at startup but only after between 10 - 180 seconds 2017-03-06 12:23:28 +01:00
Torkel Ödegaard
ebdd35d799 Merge branch 'master' of github.com:grafana/grafana 2017-03-06 11:52:07 +01:00
Torkel Ödegaard
9f1c6a73f0 tech: added sql logger to log all sql statements sent to sql server 2017-03-06 11:51:35 +01:00
Denis Doria
31866b5e57 Allow commas on template variable #7681 (#7732)
This improvement allows to wrap an "expression" when using single or
double quotes. So now you can have time interval with offset for
influxdb.
2017-03-06 08:37:49 +01:00
Torkel Ödegaard
6af62abd41 docs(): added router_logging to configuration options, closes #7723 2017-03-06 08:26:36 +01:00
Denis Doria
0264fcc66c Remove unsaved dialog when removing a dashboard #7591 (#7733) 2017-03-06 07:49:28 +01:00
Denis Doria
e71b13d9fa Improve regex detection for influxdb measurement #7276 (#7734) 2017-03-06 07:47:50 +01:00
Mitja Zivkovic
7ace2463a4 added cubic decimetre - dm3 #7695 2017-03-03 14:27:15 +01:00
bergquist
fe970f6629 docs: adds note about closing #7676 2017-03-03 11:09:05 +01:00
bergquist
26bb9ad399 build: use initial checkout within container
speedup and simplify the build within the container
2017-03-03 11:07:05 +01:00
Carl Bergquist
f185c2c953 Merge pull request #7676 from dbrgn/threema-emoji
feat(alerting): Add emoji to Threema alert notifications
2017-03-03 11:04:49 +01:00
bergquist
55e0df7896 docs: adds note about closing #7710 2017-03-02 14:01:06 +01:00
bergquist
ee190d57eb webhooks: get proxy settings from ini file
closes #7710
2017-03-02 13:58:50 +01:00
bergquist
412b8998a8 webhooks: get proxy settings from ini file
closes #7710
2017-03-02 13:57:28 +01:00
bergquist
473513aa2f docs: how to configure alert notification links 2017-03-01 17:19:34 +01:00
Carl Bergquist
824357ed3b Merge pull request #7694 from rickard-von-essen/patch-1
Added some details about Sessions in Postgres
2017-03-01 12:17:25 +01:00
bergquist
06146b801c build: replace sha1 files with sha256
due to security reasons.
https://security.googleblog.com/2017/02/announcing-first-sha1-collision.html
2017-03-01 11:44:53 +01:00
Rickard von Essen
573bcdde12 Added some details about Sessions in Postgres 2017-03-01 11:35:12 +01:00
bergquist
62eb19a186 template: dont allow template variables to begin with '__'
closes #7678
2017-02-28 17:08:38 +01:00
bergquist
6b1dd1c7fc changelog: adds note about closing #7678 2017-02-28 17:08:17 +01:00
bergquist
9b6571fab1 template: dont allow template variables to begin with '__'
closes #7678
2017-02-28 17:04:47 +01:00
bergquist
1631c8de95 build: use correct version for tar.gz files 2017-02-28 09:15:06 +01:00
bergquist
3ef077c180 build: use correct version for tar.gz files 2017-02-28 09:09:49 +01:00
Danilo Bargen
1422655e97 feat(alerting): Add emoji to Threema alert notifications
This commit prepends emoji to Threema alert notifications to make it
easier to discern various notification types (e.g. alert, no data, ok).
2017-02-27 17:10:52 +01:00
bergquist
7d897c0980 build: add docker trigger for release builds 2017-02-27 13:26:53 +01:00
bergquist
86789c0b69 docs: update docs for 4.2.0 beta release 2017-02-27 12:44:55 +01:00
bergquist
a763285daa updates script for packagecloud 2017-02-27 11:05:05 +01:00
Torkel Ödegaard
d2dac02a28 Revert "ES Nested type bucket aggregation (#4694) (#4694)"
This reverts commit 8087af9c89.
2017-02-27 10:57:44 +01:00
Archit Sharma
8087af9c89 ES Nested type bucket aggregation (#4694) (#4694)
* (elasticsearch): add nested agg (use bucket aggs). fixes #4693

* (elasticsearch): rebased after merge of #6043 refactored from #4527
2017-02-27 10:57:00 +01:00
bergquist
ffe0ecfaaa release 4.2.0 beta1 2017-02-27 10:33:26 +01:00
bergquist
05952688c5 tech: avoid using http.DefaultClient 2017-02-24 17:22:12 +01:00
bergquist
03354bc49a tech: replace context.TODO with background ctx 2017-02-24 09:20:28 +01:00
Torkel Ödegaard
e73b306e0c fix(templating): fixed duplicate dashboard refresh when changing template variable, #7654 2017-02-24 08:16:37 +01:00
bergquist
46ac8c098f changelog: adds note about closing #7482 2017-02-24 07:42:30 +01:00
Carl Bergquist
5d3da99806 Merge pull request #7482 from dbrgn/master
Alerting: Add Threema Gateway integration
2017-02-24 07:40:36 +01:00
bergquist
785cecac26 changelog: adds note about closing #7526 2017-02-24 07:35:45 +01:00