Commit Graph

4373 Commits

Author SHA1 Message Date
Carl Bergquist
ba074062d6 Merge pull request #9392 from xginn8/slack_image_upload
adding support for token-based slack file.upload API call for posting images to slack
2017-10-04 10:29:15 +02:00
Daniel Lee
3c1beb1bdd plugin_loader: expose app_events to plugins 2017-10-04 09:41:22 +02:00
Torkel Ödegaard
be3c5d1355 colorpicker: refactoring the new unififed colorpicker, #9347 2017-10-04 07:56:41 +02:00
Alexander Zobnin
2aae2556a5 Unified colorpicker (#9347)
* colorpicker: initial picker with predefined palette and spectrum

* colorpicker: highlight selected color

* colorpicker: add onChange() callback

* colorpicker: replace singlestat picker by new one

* colorpicker: style tweak

* colorpicker: parse color on input blur

* colorpicker: sort palette by hue and lightness

* colorpicker: refactor, move colors sorting to 'app/core/utils/colors'

* tech: colorpicker - fix linter errors

* colorpicker: convert to React components

* colorpicker: fix spectrum import after moving to webpack

* colorpicker: minor refactor

* colorpicker: initial series color picker

* colorpicker: fix tests error
2017-10-04 07:15:23 +02:00
Dan Cech
7859d4ffca fix missing column headers in excel export (#9413) 2017-10-04 07:04:10 +02:00
Torkel Ödegaard
0831238420 build: fixed broken elastic unit test 2017-10-03 19:38:52 +02:00
Torkel Ödegaard
a1b543aa35 shore: cleanup unused stuff in common.d.ts 2017-10-03 18:27:25 +02:00
Patrick O'Carroll
50e2f7e366 Checkbox fixes (#9400)
* fixing checkboxes

* deleted old file, fixed checkboxes

* minor change
2017-10-03 13:23:05 +02:00
Torkel Ödegaard
3dac77468b fix: ensure panel.datasource is null as default 2017-10-03 12:18:22 +02:00
Torkel Ödegaard
4c4564b138 plugibs: expose more to plugins 2017-10-03 11:02:40 +02:00
Torkel Ödegaard
4cc878b56d build: fixed build 2017-10-02 17:10:23 +02:00
Torkel Ödegaard
a02cac2126 refactoring: minor refactoring of PR #8916 2017-10-02 16:45:25 +02:00
Torkel Ödegaard
42a0e9ebdf Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2 2017-10-02 16:20:23 +02:00
Torkel Ödegaard
03a88206a3 Merge branch 'master' of github.com:grafana/grafana 2017-10-02 15:30:14 +02:00
bergquist
cb0ded069a playlist: play and edit should use same width 2017-10-02 09:58:58 +02:00
Torkel Ödegaard
1dea7dab2a shore: fixed html indentation, #9368 2017-10-02 08:51:45 +02:00
Torkel Ödegaard
a22dded6fa Merge branch 'update-alert-lists' of https://github.com/Ijin08/grafana into Ijin08-update-alert-lists 2017-10-02 08:43:56 +02:00
Torkel Ödegaard
fea741d7c2 shore: minor cleanup 2017-10-01 20:35:01 +02:00
Torkel Ödegaard
0c86241c5b Webpack (#9391)
* webpack poc, this is not going to work for plugins, dam

* tech: webpack and systemjs for plugins starting to work

* tech: webpack and systemjs combo starting to work

* tech: webpack + karma tests progress

* tech: webpack + karma progress

* tech: working on tests

* tech: webpack

* tech: webpack + karma, all tests pass

* tech: webpack + karma, all tests pass

* tech: webpack all tests pass

* webpack: getting closer

* tech: webpack progress

* webpack: further build refinements

* webpack: ng annotate fixes

* webpack: optimized build fix

* tech: minor fix for elasticsearch

* tech: webpack + ace editor

* tech: restored lodash move mixin compatability

* tech: added enzyme react test and upgraded to react v16

* tech: package version fix

* tech: added testdata to built in bundle

* webpack: sass progress

* tech: prod & dev build is working for the sass

* tech: clean up unused grunt stuff and moved to scripts folder

* tech: added vendor and manifest chunks, updated readme and docs

* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Matthew McGinn
00726e93eb adding support for token-based slack file.upload API call for posting images to slack 2017-09-30 21:20:20 -04:00
Carl Bergquist
cabb21317f Merge pull request #8050 from mtanda/cloudwatch_alert
(cloudwatch) alerting
2017-09-29 13:36:36 +02:00
Carl Bergquist
7d2b989459 Merge pull request #9386 from shanhuhai5739/master
add diff and pdiff for conditions
2017-09-29 13:16:03 +02:00
coral
68ed4d45fa change pdiff to percent_diff for conditions 2017-09-29 18:14:17 +08:00
Daniel Lee
992cc1b680 panel: rename label on csv export modal 2017-09-29 11:32:13 +02:00
coral
9e48d54465 add diff and pdiff for conditions 2017-09-29 17:20:02 +08:00
Mitsuhiro Tanda
5850ae51b1 fix, add targetContainsTemplate() 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
468e8c13ee move extend statistics handling code to backend 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
e1fe15e094 fix annotation query 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
bf5268c0b4 fix time 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
d98d8a404f fix dimension convertion 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
c140d7aa06 re-implement annotation query 2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
8243ac39c2 fix parameter format 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
4b34ff5b83 refactor cloudwatch frontend code 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
e4de6332de refactor cloudwatch frontend code 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
ea704306a0 fix test 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
1dcc51adce re-implement dimension_values() 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
78e3556e95 remove performEC2DescribeInstances() 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
8fba6dcb0d re-implement ec2_instance_attribute() 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
cf23734d7d re-implement ebs_volume_ids() 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
01d2aa8af0 fix test 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
fe3d3bc384 porting other suggestion 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
feed90c0e2 re-implement get regions 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
62d84c1e14 (cloudwatch) move query parameter to 'parameters' 2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
83b79dd624 fix test 2017-09-29 13:44:00 +09:00
Mitsuhiro Tanda
728e96e134 fix invalid query filter 2017-09-29 13:44:00 +09:00
Mitsuhiro Tanda
39607d09d7 (cloudwatch) alerting 2017-09-29 13:44:00 +09:00
Yago Nobre
9c026a8e04 add brazil currency 2017-09-28 14:18:14 -03:00
Torkel Ödegaard
73295ab3ed tech: upgrade of systemjs to 0.20.x working 2017-09-28 14:08:59 +02:00
Torkel Ödegaard
9bfda72a55 tech: reverted to systemjs 2017-09-28 13:06:23 +02:00
Torkel Ödegaard
7aa753a25f tech: migrating elasticsearch to typescript 2017-09-28 12:52:39 +02:00