Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Torkel Ödegaard
d1145ed3fb
Merge branch 'master' into apps
2015-12-22 13:59:25 +01:00
Torkel Ödegaard
f074c1eaff
refactor(lodash): changed how lodash is referenced from typescript
2015-12-22 13:59:11 +01:00
Torkel Ödegaard
7a87c900ee
Merge branch 'master' into apps
2015-12-22 12:41:52 +01:00
bergquist
690a6e1a59
feat(graphs): zoom out on double click
2015-12-22 09:56:24 +01:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08: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
d34ba416a6
tech(systemjs): more stuff is starting to work
2015-12-18 08:22:05 +01:00
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
xiaoping378
488165ec73
fixes #3555 , path of table panel option error
2015-12-18 12:35:02 +08:00
Torkel Ödegaard
545c39356a
tech(systemjs): starting work on systemjs bundling
2015-12-17 19:18:30 +01:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08: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
Torkel Ödegaard
c24935b519
minor progress
2015-12-16 17:01:34 +01:00
carl bergquist
8c02a7bd6b
Merge branch 'relative' of https://github.com/utkarshcmu/grafana into utkarshcmu-relative
2015-12-16 16:09:44 +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
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
Stefan Siegl
ce2ae31950
Use percent-formatter for stack+percentage graph
2015-12-15 17:32:52 +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
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +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
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +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
