Torkel Ödegaard
e95170e9fd
tech(angularjs): upgrade to angularjs 1.5
2015-12-22 12:24:36 +01:00
Torkel Ödegaard
d0dead0a08
feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript
2015-12-22 12:13:55 +01:00
Torkel Ödegaard
71d718a6e2
fix(systemjs): systemjs config fix for plugins
2015-12-22 11:46:41 +01:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08: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
10a764c4f2
fix(less): minor less fix
2015-12-21 16:42:28 +01:00
Torkel Ödegaard
0a9f705308
tech(systemjs): more fixes for optmized build
2015-12-21 16:34:18 +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
f7888886e9
tech(systemjs): working on getting tests to work
2015-12-21 11:10:16 +01:00
Torkel Ödegaard
dfd5413b10
tech(systemjs): worked on making optimized builds work with systemjs builder
2015-12-21 10:02:39 +01:00
carl bergquist
1b341f8000
fix(dashboard_settings): update css for last row
2015-12-20 21:13:44 +01:00
Carl Bergquist
af9b864b83
Merge pull request #3446 from utkarshcmu/new-columns
...
Displaying Last UpdatedBy as Metadata
2015-12-20 15:11:20 -05:00
Torkel Ödegaard
93e424de4c
tech(systemjs): work on systemjs builder
2015-12-18 15:59:27 +01:00
woodsaj
e7a0ab76c3
change plugin to app in breadcrumb
2015-12-18 22:09:33 +08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
Torkel Ödegaard
0dd7fb7361
tech(systemjs): most things work
2015-12-18 10:28:00 +01:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
Torkel Ödegaard
d34ba416a6
tech(systemjs): more stuff is starting to work
2015-12-18 08:22:05 +01:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08: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
42db1378e0
rename app config directive to grafana-app-*
2015-12-17 23:59:01 +08: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
df1e52e394
tech(systemjs): more stuff is starting to work
2015-12-17 16:30:53 +01:00
carl bergquist
24acea7261
refactoring(top_nav): move menu condition to controller
2015-12-17 14:41:10 +01:00
Carl Bergquist
08ca72399b
Merge pull request #3051 from utkarshcmu/viewer
...
Removed export/view permission from a dashboard viewer
2015-12-17 14:40:42 +01:00
Torkel Ödegaard
83ce40191c
tech(systemjs): ok, moving forward
2015-12-17 14:27:34 +01:00
Torkel Ödegaard
7c06b5cc22
tech(systemjs): minor change
2015-12-17 13:18:32 +01:00
Torkel Ödegaard
3b8e478a6a
tech(systemjs): finally starting to get systemjs and typescript and runtime loading to work together in a manner that I want it to.. took forever
2015-12-17 11:46:10 +01:00
utkarshcmu
9498c78576
Merged with master, resolved conflicts
2015-12-17 01:46:34 -08:00
utkarshcmu
746e203f7b
Admin can toggle editable checkbox
2015-12-17 01:44:05 -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
26f70a5fd7
fix(settings): make headline more informative
2015-12-17 09:04:05 +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
3693473f40
Merge branch 'utkarshcmu-relative'
2015-12-16 16:34:56 +01:00
carl bergquist
2cb83cf19d
style(graph.tooltip): moves checkdate logic inside each method.
...
I find it easier to follow and checkdate didnt do much.
2015-12-16 16:32:55 +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
8ee0e5d11f
Merge pull request #3307 from dennisdegreef/addCubicMeters
...
Add cubic meters to units
2015-12-16 16:04:20 +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
04ff97cd72
tech(systemjs): tricky mixing systemjs and requirejs, might need to migrate
2015-12-15 20:23:55 +01:00
Torkel Ödegaard
8e6fdf62fb
tech(systemjs): things are starting to work
2015-12-15 19:27:04 +01:00
Torkel Ödegaard
74d7a946a7
tech(systemjs): work on moving to systemjs
2015-12-15 19:10:08 +01:00
Carl Bergquist
2b58b6b5d7
Merge pull request #3304 from utkarshcmu/info
...
Added metadata info panel
2015-12-15 18:02:29 +01:00
Torkel Ödegaard
7ee290cc57
tech(systemjs): systemjs and jspm work
2015-12-15 17:56:16 +01:00
carl bergquist
b99ea80b58
test(graph): validates that percentage is shown when using stack and percentage
...
fixes #2379
2015-12-15 17:34:37 +01:00
Stefan Siegl
ce2ae31950
Use percent-formatter for stack+percentage graph
2015-12-15 17:32:52 +01:00
carl bergquist
c48da9b5cf
fix(tests): fix broken unittest due to merge conflict
2015-12-15 14:03:15 +01:00
Pavel Strashkin
cba471b09b
ui(dashboard): delete empty rows without confirm
2015-12-15 13:58:38 +01:00
Torkel Ödegaard
f1b897b3de
change(cloudwatch): minor change to editor
2015-12-15 13:57:20 +01:00
Torkel Ödegaard
0589134006
Merge branch 'master' of github.com:grafana/grafana
2015-12-15 13:53:15 +01:00
Torkel Ödegaard
6ed36e01ac
fix(unit tests): moved kairosdb spec to it's plugin repo
2015-12-15 13:52:14 +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
27a0ef7ee8
Merge branch 'master' of github.com:grafana/grafana
2015-12-15 10:29:07 +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
carl bergquist
2f3587ee8a
fix(jshint): fix jshint error ._.
2015-12-15 09:06:11 +01:00
carl bergquist
9ece45caa5
feat(top_nav): option to make dashboards editable again
...
closes #2587
closes #2554
2015-12-15 08:43:03 +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
4cc06ad779
Merge branch 'master' of github.com:grafana/grafana
2015-12-14 18:33:58 +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
280f9befae
Merge pull request #2949 from shoonoise/master
...
Add option to hide raintank share button
Fixes #2727
2015-12-14 17:29:09 +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
1cfa523f49
style(sidemenu): rename signup method to signout
2015-12-14 17:19:26 +01:00
Carl Bergquist
548ee47aa7
Merge pull request #3122 from shoonoise/hide_signout
...
Disable sign out button in case of auth proxy enabled
2015-12-14 17:18:04 +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
Johannes 'fish' Ziemke
c30c9fbca9
Clarify template option auto interval in tooltip
2015-12-11 16:47:05 +01:00
Carl Bergquist
55fab0493d
Merge pull request #3393 from pepl/master
...
Fixed spelling error
2015-12-11 16:12:19 +01:00
carl bergquist
22c4e605cf
Merge remote-tracking branch 'upstream/master'
2015-12-11 15:25:34 +01:00
carl bergquist
fab1062c0b
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
2015-12-11 15:16:57 +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
1b42e3015e
fix(timepicker): mini change, removed unneeded space
2015-12-11 14:34:56 +01:00
carl bergquist
ba5b127684
feat(timepicker): always show refresh button
...
closes #1628
closes #1208
2015-12-11 14:26:38 +01:00
Torkel Ödegaard
7e9963ae05
fix(elasticsearch): minor markup fix
2015-12-11 12:51:39 +01:00
Torkel Ödegaard
b7c0f3ea95
Merge branch 'master' of github.com:grafana/grafana
2015-12-11 12:45:01 +01:00
Torkel Ödegaard
b934ace1fc
Merge branch 'moving_avg_es_support'
2015-12-11 12:43:02 +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
Torkel Ödegaard
68775182f0
Merge pull request #3494 from mtanda/cloudwatch_cleanup
...
remove aws-sdk-js require setting
2015-12-11 12:28:26 +01:00
Mitsuhiro Tanda
dc3e172eb4
remove aws-sdk-js require setting
2015-12-11 20:27:24 +09:00
carl bergquist
1a8579cd6d
feat(table_panel): adds invert color order functionality
2015-12-11 12:01:04 +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
Torkel Ödegaard
5227dc679d
fix(invite): removed resend invite button, button logic was not implemented, fixes #3484
2015-12-10 13:31:24 +01:00
Torkel Ödegaard
77c510c364
fix(graph legend): fixed issue with escaping html text in graph legend, and in function param, fixes #3482
2015-12-10 13:27:57 +01:00
Carl Bergquist
2d2ad8b237
show pipeline agg source for derivative
2015-12-10 13:06:46 +01:00
Torkel Ödegaard
6ea00a4f7c
fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465
2015-12-10 13:01:41 +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
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
utkarshcmu
384292b647
Removed metadata from dropdown, included in settings
2015-12-02 04:15:50 -08: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
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
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
Torkel Ödegaard
85382dc2e0
fix(table): fixed table height alignment
2015-11-24 10:04:01 +01:00
Joakim Lahtinen
9c0141e84e
Fixed some broken HTML.
...
Simplified some control flow.
2015-11-24 07:29:52 +01:00
Torkel Ödegaard
24b9bc1e55
fix(missing files): added missing files, oops
2015-11-23 18:20:12 +01:00
Torkel Ödegaard
cf1e167430
feat(table panel): table panel can now show nested object data, closes #3263
2015-11-23 16:10:32 +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
utkarshcmu
f88588db90
Added close button
2015-11-21 19:36:27 -08:00
utkarshcmu
5930dc6354
Removed info icon, Included metadata feature
2015-11-21 16:37:15 -08:00
Dennis de Greef
9c64da4323
Add cubic meters to units
2015-11-21 21:04:08 +01:00
utkarshcmu
c863ea4aa1
Shortened info details to use less space
2015-11-21 06:43:45 -08:00
utkarshcmu
e1432f4339
Function name makes sense now
2015-11-21 06:20:13 -08:00
utkarshcmu
890c527ae5
Added info dropdown
2015-11-21 06:16:28 -08:00
