Julius Volz
|
3cc69112c1
|
Fix "Link to Prometheus" button for proxied Prometheus sources.
|
2015-10-01 18:23:29 +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
|
228aac2d48
|
Merge pull request #2857 from jimmidyson/prometheus-datasource
Prometheus fixes
|
2015-09-30 18:33:55 +02:00 |
|
Mitsuhiro Tanda
|
d0b744387b
|
fix unmatched tag
|
2015-10-01 01:33:13 +09:00 |
|
Jimmi Dyson
|
7cadb9012a
|
Switch to png image
|
2015-09-30 16:45:38 +01:00 |
|
Jimmi Dyson
|
0c222c4e8c
|
Fix Prometheus test connection
|
2015-09-30 16:44:24 +01:00 |
|
Torkel Ödegaard
|
73516c0c97
|
Merge pull request #2856 from jimmidyson/prometheus-datasource
Further Prometheus unit tests
|
2015-09-30 16:59:45 +02:00 |
|
Jimmi Dyson
|
b90e4057ba
|
Convert prometheus specs to typescript
|
2015-09-30 15:52:15 +01:00 |
|
Jimmi Dyson
|
67f253830f
|
Add Prometheus metricFindQuery unit tests
|
2015-09-30 14:20:58 +01:00 |
|
Jimmi Dyson
|
59dbe45784
|
Fix typo in docs
|
2015-09-30 14:20:58 +01:00 |
|
Torkel Ödegaard
|
84615ad299
|
Merge pull request #2855 from jimmidyson/prometheus-datasource
Prometheus docs & better template queries
|
2015-09-30 13:50:11 +02:00 |
|
Jimmi Dyson
|
2e291d73aa
|
jshint fixes
|
2015-09-30 12:46:44 +01:00 |
|
Jimmi Dyson
|
055efa3904
|
Add prometheus docs
|
2015-09-30 12:42:48 +01:00 |
|
Jimmi Dyson
|
daee7970f3
|
Add label_values query to get labels on a particular metric
|
2015-09-30 12:29:53 +01:00 |
|
Torkel Ödegaard
|
2f55c18d56
|
Merge pull request #2847 from jimmidyson/prometheus-datasource
Add Prometheus datasource
|
2015-09-29 18:23:12 +02:00 |
|
Jimmi Dyson
|
cf0748895e
|
Prometheus template params fixes
|
2015-09-29 17:07:11 +01:00 |
|
Jimmi Dyson
|
6e66b8a0fa
|
Add prometheus datasource
|
2015-09-29 17:07:11 +01: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 |
|
Torkel Ödegaard
|
ee85eb2779
|
Updated prometheus config
|
2015-09-29 16:22:41 +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 |
|
Torkel Ödegaard
|
866ea7f942
|
added prometheus docker block
|
2015-09-29 08:16:26 +02:00 |
|
Torkel Ödegaard
|
d9d3da4def
|
Merge branch 'prometheus-datasource' of https://github.com/jimmidyson/grafana into prometheus
|
2015-09-29 08:06:16 +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 |
|
Jimmi Dyson
|
bf98cfeadc
|
Add prometheus datasource
|
2015-09-28 23:15:33 +01: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 |
|