Commit Graph
11430 Commits
Author SHA1 Message Date
Daniel Lee 9a91a882b4 update version to 4.6.0-beta3 v4.6.0-beta3 2017-10-23 15:22:06 +02:00
Daniel Lee 6ad6131aaf plugins: expose dashboard impression store
(cherry picked from commit 90ef877e6e)
2017-10-23 15:20:29 +02:00
Sven Klemm 1f10928450 modify $__timeGroup macro so it can be used in select clause (#9527)
* modify $__timeGroup macro so it can be used in select clause

* fix $__interval_ms for postgres datasource

* use $__timeGroup macro in documentation

* fix annotation template query
remove title since its no longer used and add tags instead

* change __timeFilter macro to work on postgresql < 8.1 and redshift

(cherry picked from commit b2d880c6de)
2017-10-23 14:13:38 +02:00
Daniel Lee 0cd0aa19d6 plugins: fixes path issue on Windows
When loading a plugin and setting the path, an extra backslash sneaks
when running on Windows. Fixes #9597

(cherry picked from commit 7863a0417c)
2017-10-23 13:06:09 +02:00
bergquist c2f2a43197 prometheus: enable gzip for /metrics endpoint
closes #9464

(cherry picked from commit 139f077453)
2017-10-23 09:37:41 +02:00
Torkel Ödegaard 7fe1ac5fe7 fix: fixed save to file button in export modal, fixes #9586
(cherry picked from commit 1e61eae9f4)
2017-10-19 12:54:24 +02:00
bergquist aec448f7c6 mysql: add usage stats for mysql 2017-10-19 10:31:30 +02:00
Daniel Lee 2ce36c8670 pluginloader: esModule true for systemjs config
Supports importing a module's contents with the
'* as module' syntax. The latest version of SystemJS turns
it off per default which broke several plugins.

(cherry picked from commit 7cbb4020e9)
2017-10-19 09:04:22 +02:00
Alexander Zobnin fb35d839c1 Fix heatmap Y axis rendering (#9580)
* heatmap: fix Y axis rendering, #9576

* heatmap: fix color legend rendering

(cherry picked from commit 92c67e8c83)
2017-10-18 15:23:12 +02:00
Mitsuhiro Tanda c8f5d39d97 fix vector range
(cherry picked from commit 8a43d4e25c)
2017-10-18 14:07:44 +02:00
bergquist 34bc19359d prometheus: add builtin template variable as range vectors
add $__interval and $__interval_ms as range vectors to
prometheus editor

(cherry picked from commit c2c5f529f3)
2017-10-18 14:05:43 +02:00
Torkel Ödegaard 3dcae78126 fix: fixed prometheus step issue that caused browser crash, fixes #9575
(cherry picked from commit 8d68bd6bb9)
2017-10-18 13:29:02 +02:00
Torkel Ödegaard 054c7a154a fix: getting started panel and mark adding data source as done, fixes #9568
(cherry picked from commit 039fc2964a)
2017-10-18 12:04:52 +02:00
Alexander Zobnin 6f3d61f4d2 Fixes for annotations API (#9577)
* annotations: throw error if no text specified and set default time to Now() if empty, #9571

* annotations: fix saving graphite event with empty string tags

* docs: add /api/annotations/graphite endpoint docs, #9571

(cherry picked from commit 74e90d01ec)
2017-10-18 10:13:51 +02:00
bergquist 305f8c10e9 bump packagecloud script 2017-10-17 14:16:40 +02:00
Torkel Ödegaard fff4cfd11e build: added imports of rxjs utility functions
(cherry picked from commit eda3cffe22)
v4.6.0-beta2
2017-10-17 12:17:32 +02:00
Torkel Ödegaard d20434f828 Merge branch 'v4.6.x' of github.com:grafana/grafana into v4.6.x 2017-10-17 12:15:26 +02:00
bergquist 1ef850fae0 prepare for v4.6.0-beta2 release 2017-10-17 11:17:34 +02:00
Mitsuhiro Tanda 2f7a59fb18 fix template variable expanding
(cherry picked from commit 0f87279ab8)
2017-10-17 11:16:36 +02:00
krise3k 07be20eeb3 annotations: quote reserved fields (#9550)
(cherry picked from commit 45a572ebd8)
2017-10-17 11:04:17 +02:00
Torkel Ödegaard 689b8d79df ux: align alert and btn colors
(cherry picked from commit b86ae3f0e8)
2017-10-17 10:57:34 +02:00
Torkel Ödegaard b70c538633 fix: fixed color pickers that were broken in minified builds, fixes #9549
(cherry picked from commit 574afe8568)
2017-10-17 10:54:49 +02:00
Daniel Lee 769bc5df21 textpanel: fixes #9491
(cherry picked from commit 14241404ff)
2017-10-17 09:15:44 +02:00
Daniel Lee 4eb6d82254 csv: fix import for saveAs shim
After switch from systemjs to webpack, needed to import the
file-saver saveAs shim for it work. Fixes #9525

(cherry picked from commit f3ec139eab)
2017-10-17 09:14:45 +02:00
Daniel Lee 7935739eb3 plugins: expose more util and flot dependencies
Also, fix for coremodules export. Have to add the __esModule
attribute to fool SystemJS.

(cherry picked from commit eb4e71e2c6)
2017-10-17 09:13:58 +02:00
bergquist 7403fa0fa7 alert_tab: clear test result when testing rules
closes #9539

(cherry picked from commit 9de4d0fa6b)
2017-10-16 10:34:59 +02:00
Mitsuhiro Tanda 5ebfd1e5ab (cloudwatch) fix cloudwatch query error over 24h (#9536)
fix cloudwatch query error over 24h

(cherry picked from commit 7edc95cc35)

closes #9523
2017-10-16 08:32:13 +02:00
Mitsuhiro Tanda a1a8c0fc07 show error message when cloudwatch datasource can't add
(cherry picked from commit 40b11654fd)
2017-10-16 08:10:24 +02:00
bergquist 7069fed31d update packagecloud script for 4.6.0-beta1 2017-10-13 13:11:18 +02:00
bergquist 9d916fdad6 changelog: adds note about closing #9516 v4.6.0-beta1 2017-10-13 10:29:11 +02:00
bergquist ec14fa58b5 alerting: add count_non_null reducer
makes it possible to have a second condition requering
at least X points of data.
2017-10-13 09:47:10 +02:00
Carl Bergquist 8e4a7060ca Merge pull request #9515 from imweijh/patch-1
Update rpm.md
2017-10-13 08:54:19 +02:00
weijh d0ace0bc13 Update rpm.md
for error "The GPG keys listed for the "grafana" repository are already installed but they are not correct for this package."
2017-10-13 12:00:22 +08:00
Torkel Ödegaard 2992fb4b0e fix: can now remove annotation tags without popover closing 2017-10-12 16:24:32 +02:00
Alexander Zobnin 3b14bee559 tech: add backward compatibility for <spectrum-picker> directive (#9510) 2017-10-12 15:31:59 +02:00
Torkel Ödegaard e7b718ed7a fix: fixed links on new 404 page, fixes #9493 2017-10-12 15:31:41 +02:00
bergquist b5727949fd logging: dont use cli logger in http_server 2017-10-12 15:29:01 +02:00
bergquist 88f55b01d8 oauth: raise error if session state is missing
ref #9476
2017-10-12 15:25:27 +02:00
bergquist 0848ba2e9c oauth: provide more logging for failed oauth requests 2017-10-12 15:25:27 +02:00
bergquist 23c610015f prepare for 4.6.0-beta1 release 2017-10-12 15:25:27 +02:00
Torkel Ödegaard 2564dda2d0 docs: updated whats new article 2017-10-12 14:53:29 +02:00
Patrick O'Carroll 1334a9e138 docs: initial draft release v46 2017-10-12 13:55:27 +02:00
Daniel Lee 4bdc3a5829 graph: fix y-axis decimalTick check. Fixes #9405 2017-10-12 12:45:20 +02:00
Torkel Ödegaard a7068d835a Merge branch 'master' of github.com:grafana/grafana 2017-10-12 12:40:43 +02:00
Torkel Ödegaard c879cc7615 minor docs update 2017-10-12 12:40:37 +02:00
Torkel Ödegaard a90052dac3 docs: annotation docs update 2017-10-12 12:19:25 +02:00
bergquist 7548734510 changelog: adds note about closing #7104 2017-10-12 12:13:00 +02:00
bergquist a45bd400f1 changelog: adds note about closing #9373 2017-10-12 12:11:51 +02:00
Carl Bergquist b63725033e Merge pull request #9450 from utkarshcmu/kafka_alert
Kafka alerting
2017-10-12 12:11:13 +02:00
Carl Bergquist ee5f69beb4 metrics: disable gzip for /metrics endpoint (#9468)
Prometheus client lib support gzip by itself. Which caused the
response to be double gzipped sometimes. We should use the Grafana
middle ware instead.

closes #9464
2017-10-12 12:02:36 +02:00