Torkel Ödegaard
835d420294
alerting: fixed width of query component in alert tab
2017-03-09 12:57:58 +01:00
Torkel Ödegaard
140a0982e8
Merge branch 'master' into v4.2.x
2017-03-07 13:12:59 +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
Torkel Ödegaard
6af62abd41
docs(): added router_logging to configuration options, closes #7723
2017-03-06 08:26:36 +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
Torkel Ödegaard
e73b306e0c
fix(templating): fixed duplicate dashboard refresh when changing template variable, #7654
2017-02-24 08:16:37 +01:00
Torkel Ödegaard
d6eaaf3add
refactor: minor refactoring
2017-02-23 15:57:36 +01:00
Torkel Ödegaard
e3b71ed95e
docs(): updated CLA
2017-02-22 09:10:08 +01:00
Torkel Ödegaard
9c84b9f944
docs(): CLA fixes
2017-02-22 08:55:24 +01:00
Torkel Ödegaard
d5245fd19a
docs(): updated changelog with #7612
2017-02-21 10:49:50 +01:00
Torkel Ödegaard
b176f36889
docs(): updated CLA
2017-02-20 10:41:13 +01:00
Torkel Ödegaard
38126bc595
fix(templating): fixed issue detecting template variable dependency, fixes #7354
2017-02-20 09:31:50 +01:00
Torkel Ödegaard
ac0d09c419
fix(): fixed issue with syncing refresh interval to url
2017-02-17 14:07:15 +01:00
Torkel Ödegaard
902cf5f889
fix(): google analytics fix
2017-02-15 14:26:57 +01:00
Torkel Ödegaard
e573006283
docs(): added cla
2017-02-15 08:40:34 +01:00
Torkel Ödegaard
3398c28ab2
docs(): fixing redirects for moved doc pages, updating links to point to new urls
2017-02-06 18:04:53 +01:00
Torkel Ödegaard
982dc276d3
Update building docs readme
2017-02-06 10:19:47 +01:00
Torkel Ödegaard
65cf0d0e5c
fix(graph legend): fixed legend table mode scrollbar visible when it needs to to, fixes #6828
2017-02-02 16:29:11 +01:00
Torkel Ödegaard
f602752bdc
fix(packaging): fixed issue in deb package post install script that made it think upgrade was happening, fixes #7403
2017-01-31 10:56:04 +01:00
Torkel Ödegaard
fce2e341d2
mergefix(): fixed issue with master merge
2017-01-31 09:00:36 +01:00
Torkel Ödegaard
8a95c563bb
Merge branch 'master' into websocket
2017-01-31 08:56:49 +01:00
Torkel Ödegaard
2594041eed
hiding grafana live ds
2017-01-31 08:56:46 +01:00
Torkel Ödegaard
9ba1ea0179
fix(): another unit test fix attempt
2017-01-31 08:52:48 +01:00
Torkel Ödegaard
0c5abc1615
Merge branch 'xginn8-master'
2017-01-31 08:27:53 +01:00
Torkel Ödegaard
5fc5971145
refactor(): refactoring PR #7124
2017-01-31 08:27:48 +01:00
Torkel Ödegaard
436e35c845
fix(): fixed unit test broken in last PR merge
2017-01-31 07:59:14 +01:00
Torkel Ödegaard
9a61d43dc6
refactor(): refactoring PR #7141
2017-01-31 07:57:39 +01:00
Torkel Ödegaard
c400b5cf63
Merge branch 'master' of github.com:grafana/grafana
2017-01-31 07:48:44 +01:00
Torkel Ödegaard
1a9aaa4138
feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264
2017-01-31 07:48:10 +01:00
Torkel Ödegaard
830491fa66
Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image
2017-01-31 06:28:54 +01:00
Torkel Ödegaard
b191638f41
feat(packaging): Make config file not part of package to simplify upgrade, made commit always a short sha, changed RESTART_ON_UPGRADE to true by default, #7399 , #7227
2017-01-30 08:08:37 +01:00
Torkel Ödegaard
2a09d4a5a6
fix(): conf file had left over of old config key, #7395
2017-01-30 07:11:12 +01:00
Torkel Ödegaard
2f4da15264
fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365
2017-01-26 08:54:51 +01:00
Torkel Ödegaard
9b8760bad7
packaging(): fix rpm & SUSE compatability issue, #7293
2017-01-25 14:42:19 +01:00
Torkel Ödegaard
7c5ef2c75a
Merge branch 'connection-reset-shared_tooltip'
2017-01-25 14:35:02 +01:00
Torkel Ödegaard
28f890e42f
refactor(): removed commented out code
2017-01-25 14:34:55 +01:00
Torkel Ödegaard
23eab81cbe
fix(): fixed minor issue with single stat tooltip, #7357
2017-01-25 14:11:30 +01:00
Torkel Ödegaard
e073d20731
updated sample config
2017-01-25 13:34:02 +01:00
Torkel Ödegaard
f196ffa07d
updated docs
2017-01-25 13:33:27 +01:00
Torkel Ödegaard
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
Torkel Ödegaard
4e30aa9da2
docs(): changelog updated with #7112
2017-01-25 12:32:59 +01:00
Torkel Ödegaard
697d0867fa
fix(Elasticsearch): fix for alias patterns that refers to term that is numeric zero, fixes #7323
2017-01-23 10:15:02 +01:00
Torkel Ödegaard
8eae09e5e6
docs(): updated changelog with info on #7324
2017-01-23 07:29:16 +01:00
Torkel Ödegaard
0683742e83
tech(library upgrade): fixed unit test broken by angularjs upgrade, #7274
2017-01-16 22:27:35 +01:00
Torkel Ödegaard
6f87f88690
tech(lib upgrade): upgraded angularjs from 1.5.8 to 1.6.1, closes #7274
2017-01-16 21:31:55 +01:00
Torkel Ödegaard
710d07d7a5
Merge branch 'mtanda-clipboard_js'
2017-01-16 21:08:47 +01:00
Torkel Ödegaard
c5955bacd2
refactor(): minor refactor
2017-01-16 21:08:39 +01:00
Torkel Ödegaard
09cec8535e
Merge branch 'clipboard_js' of https://github.com/mtanda/grafana into mtanda-clipboard_js
2017-01-16 20:57:16 +01:00
Torkel Ödegaard
e5a6c523d7
Merge branch 'master' of github.com:grafana/grafana
2017-01-13 17:39:41 +01:00
Torkel Ödegaard
49fe74228b
fix(browser history): fixes and enhancements to browser history, it now works properly again AND it can restore previous time ranges in dashboards, closes #7259
2017-01-13 17:37:53 +01:00
Torkel Ödegaard
deff24d2c1
Merge branch 'clipboard_js' of https://github.com/mtanda/grafana into mtanda-clipboard_js
2017-01-13 14:57:23 +01:00
Torkel Ödegaard
d354f3a8af
fix(alerting): fixed evaluation for no_value condition, fixes #7244 ( #7247 )
...
* fix(alerting): fixed evaluation for no_value condition, fixes #7244
* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
Torkel Ödegaard
821876a85b
Merge branch 'master' of github.com:grafana/grafana
2017-01-11 19:48:17 +01:00
Torkel Ödegaard
b8b517cd3f
docs(): updated changelog
2017-01-11 19:48:06 +01:00
Torkel Ödegaard
f045fbf267
Merge branch 'master' of github.com:grafana/grafana
2017-01-11 19:40:59 +01:00
Torkel Ödegaard
9c0f7f547b
fix(alerts): added alert listener for appEvents
2017-01-11 19:40:05 +01:00
Torkel Ödegaard
61214899bd
docs(): updated changelog
2017-01-11 15:26:08 +01:00
Torkel Ödegaard
bd8899b37d
fix(graph): fixed table legend min-height, fixes #7221
2017-01-11 15:24:43 +01:00
Torkel Ödegaard
edae622d8f
docs(): updated changelog
2017-01-11 14:04:34 +01:00
Torkel Ödegaard
64f5146a62
change(text panel): removed rarely used (and not properly working), text mode option, closes #6389 , closes #7214
2017-01-11 12:33:12 +01:00
Torkel Ödegaard
cdc7da3ae1
docs(): updated changelog
2017-01-11 12:16:34 +01:00
Torkel Ödegaard
b48273d1cf
Merge branch 'master' of github.com:grafana/grafana
2017-01-11 12:11:38 +01:00
Torkel Ödegaard
149dd78298
Merge branch 'built_in_template_variables'
2017-01-11 12:10:33 +01:00
Torkel Ödegaard
b475f91387
feat(templating): completed work on built in template variables and , closes #7190 , refactors #7170
2017-01-11 12:10:26 +01:00
Torkel Ödegaard
44b7a26119
fix(graph): fix for table legend and scroll, fixes #7204 , fixes #6628
2017-01-11 10:35:52 +01:00
Torkel Ödegaard
8c39cd35f0
progress on interval built in variable
2017-01-11 10:18:21 +01:00
Torkel Ödegaard
e218837380
began work on built in template variables, #7190
2017-01-09 15:31:19 +01:00
Torkel Ödegaard
53fbb8b074
docs(changelog): added entry for telegram notifier, #7098
2017-01-06 12:19:39 +01:00
Torkel Ödegaard
31bd725559
Merge branch 'notifier-refactor'
2017-01-06 12:17:34 +01:00
Torkel Ödegaard
eca918c0e7
Merge branch 'master' of github.com:grafana/grafana
2017-01-06 12:15:12 +01:00
Torkel Ödegaard
69d31c560d
bumped master to 4.2
2017-01-06 12:14:58 +01:00
Torkel Ödegaard
b8f559aecb
feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162
2017-01-06 12:04:25 +01:00
Torkel Ödegaard
d6a2431767
Merge branch 'notifier-telegram-messenger' of https://github.com/leonoff/grafana into leonoff-notifier-telegram-messenger
2017-01-06 10:27:20 +01:00
Torkel Ödegaard
45d2e70ba7
feat(dashboard): sorting dashboard model kekeys, refactoring PR #7139
2017-01-06 10:09:11 +01:00
Torkel Ödegaard
c472054f21
Merge branch 'master' into dashboard-export
2017-01-06 07:50:16 +01:00
Torkel Ödegaard
7433e8c58f
docs(changelog): updated changelog with ES PR #7154
2017-01-06 07:24:56 +01:00
Torkel Ödegaard
20b7c2f2e2
feat(ES): refactoring PR #7154
2017-01-06 07:22:37 +01:00
Torkel Ödegaard
293fd93e6c
fix(elasticsearch): fixed predict default value, fixes #7145
2017-01-06 07:06:41 +01:00
Torkel Ödegaard
6960fb46c2
fix(build): remove triggering full package release on every commit, #6970
2017-01-06 06:51:17 +01:00
Torkel Ödegaard
813232315e
fix(testdata): fixed test data source build issue
2017-01-06 06:50:02 +01:00
Torkel Ödegaard
63f6e86e46
feat(ES): better support for text type, closes #7151
2017-01-06 06:35:08 +01:00
Torkel Ödegaard
658d39944b
feat(elasticsearch): add support for Elasticsearch scaled_type number type, closes #7155
2017-01-06 06:12:48 +01:00
Torkel Ödegaard
36929c2a92
fix(elasticsearch): add support for text type filter in templating query, fixes #7136 , fixes #7135
2017-01-04 20:14:56 +01:00
Torkel Ödegaard
9dc42648cf
fix(templating): fixed issue with experimental feature template variable value groups tags, fixes #6752
2017-01-02 13:32:20 +01:00
Torkel Ödegaard
2be5ee0bd5
fix(graph): fixed graph legend issue with always visible scrollbar, fixes #6828
2017-01-02 12:22:56 +01:00
Torkel Ödegaard
083a42942f
fix(phantomsj): fixed issue with y axis label rotation in phantomjs rendered graphs, fixes #6924
2017-01-02 12:01:48 +01:00
Torkel Ödegaard
8030b56bba
fix(panel): fixed panel help text for panels that set background color, fixes #7085
2017-01-02 11:14:00 +01:00
Torkel Ödegaard
fad07f0d15
refactor(http): refactoring http server
2016-12-21 14:36:32 +01:00
Torkel Ödegaard
8bccbdafd2
feat(live): minor progress on stream manager
2016-12-21 09:16:29 +01:00
Torkel Ödegaard
b7827962dc
feat(live): just wanted to checkout how far I got on the websocket data source
2016-12-20 16:09:04 +01:00
Torkel Ödegaard
1507d6c872
Merge branch 'master' of github.com:grafana/grafana
2016-12-20 15:30:10 +01:00
Torkel Ödegaard
4c5bdd9da4
fix(panel): need to check if panel has links
2016-12-20 15:24:53 +01:00
Torkel Ödegaard
fa01022494
fix(ux): fixed css issue with add row button, fixes #7017
2016-12-20 13:00:46 +01:00
Torkel Ödegaard
e81e4ad06f
updated websocket lib
2016-12-20 11:36:11 +01:00
Torkel Ödegaard
164de5e3ce
Merge branch 'master' of github.com:grafana/grafana
2016-12-19 16:36:26 +01:00
Torkel Ödegaard
a2baec8592
fix(panel): fixed panel help tooltip issue, #4079
2016-12-19 16:36:09 +01:00
Torkel Ödegaard
090db9401c
fix(graph): fix for when data min/max delta is zero and negative and grid y min/max is auto, fixes #6980
2016-12-19 09:30:52 +01:00
Torkel Ödegaard