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
eb5822bc7c
update cloudwatch docs
2015-12-04 01:04:50 +09: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
0011beb654
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 16:32:58 +01: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
bd850d8158
Merge pull request #3410 from bergquist/ignore_npm_log
...
add npm-debug.log to gitignore
2015-12-03 15:56:38 +01:00
carl bergquist
d7c7f27207
add npm-debug.log to gitignore
2015-12-03 15:29:28 +01:00
Torkel Ödegaard
0fb95297a2
Merge branch 'master' of github.com:grafana/grafana
2015-12-03 15:10:23 +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
Alexey Larkov
0715ba3e5e
Merge pull request #1 from grafana/master
...
Merge with original source
2015-12-03 17:29:00 +05:00
Torkel Ödegaard
efbbb31370
Update README.md
2015-12-03 12:03:06 +01:00
Piotr Popieluch
207c1a20ee
router logger, log username taken from cookie
2015-12-03 11:05:50 +01:00
Piotr Popieluch
579bc1c2c8
Add more info in route logging
...
- Add remote address
- Add method
- Add protocol
- Add response size
- Use consistent unit for response time (us)
2015-12-03 09:28:42 +01: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
Greg Look
a1f103576a
Wait for all panels to render in PhantomJS.
2015-12-02 15:13:02 -08:00
Torkel Ödegaard
aa766e3e18
Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins
2015-12-02 18:31:05 +01: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
3668cb6dd4
fix(readme): minor readme update
2015-12-01 09:23:30 +01:00
Torkel Ödegaard
93f3e30cac
fix(log): removed logging accidentlally checked in
2015-12-01 09:19:22 +01:00
Torkel Ödegaard
52af346ec8
Merge pull request #3375 from hartfordfive/issue-3374
...
Add flag option to display app version (Issue 3374)
2015-12-01 09:18:37 +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
4cc61d10ff
fix(docs): fixed typo in installing docs fixes #3379
2015-12-01 08:59:30 +01:00
Al Lefebvre
8deb6d9246
Updated README
2015-11-30 13:09:29 -05:00
Al Lefebvre
20eb6df9e8
Removed comment line
2015-11-30 12:24:14 -05:00
Al Lefebvre
a921eeb5e2
Merge branch 'master' of github.com:hartfordfive/grafana into issue-3374
2015-11-30 12:20:47 -05:00
Al Lefebvre
f3f34e1835
Merge pull request #1 from grafana/master
...
Updating forked copy from official Grafana master
2015-11-30 12:20:32 -05:00
Al Lefebvre
4a29d459da
Added flag to display version number and exit
2015-11-30 12:10:47 -05: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
