Torkel Ödegaard
3bb20dbf2e
feat(plugins): changed plugin schema, pluginType -> type, type -> id
2016-01-08 23:15:44 +01:00
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
Byron
40845578c6
Fix elasticsearch hourly indexes
2016-01-07 14:39:20 -08:00
Mitsuhiro Tanda
ebf0bd5fc9
fix end time of Prometheus link
2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda
be48caf59f
fix Prometheus link, expand template variable in expression
2015-12-31 16:05:04 +09:00
Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Torkel Ödegaard
f074c1eaff
refactor(lodash): changed how lodash is referenced from typescript
2015-12-22 13:59:11 +01:00
Torkel Ödegaard
c19a2e5b45
fix(influxdb): systemjs fix
2015-12-21 16:48:12 +01:00
Torkel Ödegaard
dabd680d6b
tech(systemjs): merged sync with master, all tests are passing
2015-12-21 16:13:24 +01:00
Torkel Ödegaard
4522b02925
tech(systemjs): almost all tests are passing
2015-12-21 16:00:58 +01:00
Torkel Ödegaard
0dd7fb7361
tech(systemjs): most things work
2015-12-18 10:28:00 +01:00
Torkel Ödegaard
a7d7f31e76
Merge branch 'master' of github.com:grafana/grafana
2015-12-17 10:13:40 +01:00
Torkel Ödegaard
16847fdb41
feat(elasticsearch): trim edges, minor refactoring of #3541
2015-12-17 10:13:23 +01:00
carl bergquist
80d757b371
feat(elasticsearch): move default query parameters to new table
2015-12-17 10:00:53 +01:00
carl bergquist
5bdf0cd136
Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval
...
Conflicts:
public/app/plugins/datasource/elasticsearch/partials/config.html
2015-12-17 09:53:02 +01:00
carl bergquist
e498503428
fix(elastic): fixed typo
2015-12-17 09:05:01 +01:00
Carl Bergquist
ef46b23250
Merge pull request #3133 from tdyas/add_pencil_to_graphite_ds
...
add pencil icon back to graphite data source
2015-12-17 08:48:03 +01:00
carl bergquist
39ccf1526f
Merge branch 'addshore-graphiteSortByNameNatural'
2015-12-17 07:21:43 +01:00
carl bergquist
12889a9509
feat(graphite): make sortByName optional
...
fixes #3360
closes #3361
2015-12-17 07:17:39 +01:00
Carl Bergquist
e320bd025f
Revert "(cloudwatch) add "Divide Sum By Period" option"
2015-12-16 14:35:04 +01:00
Carl Bergquist
d465c445fc
Merge pull request #3445 from mtanda/cloudwatch_sum_period
...
(cloudwatch) add "Divide Sum By Period" option
2015-12-16 14:07:52 +01:00
carl bergquist
dc30b9d37b
feat(elastic): change concept to trim edges instead.
2015-12-16 13:50:56 +01:00
carl bergquist
37cfe2a3cb
feat(elastic): shorten expression to target input
2015-12-16 13:29:54 +01:00
carl bergquist
26abce647d
feat(elastic): isolate drop first and last logic
2015-12-16 13:27:35 +01:00
Torkel Ödegaard
ca84ef38f8
angular2 test
2015-12-16 12:21:13 +01:00
carl bergquist
d882af9f94
Merge branch 'es_drop_first_last' of https://github.com/Qtax/grafana into Qtax-es_drop_first_last
2015-12-16 09:48:14 +01:00
carl bergquist
48539c851e
feat(graphite): adds support for grep function
...
closes #1163
2015-12-16 09:45:28 +01:00
Mitsuhiro Tanda
c7ba60162b
(cloudwatch) add Divide By Sum option
2015-12-16 17:23:13 +09:00
Mitsuhiro Tanda
e44ef7f823
fix cloudwatch query editor
2015-12-16 17:01:58 +09:00
Torkel Ödegaard
7ee290cc57
tech(systemjs): systemjs and jspm work
2015-12-15 17:56:16 +01:00
Torkel Ödegaard
f1b897b3de
change(cloudwatch): minor change to editor
2015-12-15 13:57:20 +01:00
Carl Bergquist
25d93d1041
Merge pull request #3066 from mtanda/cloudwatch_annotation
...
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
Torkel Ödegaard
e28c9b3309
cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via as plugin via its own plugin repo, https://github.com/grafana/datasource-plugin-kairosdb , closes #3524
2015-12-15 11:35:39 +01:00
Torkel Ödegaard
5335a6b636
Merge branch 'master' of github.com:grafana/grafana
2015-12-15 11:21:17 +01:00
Torkel Ödegaard
f83d5f4280
cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08 , closes #3523
2015-12-15 11:21:00 +01:00
carl bergquist
28ec6b4d60
feat(graphite): add optional parameter for perSecond
...
closes #966
2015-12-15 11:10:13 +01:00
Torkel Ödegaard
f163ceffd0
fix(elasticsearch): fixes spelling of lucene, #3519
2015-12-15 08:29:24 +01:00
Mitsuhiro Tanda
31de9faaf2
fix test
2015-12-15 11:32:24 +09:00
Mitsuhiro Tanda
d302c82c82
share cloudwatch query editor
2015-12-15 11:32:23 +09:00
Mitsuhiro Tanda
e22e20fa9d
fix cloudwatch annotation, reflect API change
2015-12-15 11:25:18 +09:00
Mitsuhiro Tanda
79c8556927
style change annotation editor
2015-12-15 11:25:18 +09:00
Mitsuhiro Tanda
7d16307db4
parse string date format
2015-12-15 11:25:17 +09:00
Mitsuhiro Tanda
1626982a3a
add CloudWatch Annotation
2015-12-15 11:25:16 +09:00
Qtax
bf41eb824d
Added ES histogram setting to drop/ignore the first and last datapoints
2015-12-14 19:58:08 +01:00
Torkel Ödegaard
38f4cfb7a2
Merge branch 'v2.6.x'
2015-12-14 18:51:09 +01:00
Torkel Ödegaard
aca9d3965d
feat(elasticsearch): added unit option to derivative metric, closes #3512
2015-12-14 18:49:53 +01:00
Torkel Ödegaard
79d56f779d
fix(graphite): minor fix to graphite query editor so it does not issue render requests for incomplete queries, fixes #3510
2015-12-14 18:33:44 +01:00
carl bergquist
f5eb54e595
feat(elasticsearch): only show pipeline agg for es version >= 2
2015-12-14 15:08:34 +01:00
carl bergquist
bc2bc1f2ac
Merge branch 'graphiteSortByNameNatural' of https://github.com/addshore/grafana into addshore-graphiteSortByNameNatural
2015-12-14 10:37:44 +01:00
Torkel Ödegaard
10f66fa78f
feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500
2015-12-11 18:20:53 +01:00
Carl Bergquist
55fab0493d
Merge pull request #3393 from pepl/master
...
Fixed spelling error
2015-12-11 16:12:19 +01:00
Torkel Ödegaard
023fa2b2cc
fix(influxdb): minor fix to new editor, there were 5min as a selectable option in derivative function
2015-12-11 14:39:59 +01:00
Torkel Ödegaard
7e9963ae05
fix(elasticsearch): minor markup fix
2015-12-11 12:51:39 +01:00
Torkel Ödegaard
9f294e3565
feat(elasticsearch): completed initial implementation of moving average and derivative pipleline aggregations, closes #3451
2015-12-11 12:41:40 +01:00
carl bergquist
141f22bedf
feat(elasticsearch): display more info in options
2015-12-11 09:44:37 +01:00
carl bergquist
4fa92198a0
feat(elasticsearch): add support for model setting
2015-12-11 09:19:05 +01:00
carl bergquist
662430d5db
feat(elasticsearch): adds last class for derivatives
2015-12-11 09:14:40 +01:00
carl bergquist
139b19f9ac
feat(elasticsearch): make series naming generic for pipeline aggs
2015-12-10 17:42:31 +01:00
carl bergquist
6e50e2412e
feat(elasticsearch): remove pipeline aggs as possible sources
2015-12-10 17:18:22 +01:00
carl bergquist
005e14a060
refactor(elasticsearch): mavg naming -> pipeline agg
2015-12-10 17:12:52 +01:00
carl bergquist
c8c9e0a7e7
feat(elasticsearch): improve pipeline aggs structure
2015-12-10 17:05:23 +01:00
carl bergquist
0f65cb2b79
feat(elasticsearch): update pipeline aggs if type change
...
make it possible to switch between different pipeline
aggregates without causing problms in the ui
2015-12-10 17:01:29 +01:00
Carl Bergquist
85094fc74d
feat(elasticsearch): add pipeline settings
2015-12-10 13:34:49 +01:00
Carl Bergquist
2d2ad8b237
show pipeline agg source for derivative
2015-12-10 13:06:46 +01:00
Torkel Ödegaard
1bb0530c69
feat(elasticsearch): metric options alignement
2015-12-10 12:15:11 +01:00
Torkel Ödegaard
b36f644628
feat(elasticsearch): added pipleline aggregation derivative
2015-12-10 11:46:19 +01:00
Torkel Ödegaard
2dee9c8d74
Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support
2015-12-10 11:19:39 +01:00
Carl Bergquist
9c6eb7736f
move pipeline options outside main switch
2015-12-10 11:17:14 +01:00
Carl Bergquist
e86dfcf55c
rename mavgoptions to more generic pipelineaggs
2015-12-10 10:43:00 +01:00
Torkel Ödegaard
d6311aefb7
Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support
2015-12-09 16:46:29 +01:00
carl bergquist
8e18f2c5d2
refactor es pipeline aggregation variables to match ES
2015-12-09 16:25:05 +01:00
carl bergquist
0644bfe27c
improves timeseries naming for moving average series
2015-12-09 14:58:26 +01:00
carl bergquist
0b285845d1
adds spec for query builder
2015-12-09 14:21:48 +01:00
carl bergquist
d3ff4bf75e
changes to using an array for mavg options
2015-12-09 13:55:06 +01:00
carl bergquist
f51d74fa68
change the way options are added
2015-12-09 09:47:56 +01:00
carl bergquist
78c6ce842e
revert elastic response parser
2015-12-09 09:10:50 +01:00
carl bergquist
ad79df9b74
changes implementation direction
...
moving average will now be based on another metric
instead of having moving average on itself
2015-12-09 09:04:48 +01:00
carl bergquist
b4763290de
move target extraction logic to query def
2015-12-09 09:00:06 +01:00
Mitsuhiro Tanda
8264c76642
add separate datasource parameter withCredentials
2015-12-09 14:44:28 +09:00
Carl Bergquist
dd7a13930f
adds null check for response parser
2015-12-08 18:04:30 +01:00
Carl Bergquist
8ad10149ab
adds basic support for moving avg in es queries
2015-12-08 18:04:30 +01:00
Carl Bergquist
0731064375
adds support for moving avg support in es queries
2015-12-08 18:04:30 +01:00
Torkel Ödegaard
45c69fa638
fix(influxdb): fixed issue where Group By label was only showed on first query, fixes #3453
2015-12-08 16:40:41 +01:00
utkarshcmu
005271d24b
Fixed missing closing tag
2015-12-07 05:41:18 -08:00
Mitsuhiro Tanda
217d5df276
(cloudwatch) fix period overwrite
2015-12-07 13:40:54 +09:00
Torkel Ödegaard
ce58486850
fix(html): removed unneeded tag
2015-12-05 14:22:39 +01:00
Mitsuhiro Tanda
573632012e
cloudwatch dimension null check
2015-12-04 20:16:31 +09:00
Torkel Ödegaard
2345b41a74
feat(elasticsearch): added min_doc_count option for date histogram, closes #3416
2015-12-04 10:06:44 +01:00
Torkel Ödegaard
141e395489
polish(influxdb): minor improvements to influxdb editor raw query editor
2015-12-04 09:20:29 +01:00
Torkel Ödegaard
db9c288050
fix(elasticsearch): refactoring of #3321
2015-12-03 18:30:36 +01:00
Torkel Ödegaard
f1cb8f2f25
Merge branch 'keep_es_version' of https://github.com/replay/grafana into replay-keep_es_version
2015-12-03 18:08:26 +01:00
Torkel Ödegaard
7ec2c09249
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 18:05:19 +01:00
Torkel Ödegaard
354bfcea15
Merge branch 'master' of https://github.com/skbkontur/grafana
2015-12-03 18:03:55 +01:00
Torkel Ödegaard
891d7c134c
Merge pull request #3205 from mtanda/cloudwatch_suggest_fix
...
(cloudwatch) fix dimension value suggestion
2015-12-03 17:17:07 +01:00
Mitsuhiro Tanda
154d70e4e2
remove dimensionPart
2015-12-04 01:02:25 +09:00
Torkel Ödegaard
419251ed35
fix(elasticsearch): fixed issue with default state of elasticsearch query, result in error before query controller could set defaults, moved defaults to query builder, also removed raw query mode as it is pretty broken, fixes #3396
2015-12-03 16:32:35 +01:00
Torkel Ödegaard
cf1f43dc9d
feat(influxdb): support for table queries, closes #3409 , #3219
2015-12-03 15:09:39 +01:00
Alexey Larkov
d6935847b4
Web. Fix double slash
2015-12-03 17:36:29 +05:00
Michael Kröll
1bb1ddcd29
Fixed spelling error
2015-12-02 11:14:28 +01:00
Torkel Ödegaard
93f3e30cac
fix(log): removed logging accidentlally checked in
2015-12-01 09:19:22 +01:00
Torkel Ödegaard
6eeddaa564
Merge pull request #3369 from matschaffer/cw/alias-fix
...
Use of `<dimension name>` seems to confuse angular so changing to DIMENSION_NAME
2015-11-30 17:28:41 +01:00
Torkel Ödegaard
98f7febed1
feat(influxdb): added all functions
2015-11-30 16:28:56 +01:00
Torkel Ödegaard
4f04eaec3a
feat(influxdb): moved query builder tests
2015-11-30 15:27:38 +01:00
Torkel Ödegaard
5a2b9b1f44
feat(influxdb): worked on schema upgrade for new influx query editor
2015-11-30 15:09:18 +01:00
Torkel Ödegaard
721b37a08e
feat(influxdb): new editor now supports field and tag lookup again
2015-11-30 10:14:42 +01:00
Torkel Ödegaard
b3d494d4c8
feat(influxdb): minor fixes to new editor
2015-11-30 08:40:11 +01:00
Mat Schaffer
85ec70e92b
Use of <dimension name> seems to confuse angular so changing to DIMENSION_NAME
2015-11-30 15:55:07 +09:00
addshore
b38dc70c71
Add graphtie sortByName natural param
...
Introduced in graphite 0.9.15
Fixes #3360
2015-11-28 00:16:42 +01:00
Torkel Ödegaard
72d9fcdcb4
feat(influxdb): progress with new influxdb editor
2015-11-27 16:35:40 +01:00
Torkel Ödegaard
f00320c8b9
feat(influxdb): query editor is starting to work, can now add group by parts
2015-11-25 14:27:22 +01:00
Torkel Ödegaard
5ba19144d5
feat(influxdb): more work on query editor
2015-11-25 12:30:56 +01:00
Torkel Ödegaard
c9ba856c52
feat(influxdb): more work on influxdb editor
2015-11-25 10:22:20 +01:00
Mauro Stettler
a30ceefa6b
add tests for elastic search versioning in query builder and make es version 2 default
2015-11-25 16:23:28 +09:00
Torkel Ödegaard
31e2a8b8e9
feat(influxdb): more work onnew influxdb editor
2015-11-24 17:01:18 +01:00
Torkel Ödegaard
9b4150509c
feat(influxdb): minor progress on new editor
2015-11-24 11:02:49 +01:00
Torkel Ödegaard
c68cd7d19a
Merge branch 'master' into influxdb_editor_v3
2015-11-24 10:06:06 +01:00
Joakim Lahtinen
9c0141e84e
Fixed some broken HTML.
...
Simplified some control flow.
2015-11-24 07:29:52 +01:00
Torkel Ödegaard
a1afd2328d
fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241
2015-11-23 14:19:10 +01:00
Mauro Stettler
ada9bfcae8
keep track of elastic search version and generate query according to version
2015-11-22 21:39:56 +09:00
Torkel Ödegaard
396f53d20e
fix(tests): removed it.only accidentally cecked in
2015-11-21 13:48:12 +01:00
Torkel Ödegaard
9d1906d333
fix(elasticsearch): fixed issue with disabling (hiding) query, fixes #3300
2015-11-21 10:22:59 +01:00
Torkel Ödegaard
4751e4b94e
feat(elasticsearch): a lot of work to support aggregation queries without date_histogram, queries that return metric aggregations now work with the table panel (json data type), #3219
2015-11-20 16:26:44 +01:00
Torkel Ödegaard
93977316ce
revert #3288 for now since it breaks Elasticsearch 1.7
2015-11-20 10:48:10 +01:00
Torkel Ödegaard
7e49bdf5a8
revert #3288 for now since it breaks Elasticsearch 1.7
2015-11-20 10:45:48 +01:00
Torkel Ödegaard
5ec448861d
Merge pull request #3284 from mtanda/prometheus_null_point
...
(prometheus) support null point mode
2015-11-20 08:27:36 +01:00
Torkel Ödegaard
7d4326a397
Merge pull request #3292 from mtanda/cloudwatch_null_pointmode
...
(cloudwatch) fix null point mode
2015-11-20 08:24:51 +01:00
Mitsuhiro Tanda
a1fcd3c5b6
import fix step calibration
2015-11-20 15:37:31 +09:00
John McFarlane
c4048f8f22
[prometheus] Fix step calibration
...
The step interval is (correctly) being converted to seconds, but the
unit of measure suffixed onto the end is preventing the subsequent
step calibration. Because the query upstream defaults to seconds as
the unit of measure, the suffix can simply be removed and everything
works as intended.
patchset 01: Also fix the spec.
2015-11-19 21:20:07 -08:00
Mitsuhiro Tanda
15dc30edf6
if there isn't enough datapoint, add null data point
2015-11-20 13:24:49 +09:00
Mitsuhiro Tanda
4254aa5f5a
(cloudwatch) fix null point mode
2015-11-20 13:06:35 +09:00
Mauro Stettler
a6e8d61e8e
specify date format in elastic search query
2015-11-20 02:11:48 +09:00
Torkel Ödegaard
730d4857ba
feat(elasticsearch): added caret arrow for metric / group by collapse/expand options
2015-11-19 11:04:21 +01:00
Mitsuhiro Tanda
ae7e7e9656
remove getDimensions()
2015-11-17 22:49:46 +09:00
Mitsuhiro Tanda
393891d6ea
(cloudwatch) fill null if the datapoint missing
2015-11-16 18:23:12 +09:00
Mitsuhiro Tanda
1bbd056797
fix templating
2015-11-16 16:51:03 +09:00
Mitsuhiro Tanda
add5bb47d5
add dimensions() to CloudWatch templating query
2015-11-16 16:50:53 +09:00
utkarshcmu
8a184e9d30
Made tags editable in opentsdb query
2015-11-13 04:01:55 -08:00
utkarshcmu
3a66d7c453
Made opentsdb query editor consistent
2015-11-13 03:08:48 -08:00
Torkel Ödegaard
2cbc62d6c0
fix(elasticsearch): fixed elasticsearch issue, ghost docs series, fixes #3223
2015-11-13 09:30:28 +01:00
Torkel Ödegaard
dbe35bfed1
change(elasticsearch): changed min_doc_count to zero in query to get buckets for missing values, fixes #3131
2015-11-12 16:06:10 +01:00
Torkel Ödegaard
5bc194e1f0
Merge branch 'master' of github.com:grafana/grafana
2015-11-12 13:47:25 +01:00
Mitsuhiro Tanda
ef4bec1c6d
fix CloudWatch dimension value suggestion
2015-11-11 20:15:30 +09:00
Torkel Ödegaard
4da99d14e6
Merge pull request #3204 from mtanda/cloudwatch_ebs_fix
...
CloudWatch EBS Templating fix
2015-11-11 12:09:15 +01:00
Mitsuhiro Tanda
cc80191cd1
CloudWatch ebs templating fix
2015-11-11 19:48:10 +09:00
Torkel Ödegaard
a66825c71f
Merge branch 'master' into develop
2015-11-10 15:26:02 +01:00
Torkel Ödegaard
5d8a51c307
Merge pull request #3129 from utkarshcmu/validity
...
Default AWS Region selection from dropdown
2015-11-09 22:25:30 +01:00
utkarshcmu
7612e47aee
Select AWS region from dropdown
2015-11-09 12:08:40 -08:00
Torkel Ödegaard
ecb1552c10
Merge pull request #3172 from utkarshcmu/aws-bug
...
Test specified AWS Region and not hardcoded us-east-1
2015-11-09 13:54:20 +01:00
utkarshcmu
9f066d01b1
Check specified AWS Region and not us-east-1
2015-11-09 03:35:51 -08:00
Torkel Ödegaard
673ae1edc0
Merge branch 'tablepanel2' into develop
2015-11-09 11:26:06 +01:00
Torkel Ödegaard
b25b31e4a0
Merge branch 'master' into develop
2015-11-09 11:25:22 +01:00
utkarshcmu
efc0b60d41
Fixed opentsdb queryctrl uncheck Rate UI bug
2015-11-08 21:44:58 -08:00
Torkel Ödegaard
e1433ebb41
feat(tablepanel) more refactoring
2015-11-05 12:42:47 -05:00
Torkel Ödegaard
4e37290a7f
feat(tablepanel/elasticsearch): extended elasticsearch data source and query editor to support document queries
2015-11-05 09:56:19 +01:00
Torkel Ödegaard
7d3146ed8d
feat(tablepanel): fixed header, and pagination styling
2015-11-05 08:36:51 +01:00
utkarshcmu
4de9ac133a
Set default AWS region from dropdown now
2015-11-04 17:21:34 -08:00
Tom Dyas
9bafc4fea1
add pencil icon back to graphite data source
...
The input needed to be wrapped in a span set to display:block in order to prevent it
from moving to the next line. See http://stackoverflow.com/questions/773517/style-input-element-to-fill-remaining-width-of-its-container
2015-11-04 11:36:55 -05:00
utkarshcmu
fdeeb73587
AWS Region as a mandatory field
2015-11-04 02:27:35 -08:00
Torkel Ödegaard
d8f68eb118
refactoring: moving and renaming things
2015-10-30 16:06:29 +01:00
Torkel Ödegaard
97697b93ed
refactoring: moving and renaming things
2015-10-30 15:58:20 +01:00
Torkel Ödegaard
6cf46b1635
refactoring: more moving stuff around
2015-10-30 14:44:40 +01:00
Torkel Ödegaard
1113081aab
refactoring: moving components -> core
2015-10-30 14:19:02 +01:00
Torkel Ödegaard
0a0a0776e4
Merge pull request #3088 from utkarshcmu/suggest-opentsdb
...
Tag suggestions fixed for v2.1.1 & above by using Suggest Api.
2015-10-30 10:34:44 +01:00
King'ori Maina
f1847d4501
Correct object key typo
...
Should be ‘message’ not ‘messsage’.
2015-10-30 09:52:33 +02:00
utkarshcmu
a27186e34f
Cleaned the codebase :D
2015-10-29 11:28:38 -07:00
utkarshcmu
2a8904f844
Fixed queryCtrl to use suggest API
2015-10-29 11:13:38 -07:00
Torkel Ödegaard
59fc72d37e
Merge branch 'prometheus-fix_step_calculation' of https://github.com/dan-cleinmark/grafana into dan-cleinmark-prometheus-fix_step_calculation
2015-10-29 16:50:18 +01:00
Torkel Ödegaard
34e3683ded
fix(cloudwatch): fixed limiting of cloudwatch period so it works for long time ranges in all cases, fixes #3086
2015-10-29 16:46:58 +01:00
Torkel Ödegaard
13760b1bdd
fix(influxdb): fixed handling of relative time ranges like last x years, or last x months, fixes #3067
2015-10-29 15:53:15 +01:00
Dan Cleinmark
963f9fdf40
Ensure Promtheus step interval is always < 11000
...
Using a 2 week window (1209600 seconds) and a 60s step, Math.floor()
recalculates a step of 109 and results in 11097 data points in the
Prometheus query (> the 11000 max set by Prometheus). Math.ceil()
returns a step of 110 and 10996 data points.
2015-10-29 07:24:42 -07:00
Torkel Ödegaard
299a2457cd
Merge branch 'master' of github.com:grafana/grafana
2015-10-29 14:05:19 +01:00
Torkel Ödegaard
3de4707c98
feat(elasticsearch): Annotation queries now use the daily index patterns defined in data source options, for old annotations that have an index property that will be used, so will not break existing dashboard/annotation configs, closes #3061
2015-10-29 14:05:05 +01:00
Torkel Ödegaard
603ec65e91
Merge pull request #3059 from mtanda/cloudwatch_template_fix
...
fix panel repeat for cloudwatch
2015-10-29 12:38:22 +01:00
Torkel Ödegaard
f8a1c7c8a1
docs(cloudwatch): updated docs with info about #3080
2015-10-29 12:22:01 +01:00
Torkel Ödegaard
5d64568f3e
refactoring: some minor refactoring and changes to AWS profile PR #3053
2015-10-29 11:44:34 +01:00
Torkel Ödegaard
374fbad06d
Merge branch 'master' into peekeri-support_aws_profiles
2015-10-29 11:19:15 +01:00
Torkel Ödegaard
135ba68ff5
Merge branch 'support_aws_profiles' of https://github.com/peekeri/grafana into peekeri-support_aws_profiles
2015-10-29 11:14:04 +01:00
utkarshcmu
d3ee81bb5a
Added tooltip for cloudwatch datasource
2015-10-28 10:18:44 -07:00
Mitsuhiro Tanda
b82f1edd63
fix panel repeat for cloudwatch
2015-10-28 19:36:49 +09:00
Torkel Ödegaard
89eedd59a8
Merge pull request #3008 from mtanda/prometheus_link
...
Revert prometheus graph view link
2015-10-28 09:29:07 +01:00
Jari Sukanen
23599814a3
cloudwatch: add support for defining AWS profile for CloudWatch datasource
...
Add support for defining AWS profile for CloudWatch datasource to support
pulling information from multiple different AWS accounts to single dashboard.
With this change, it is possible to define multiple AWS credentials in
~/.aws/credentials file and connect different data sources to different
AWS accounts.
2015-10-27 17:00:02 +02:00
Torkel Ödegaard
1dbf0ad976
docs(cloudwatch): initial cloudwatch docs, closes #2900
2015-10-26 15:44:14 +01:00
Felix Barnsteiner
e4fecb48e3
Add ability to set a global time interval
...
The interval is configurable in the data source.
This commit only adds the ability to Elasticsearch datasources
2015-10-26 08:47:46 +01:00
Arthur D'Andréa Alemar
0a6a3f9ab7
fix(prometheus): use time independent API to list metrics and labels names
...
Using the "/api/v1/query" endpoint to extract information about metrics
and labels are limited to the metrics available at the time parameter
(that is set to current time), this can lead to labels not showing
because they have no value in the current time even when the dashboard
is displaying historic data.
On the other hand "/api/v1/series" returns results including every
metric and label known to Prometheus, independent of time and value.
2015-10-23 17:18:34 -02:00
Volker Fröhlich
6b9b08da30
Remove declaration of unused variable size
2015-10-23 12:00:20 +02:00
Volker Fröhlich
184307816f
"No limit" was not effective for ES terms aggregation
...
This may belong to #2827
2015-10-23 11:40:40 +02:00
Mitsuhiro Tanda
c1d592b72c
fix, call linkToPrometheus() directly
2015-10-23 09:58:42 +09:00
Torkel Ödegaard
2d23251da9
spelling: fixed selling in influxdb annotation partial, fixes #3012
2015-10-22 18:24:43 -04:00
Torkel Ödegaard
5b01e9ec97
fix(elasticsearch): minor fix to elasticsearch unit tests so that they work in any timezone, fixes #3010
2015-10-22 16:58:31 -04:00
Torkel Ödegaard
8526230b59
fix(influxdb_08): fixed influxdb 08 query editor issue, fixes #3009
2015-10-22 16:53:34 -04:00
Torkel Ödegaard
9d04a4c4f0
Merge branch 'master' of github.com:grafana/grafana
2015-10-22 16:23:31 -04:00
Torkel Ödegaard
ae93f2b936
fix(elasticsearch): fixed proper json escaping for lucene query, fixes #2981
2015-10-22 16:23:21 -04:00
Mitsuhiro Tanda
fcaecf4782
revert prometheus link
2015-10-23 01:35:34 +09:00
Felix Barnsteiner
eb8c2d9053
Ability to set a low limit for Elasticsearch date histogram interval
...
closes #2901
2015-10-22 13:16:36 +02:00
Torkel Ödegaard
ae81fbdffe
Merge branch 'master' of github.com:grafana/grafana
2015-10-21 10:59:17 -04:00
Torkel Ödegaard
fc0705e87c
fix(elasticsearch): fix for daily pattern when getting index for today, is now using utc, fixes #2913
2015-10-21 10:59:02 -04:00
Jari Sukanen
f3ecdc5af4
influxdb: fix influxdb annotation query
2015-10-21 14:31:06 +03:00
Torkel Ödegaard
dbc1a9cf82
fix(influxdb_0.8.x): fixed issue with new timepicker ranges like The day so far, fixes #2936
2015-10-16 12:07:35 -04:00
Torkel Ödegaard
c320e9d583
fix(annotations): fixed graphite annotations, broken by recent time handling changes, fixes #2947
2015-10-16 11:07:15 -04:00
Torkel Ödegaard
c831369974
fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919
2015-10-10 11:46:00 -04:00
