Torkel Ödegaard
|
2d722e26de
|
fix(cloudwatch): fixed test datasource, broken due to some function name changes
|
2015-10-06 14:08:48 +02:00 |
|
Torkel Ödegaard
|
182e079d25
|
Merge branch 'master' into cloudwatch
|
2015-10-06 14:08:10 +02:00 |
|
Torkel Ödegaard
|
318af9b418
|
small docs structure change, moved build from source into install section and CLA into project, and about into project
|
2015-10-06 10:38:19 +02:00 |
|
Torkel Ödegaard
|
0bcda4a2eb
|
minor elasticsearch fix
|
2015-10-05 11:17:53 +02:00 |
|
Torkel Ödegaard
|
3d52095765
|
feat(cloudwatch): restored dimension keys lookup
|
2015-10-02 20:25:28 +02:00 |
|
Torkel Ödegaard
|
0912cec0e5
|
feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684
|
2015-10-02 11:54:35 +02:00 |
|
Torkel Ödegaard
|
180ba33ac8
|
feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684
|
2015-10-02 11:10:21 +02:00 |
|
Torkel Ödegaard
|
04f4454974
|
feat(cloudwatch): lots of code refactoring and cleanup, #684, dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value
|
2015-10-02 09:04:46 +02:00 |
|
Torkel Ödegaard
|
91285baea5
|
feat(cloudwatch): fixed failing unit tests
|
2015-10-02 07:32:21 +02:00 |
|
Torkel Ödegaard
|
875d80aa72
|
feat(cloudwatch): refactoring cloudwatch datasource code, #684
|
2015-10-02 07:25:54 +02:00 |
|
Torkel Ödegaard
|
bddcc6491a
|
Merge pull request #2870 from ctdk/strip-format
Add config option to strip (most) colors from console logs
|
2015-10-01 22:31:21 +02:00 |
|
ctdk
|
d37e18fdcf
|
Add config option to strip (most) colors from console logs
|
2015-10-01 13:16:23 -07:00 |
|
Torkel Ödegaard
|
af8d12124a
|
feat(cloudwatch): code refactoring and cleanup, trying to rewrite so the code uses promises instead of ccallbacks, #684
|
2015-10-01 21:20:52 +02:00 |
|
Torkel Ödegaard
|
205d4232b9
|
feat(cloudwatch): only support proxy mode, can remove frontend aws-sdk lib
|
2015-10-01 17:38:55 +02:00 |
|
Torkel Ödegaard
|
3c6a06a327
|
feat(cloudwatch): moved specs into plugins dir
|
2015-10-01 17:00:41 +02:00 |
|
Torkel Ödegaard
|
057b533a39
|
Merge branch 'master' into cloudwatch
|
2015-10-01 16:46:59 +02:00 |
|
Torkel Ödegaard
|
b774b91b92
|
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
Conflicts:
public/test/specs/cloudwatch-datasource-specs.js
|
2015-10-01 16:41:54 +02:00 |
|
Torkel Ödegaard
|
7dc923a292
|
fix(timepicker): fixed displaying of customk time ranges, #2861
|
2015-10-01 16:36:38 +02:00 |
|
Torkel Ödegaard
|
f0f791d226
|
Merge pull request #2859 from tmonk42/graphite_multiplySeries
add graphite multiplySeries function
|
2015-10-01 08:39:22 +02:00 |
|
Haneysmith, Nathan
|
7ca261e33e
|
add graphite multiplySeries function
|
2015-09-30 11:18:47 -07:00 |
|
Torkel Ödegaard
|
42e7a70d99
|
Merge pull request #2845 from sbouchex/master
Missing carriage return in init script when displaying usage
|
2015-09-29 16:43:52 +02:00 |
|
sbouchex
|
6c1adf9187
|
Missing carriage return when displaying usage
|
2015-09-29 16:06:40 +02:00 |
|
Torkel Ödegaard
|
81a660eae4
|
fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows
|
2015-09-29 15:36:13 +02:00 |
|
Torkel Ödegaard
|
8b029388a5
|
Merge branch 'phantomjs' of https://github.com/fg2it/grafana into fg2it-phantomjs
|
2015-09-29 15:22:37 +02:00 |
|
Torkel Ödegaard
|
c816ed2527
|
feat(usage stats): added data source count stats
|
2015-09-29 13:47:56 +02:00 |
|
Mitsuhiro Tanda
|
be6cb24e10
|
fix cloudwatch test
|
2015-09-29 13:26:04 +09:00 |
|
Mitsuhiro Tanda
|
1a63d9eb3b
|
reactivate cloudwatch test
|
2015-09-29 12:37:34 +09:00 |
|
Torkel Ödegaard
|
8a39b32b5c
|
refactor: moved elasticsearch specs to plugin folder and to typescript
|
2015-09-28 16:28:19 +02:00 |
|
Torkel Ödegaard
|
7d2646f60a
|
refactor: moved influxdb specs to plugins folder
|
2015-09-28 15:51:02 +02:00 |
|
Torkel Ödegaard
|
1a8bc1dd60
|
fix(dashbard save as): fixed wonky behavior in save as modal, cursor to the end randomly, fixes #2837
|
2015-09-28 15:26:56 +02:00 |
|
Torkel Ödegaard
|
7e434fc019
|
refactor: moved graphite specs into plugins directory
|
2015-09-28 15:23:53 +02:00 |
|
Torkel Ödegaard
|
49d57cf596
|
feat(cloudwatch): uncommented tests, but they do not seemt to execute
|
2015-09-28 14:16:03 +02:00 |
|
Torkel Ödegaard
|
8dfbc55851
|
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
|
2015-09-28 13:44:30 +02:00 |
|
Torkel Ödegaard
|
3cbfe21b2c
|
Merge branch 'master' into cloudwatch
|
2015-09-28 13:43:03 +02:00 |
|
Torkel Ödegaard
|
cb7424ce5e
|
fix(playlist ui): minor polish / fix to playlist ui, fixes #2831, other minor css / markup fixes
|
2015-09-28 11:53:49 +02:00 |
|
Torkel Ödegaard
|
a567939f78
|
fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828
|
2015-09-28 11:28:08 +02:00 |
|
Torkel Ödegaard
|
a3748d4b97
|
fix(singestat): fixed missing sparklines, caused by recent changes to time range handling, fixes #2815
|
2015-09-28 09:28:43 +09:00 |
|
Torkel Ödegaard
|
b80dc92ca5
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-09-27 12:09:45 +02:00 |
|
Torkel Ödegaard
|
57dee76c88
|
feat(elasticsearch): templating terms query should have size set to zero to return all terms, fixes #2827
|
2015-09-27 12:09:12 +02:00 |
|
fg2it
|
2513639499
|
fix for relative path
|
2015-09-26 11:38:37 +02:00 |
|
Mitsuhiro Tanda
|
9ae6ac25f5
|
refactor dataproxy_cloudwatch
|
2015-09-26 02:33:53 +09:00 |
|
Mitsuhiro Tanda
|
01ec8d0bcb
|
fix cloudwatch time error
|
2015-09-26 02:33:52 +09:00 |
|
Mitsuhiro Tanda
|
d09e8a12b4
|
fix jshint error
|
2015-09-26 02:33:52 +09:00 |
|
Mitsuhiro Tanda
|
5dd64b97d2
|
refactor
|
2015-09-26 02:33:52 +09:00 |
|
Mitsuhiro Tanda
|
9600b1f103
|
add ebs_volume_ids() for templating
|
2015-09-26 02:33:51 +09:00 |
|
Mitsuhiro Tanda
|
ca9861e749
|
fix cloudwatch config editor
|
2015-09-26 02:33:51 +09:00 |
|
Torkel Ödegaard
|
38bf07f4da
|
Merge pull request #2817 from utkarshcmu/axes
Single stat panel throws warning on multiple series result.
|
2015-09-25 10:23:10 +02:00 |
|
fg2it
|
189796891e
|
adding phantomjs task to default and build
|
2015-09-25 01:19:49 +02:00 |
|
fg2it
|
8134905a86
|
new grunt task for setting phantomjs binary
|
2015-09-25 00:56:56 +02:00 |
|
fg2it
|
45fb760a35
|
removing default phantomjs binary
|
2015-09-25 00:51:54 +02:00 |
|