public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,415 Commits 655 Branches 650 Tags
v4.6.0-beta2
Commit Graph
11415 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Patrick O'Carroll 5895f9dc89 Annotation docs (#9506) 
* added images to annotation docs

* added gifs and png to annotations, minor code formatting fix in alertlist
 2017-10-12 11:37:42 +02:00
Torkel Ödegaard 98f00f7e1f Update CHANGELOG.md 2017-10-12 11:35:47 +02:00
Daniel Lee 55d510a319 Update PLUGIN_DEV.md 2017-10-12 11:32:33 +02:00
Daniel Lee b38016e97f Update PLUGIN_DEV.md 2017-10-12 11:31:04 +02:00
Torkel Ödegaard 64d75db514 Update README.md 2017-10-12 11:30:01 +02:00
Carl Bergquist 9d53653647 Merge pull request #9378 from mattbostock/verify_tls 
Bugfix: Always verify TLS unless explicitly told otherwise
 2017-10-12 11:11:02 +02:00
Patrick O'Carroll 45704d4570 Fixed link issue in CHANGELOG 2017-10-12 10:56:24 +02:00
Torkel Ödegaard b81e01d1ec Create PLUGIN_DEV.md 
initial draft of plugin dev document
 2017-10-12 10:53:42 +02:00
bergquist 1f4df2b694 changelog: adds note about closing #9371,#5334,#8812 2017-10-12 10:44:40 +02:00
bergquist 4ca3cc90dd Merge branch 'mattbostock-verify_datasource_tls' 2017-10-12 10:39:07 +02:00
bergquist 79afd638bb ds_edit: placeholder should only be cert header 2017-10-12 10:38:45 +02:00
Patrick O'Carroll b76de790f9 fixed minor styling issus (#9497) 
* fixed minor styling issus

* fixed code formatting
 2017-10-12 10:33:42 +02:00
Torkel Ödegaard 81a4df1372 fix: alert api limit param did not work and caused SQL syntax error, fixes #9492 2017-10-12 10:22:53 +02:00
bergquist c0d257a0ee Merge branch 'verify_datasource_tls' of https://github.com/mattbostock/grafana into mattbostock-verify_datasource_tls 2017-10-12 10:15:32 +02:00
Alexander Zobnin 04ea7efac9 annotations: add endpoint for writing graphite-like events (#9495) 
* annotations: add endpoint for writing graphite-like events

* annotations: fix new line handling in tooltip

* annotations: support tags in prior to Graphite 0.10.0 format
 2017-10-12 10:12:15 +02:00