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
Torkel Ödegaard
aa4ac9fa05
fix(timerange): fixed broken unit tests
2015-12-09 13:38:53 +01:00
Torkel Ödegaard
0339a5ad01
fix(graph): removed experimental mockup code that was accidently merged master
2015-12-09 13:36:15 +01:00
Torkel Ödegaard
bffb217d37
fix(panel): removed accidentally commited test markup
2015-12-09 13:08:47 +01:00
Torkel Ödegaard
40f85e5ca3
refactor(http data source options): #3473
2015-12-09 13:05:05 +01:00
Torkel Ödegaard
2dba2f4a95
Merge branch 'with_credentials' of https://github.com/mtanda/grafana into mtanda-with_credentials
2015-12-09 12:54:00 +01:00
Torkel Ödegaard
70542fb730
refactor(table views): #3466
2015-12-09 12:04:51 +01:00
Mitsuhiro Tanda
cd742979b1
add withCredentials checkbox
2015-12-09 19:43:59 +09:00
Torkel Ödegaard
736d58e35f
Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views
2015-12-09 10:43:51 +01:00
Torkel Ödegaard
64138bd424
fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week so far, closes #3465
2015-12-09 10:35:39 +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
Torkel Ödegaard
a1d66d98dc
Merge pull request #3448 from utkarshcmu/tips
...
Fixed closing tags
2015-12-08 12:10:05 +01:00
Nick Christus
282aaa5cf0
Merge branch 'master' into updated-list-views
2015-12-07 16:30:02 -06:00
Nick Christus
462a939438
Merge branch 'master' of github.com:grafana/grafana
2015-12-07 16:29:51 -06:00
Nick Christus
030f902ca5
removed redundant labels
2015-12-07 16:26:18 -06:00
Eric Smekens
58093941c0
Cleaned up jquery.flot.events.js
...
_lastRange was confused with lastRange. This declared '_lastRange' somewhere globally.
Was also not used, so removed both.
(I know this is a library, but it was heavily adjusted anyway.)
2015-12-07 20:16:52 +01:00
utkarshcmu
005271d24b
Fixed missing closing tag
2015-12-07 05:41:18 -08:00
utkarshcmu
2b263bcb5d
Fixed closing tag
2015-12-07 05:06:52 -08:00
Torkel Ödegaard
fad4875f11
Merge pull request #3436 from utkarshcmu/templating
...
Removed if condition to fix 3370
2015-12-07 11:45:32 +01:00
Mitsuhiro Tanda
217d5df276
(cloudwatch) fix period overwrite
2015-12-07 13:40:54 +09:00
Torkel Ödegaard
4c5cfd51d7
fix(metric_editors): Fixes clicking timing issue for typeahead auto dropdown option, fixes #3428
2015-12-06 10:13:47 +01:00
utkarshcmu
b6044910ec
Removed if condition to fix 3370
2015-12-05 06:34:03 -08:00
Torkel Ödegaard
5aa90eb086
Merge branch 'master' of github.com:grafana/grafana
2015-12-05 14:22:54 +01:00
Torkel Ödegaard
ce58486850
fix(html): removed unneeded tag
2015-12-05 14:22:39 +01:00
Torkel Ödegaard
654d1f939e
Merge pull request #3424 from grafana/code-tag
...
add variable for codeTagBackground to control look for both themes.
2015-12-04 18:17:24 +01:00
Trent White
477b876a1f
add variable for codeTagBackground to control look for both themes. Fixes #3399
2015-12-04 11:55:20 -05:00
woodsaj
523cf21b4a
tune pluginConfig directive
2015-12-05 00:34:48 +08:00
Torkel Ödegaard
700a3f9f84
Merge branch 'master' of github.com:grafana/grafana
2015-12-04 15:45:06 +01:00
Torkel Ödegaard
f9b13791de
change(table panel): changed default transform mode
2015-12-04 15:38:49 +01:00
Torkel Ödegaard
7886318341
Merge pull request #3417 from mtanda/cloudwatch_dimension_filter_fix
...
(cloudwatch) null check of dimension
2015-12-04 12:30:13 +01:00
woodsaj
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
Mitsuhiro Tanda
573632012e
cloudwatch dimension null check
2015-12-04 20:16:31 +09:00
Torkel Ödegaard
002455da07
fix(table): minor fix to table panel and transform time series to aggregations
2015-12-04 12:15:42 +01:00
Torkel Ödegaard
36ab8ae19c
fix(table): minor fix for table panel
2015-12-04 10:44:17 +01:00
Torkel Ödegaard
0b4552a8e7
fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345
2015-12-04 10:32:23 +01: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
Nick Christus
91139672cc
merge with master, conflicts fixed
2015-12-03 20:34:05 -06:00
Nick Christus
3d178c8eb6
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 20:21:15 -06:00
Nick Christus
c9bd45ba13
removed filters and actions for now
2015-12-03 20:20:54 -06: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
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08: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
woodsaj
bd4cb549d6
add pluginBundle support
...
A plugnBundle is meta plugin that has a set of dependent plugins
to enable. This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
2015-12-03 15:52:37 +08:00
woodsaj
fd392a2422
Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin
...
Conflicts:
public/views/index.html
2015-12-03 12:47:58 +08:00
woodsaj
13864853a8
support separate css files for light/dark themes.
2015-12-03 12:29:57 +08:00
Nick Christus
d86b2c4fb4
Merge branch 'master' of github.com:grafana/grafana
2015-12-02 21:33:06 -06:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +01:00
Torkel Ödegaard
8eb3e48bc7
fix(build): fixed build issues with concat not including require_config
2015-12-02 18:22:47 +01:00
Michael Kröll
1bb1ddcd29
Fixed spelling error
2015-12-02 11:14:28 +01:00
Torkel Ödegaard
24324939e1
Merge branch 'fix_refresh_variable_from_url' of https://github.com/toni-moreno/grafana into toni-moreno-fix_refresh_variable_from_url
2015-12-01 15:28:48 +01:00
Torkel Ödegaard
2436cda7ac
fix(graph panel): minor spelling change
2015-12-01 15:28:34 +01:00
Torkel Ödegaard
75b83af08f
refactoring(ui): minor ui improvement to graph axis tab
2015-12-01 14:04:44 +01:00
Torkel Ödegaard
82d8e3c2b6
feat(graph panel): refactoring of hide zero option, #3336
2015-12-01 13:34:42 +01:00
Torkel Ödegaard
c351f46e47
Merge branch 'hide-zero' of https://github.com/utkarshcmu/grafana into utkarshcmu-hide-zero
2015-12-01 13:08:37 +01:00
Torkel Ödegaard
fb9e8d2166
feat(table panel): fixed issue with column selection for new table panel
2015-12-01 10:16:11 +01:00
Torkel Ödegaard
93f3e30cac
fix(log): removed logging accidentlally checked in
2015-12-01 09:19:22 +01:00
Torkel Ödegaard
8e0bba4f99
fix(templating): minor fix to default property name, fixes #3378
2015-12-01 09:01:44 +01:00
Torkel Ödegaard
0f867a3484
Merge pull request #3230 from utkarshcmu/time-units
...
Added currency units, time units, tests
2015-11-30 17:29:51 +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
d80458ef81
Merge branch 'refresh' of https://github.com/utkarshcmu/grafana into utkarshcmu-refresh
2015-11-30 17:23:50 +01:00
Torkel Ödegaard
ad15df7222
Merge branch 'influxdb_editor_v3'
2015-11-30 16:29:20 +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
utkarshcmu
0dbd7d0e17
Fixed #3357
2015-11-29 03:28:07 -08:00
utkarshcmu
8cdaa044e1
Removed repeating test
2015-11-29 03:14:26 -08:00
utkarshcmu
712a420217
Fixed refresh setting for absolute time
2015-11-29 03:12:48 -08:00
Torkel Ödegaard
72d9fcdcb4
feat(influxdb): progress with new influxdb editor
2015-11-27 16:35:40 +01:00
shoonoise
5cf3425b93
Disable sign out button in case of auth proxy enabled
2015-11-26 17:56:45 +03:00
Torkel Ödegaard
aa13a80d83
fix(influxdb): fixed issue with metric segment component that caused double events
2015-11-26 09:28:59 +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
utkarshcmu
1f57cf08a7
Added an option to hide zero values
2015-11-25 04:38:54 -08:00
utkarshcmu
0ff5ff5dbe
Enabled refresh interval for absolute time range
2015-11-25 04:05:40 -08: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
