Torkel Ödegaard
|
106fe4854f
|
Merge branch 'prometheus' of github.com:grafana/grafana
Conflicts:
pkg/models/datasource.go
public/app/plugins/datasource/prometheus/datasource.js
public/app/plugins/datasource/prometheus/partials/query.editor.html
public/app/plugins/datasource/prometheus/queryCtrl.js
|
2015-10-06 16:36:58 +02:00 |
|
Torkel Ödegaard
|
a2bf3e056d
|
Merge branch 'prometheus'
|
2015-10-06 14:10:06 +02:00 |
|
Torkel Ödegaard
|
7dc923a292
|
fix(timepicker): fixed displaying of customk time ranges, #2861
|
2015-10-01 16:36:38 +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
|
6e66b8a0fa
|
Add prometheus datasource
|
2015-09-29 17:07:11 +01:00 |
|
Torkel Ödegaard
|
d9d3da4def
|
Merge branch 'prometheus-datasource' of https://github.com/jimmidyson/grafana into prometheus
|
2015-09-29 08:06:16 +02: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
|
7e434fc019
|
refactor: moved graphite specs into plugins directory
|
2015-09-28 15:23:53 +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 |
|
ubhatnagar
|
6f43cbf665
|
Added unit tests for all and multi format options.
|
2015-09-23 13:24:59 +05:30 |
|
Torkel Ödegaard
|
f632b3b029
|
feat(elasticsearch): added new templating all format and muli format named , also added automatic setting of correct all and multi format depending on data source, closes #2696
|
2015-09-22 14:29:41 +02:00 |
|
Torkel Ödegaard
|
b37f9a7db0
|
fix(graphite): minor fix to query editor when using summarize function with no metric segments, only series ref, fixes #2788
|
2015-09-22 13:32:28 +02:00 |
|
Torkel Ödegaard
|
792b194d0e
|
feat(elasticsearch): finished work on adding support for filters aggregate, you can now split series by query using group by filters, closes #2785
|
2015-09-21 20:29:05 +02:00 |
|
Torkel Ödegaard
|
e694a74c9d
|
feat(elasticsearch): work on supporting filters aggregate, #2785
|
2015-09-21 19:23:18 +02:00 |
|
Torkel Ödegaard
|
9de016bfe3
|
feat(elasticseach): alias and lucene query fields are now visible/usable when using raw json query, #1034
|
2015-09-21 12:07:03 +02:00 |
|
Torkel Ödegaard
|
b5f237a69b
|
fix(graph): minor fix for hover tooltip when combined with a single series using stepped lines, fixes #2754
|
2015-09-19 15:20:53 +02:00 |
|
Torkel Ödegaard
|
2f68687de9
|
feat(timepicker2): temporarily removed the the option to define custom quick range, will have to be part of future issue, closes #2761
|
2015-09-19 12:20:24 +02:00 |
|
Torkel Ödegaard
|
96b0e70ddd
|
feat(timepickerv2): fixed lots of minor issues and updated kairosdb and opentsdb data sources to work with the new date formats
|
2015-09-18 15:06:08 +02:00 |
|
Torkel Ödegaard
|
f5e6722826
|
feat(timepickerv2): more work on new timepicker, now absolute time mixed with relative time works, yesterday, this day last week, etc now work
|
2015-09-18 13:54:31 +02:00 |
|
Torkel Ödegaard
|
69db9e0d45
|
feat(timepickerV2): absolute time / calendar picker works, #2761
|
2015-09-18 11:01:37 +02:00 |
|
Torkel Ödegaard
|
a30f73fe36
|
feat(timepicker): more work on getting new time formats to work in all data sources
|
2015-09-17 12:40:04 +02:00 |
|
Torkel Ödegaard
|
1a9c52e17f
|
feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates
|
2015-09-17 11:21:38 +02:00 |
|
Torkel Ödegaard
|
5ad38ee9f8
|
feat(timepicker2): fixed timesrv specs
|
2015-09-17 09:57:59 +02:00 |
|
Torkel Ödegaard
|
a9812167d7
|
feat(timepicker2): worked on more rich time range support
|
2015-09-17 09:44:51 +02:00 |
|
Torkel Ödegaard
|
a0a98cb035
|
feat(timepicker2): working on richer timepicker options
|
2015-09-16 19:49:05 +02:00 |
|
Torkel Ödegaard
|
d705108be5
|
feat(timepicker2): added date math tests
|
2015-09-16 18:48:41 +02:00 |
|
Torkel Ödegaard
|
4ffa26cf2c
|
feat() started work on more feature rich time picker
|
2015-09-15 13:23:36 +02:00 |
|
Torkel Ödegaard
|
5545cdbf4d
|
refactor: improving structure, moving things into a core module
|
2015-09-15 08:17:40 +02:00 |
|
Torkel Ödegaard
|
9db6f82628
|
refactor: finished timepicker to typescript and directive refactor
|
2015-09-12 12:52:50 +02:00 |
|
Torkel Ödegaard
|
d96a6a59ee
|
refactor: moved timepicker from a simple panel to component, removed simple panel directive
|
2015-09-12 11:49:27 +02:00 |
|
Torkel Ödegaard
|
286b4c0e46
|
Merge branch 'typescript'
|
2015-09-11 08:01:11 +02:00 |
|
Torkel Ödegaard
|
166a3c4d64
|
tech(typescript): added tslint to default task
|
2015-09-11 08:00:13 +02:00 |
|
Torkel Ödegaard
|
da832368f0
|
dev building and optimized builds work
|
2015-09-10 12:42:24 +02:00 |
|
Torkel Ödegaard
|
abac8bccc6
|
tech(typescript): its looking good
|
2015-09-10 11:26:40 +02:00 |
|
Torkel Ödegaard
|
1ab374008f
|
feat(influxdb): completed work on new influxdb query editor, now supports #2708, #2647, #2599
|
2015-09-09 14:17:55 +02:00 |
|
Torkel Ödegaard
|
c4c3f9dc1f
|
feat(influxdb): more work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599
|
2015-09-09 13:39:45 +02:00 |
|
Torkel Ödegaard
|
9904d01958
|
fix(unit test): trying to fix failing unit test due to timezone different on build server
|
2015-09-08 09:50:50 +02:00 |
|
Torkel Ödegaard
|
f2c518ba24
|
Merge branch 'elastic_ds'
Conflicts:
public/app/plugins/datasource/influxdb/queryCtrl.js
|
2015-09-08 09:17:34 +02:00 |
|
Torkel Ödegaard
|
35cc3837a0
|
feat(elasticsearch): more work on alias pattern, #1034
|
2015-09-08 09:10:26 +02:00 |
|
Torkel Ödegaard
|
572a80d1d1
|
feat(elasticsearch): metric response handling and processsing now supports alias patterns, {{term field name}} and {{metric}} now works, #1034
|
2015-09-07 23:15:49 +02:00 |
|
Torkel Ödegaard
|
2aa695fb66
|
feat(elasticsearch): refactoring elasticsearch response handling to support series alias patterns
|
2015-09-07 20:00:27 +02:00 |
|
Torkel Ödegaard
|
f361f324da
|
feat(elasticsearch): more polish to editor, made interval configurable per query, #1034
|
2015-09-07 16:35:40 +02:00 |
|
Torkel Ödegaard
|
3999a3caa2
|
feat(elasticsearch): extended stats like std deviation now works, and sigma option as well, added unique count (cardinality as well, #1034
|
2015-09-07 13:13:27 +02:00 |
|
Torkel Ödegaard
|
6c304924f7
|
feat(elastic_ds): moving time field name to dataasource option, it is no longer specified for each query and date_histogram
|
2015-09-07 08:57:46 +02:00 |
|
Torkel Ödegaard
|
0960360b35
|
feat(elasticsearch): added support for index time based patterns, #1034
|
2015-09-06 16:09:42 +02:00 |
|
Torkel Ödegaard
|
14cb2b0143
|
began work on support index time patterns
|
2015-09-06 12:58:53 +02:00 |
|
Torkel Ödegaard
|
f942ec952e
|
feat(elasticsearch): worked on percentiles metric aggregator in editor and in elasticsearch response processing
|
2015-09-05 18:31:42 +02:00 |
|