Torkel Ödegaard
4cc878b56d
build: fixed build
2017-10-02 17:10:23 +02:00
Torkel Ödegaard
fa79be1f2d
Merge branch 'ctide-day_rounding2'
2017-10-02 16:45:44 +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
d4e5a7d3f0
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:50 +02:00
Torkel Ödegaard
503336bcd5
docs: minor docs fix
2017-10-02 15:30:37 +02:00
Torkel Ödegaard
03a88206a3
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:14 +02:00
Torkel Ödegaard
ae14655749
plugins: expose datemath to plugins as well, fixes zabbix plugin
2017-10-02 13:39:39 +02:00
Torkel Ödegaard
c338d8250b
build: minor webpack fix
2017-10-02 13:15:28 +02:00
Patrick O'Carroll
bd348e16bb
redesigned dashboard links settingd, fixed a misspelling in rows and added fixed width to buttons ( #9397 )
2017-10-02 13:04:48 +02:00
Torkel Ödegaard
010a29a42d
Merge branches 'master' and 'master' of github.com:grafana/grafana
2017-10-02 10:56:12 +02:00
Torkel Ödegaard
38ae460f59
docs: updated building from source docs
2017-10-02 10:55:56 +02:00
bergquist
cb0ded069a
playlist: play and edit should use same width
2017-10-02 09:58:58 +02:00
Torkel Ödegaard
f5e8a4069c
docs: minor fixes for #9369
2017-10-02 09:02: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
6bc6911293
tech: updated yarn.lock
2017-10-02 08:24: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
bergquist
f6cc741a6d
changelog: adds note about closing #8479
2017-09-29 15:43:30 +02:00
Carl Bergquist
8a7f87b752
Merge pull request #9311 from ctrlok/ctrlok/pagerdutyinfo
...
Include triggering metrics to pagerduty alerts (pretty print)
2017-09-29 15:40:49 +02:00
bergquist
46cc1464c4
changelog: adds note about closing #8050
2017-09-29 13:40:07 +02:00
Carl Bergquist
cabb21317f
Merge pull request #8050 from mtanda/cloudwatch_alert
...
(cloudwatch) alerting
2017-09-29 13:36:36 +02:00
bergquist
a8006ada1e
changelog: adds note about closing #9386
2017-09-29 13:30:38 +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
Carl Bergquist
dd56c4b94b
Merge pull request #9382 from yagonobre/master
...
add brazil currency
2017-09-29 10:30:22 +02:00
Mitsuhiro Tanda
5850ae51b1
fix, add targetContainsTemplate()
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
8d6513a564
fix cloudwatch alert bug
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
5e88177f28
add debug log
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
6c375ed2cb
fix assume role
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
f3a2dc7c5f
improve cloudwatch tsdb
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
a21f53cf82
refactor cloudwatch code
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
59cdd4d8d2
remove obsolete code
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
fe9fca381c
move cloudwatch crendential related code
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
4f5f38f41b
remove old handler
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
8f3b060946
fix parameter format
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
17445e0c98
fix alert feature
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
8243ac39c2
fix parameter format
2017-09-29 13:44:01 +09:00
bergquist
fe1d395d79
refactor cloudwatch to support new tsdb interface
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
