IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,238 Commits 5,454 Branches 554 Tags 1.9 GiB
22fd2aed02
Commit Graph

5238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
utkarshcmu
22fd2aed02 Removed columns from snapshot table 2015-12-18 00:30:44 -08: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
carl bergquist
28e7f0f74f Merge branch 'felixbarny-global_interval' 2015-12-17 10:01:40 +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
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
c87b425639 Merge pull request #3542 from grafana/revert-3445-cloudwatch_sum_period 
Revert "(cloudwatch) add "Divide Sum By Period" option"
 2015-12-16 14:36:43 +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
utkarshcmu
78fe588330 Removed NewAddColumnMigration via 3473 2015-12-16 02:46:20 -08:00
Torkel Ödegaard
ddf72fa53f Merge pull request #3535 from utkarshcmu/typos 
Fixed typos
 2015-12-16 11:41:29 +01:00
utkarshcmu
3a6e8a535c Fixed typos 2015-12-16 02:30:53 -08:00
carl bergquist
48539c851e feat(graphite): adds support for grep function 
closes #1163
 2015-12-16 09:45:28 +01:00
carl bergquist
a701bba839 Merge branch 'jmaitrehenry-feature/symlinks' 2015-12-16 09:24:37 +01:00
Mitsuhiro Tanda
c7ba60162b (cloudwatch) add Divide By Sum option 2015-12-16 17:23:13 +09:00
carl bergquist
d4e98cd9bc Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks 
Conflicts:
	pkg/plugins/plugins.go

closes #2899
closes #2834
 2015-12-16 09:21:52 +01:00
Torkel Ödegaard
05ec24e7b8 Merge pull request #3531 from mtanda/cloudwatch_fix_annotation 
(cloudwatch) fix query editor
 2015-12-16 09:08:30 +01:00
Mitsuhiro Tanda
e44ef7f823 fix cloudwatch query editor 2015-12-16 17:01:58 +09:00
Carl Bergquist
2b58b6b5d7 Merge pull request #3304 from utkarshcmu/info 
Added metadata info panel
 2015-12-15 18:02:29 +01:00
carl bergquist
3868a796a4 Merge branch 'stesie-fix-formatter-stack-percentage' 2015-12-15 17:35:05 +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
f355f36d09 rename(phantomjs): improve variable naming 2015-12-15 14:23:37 +01:00
Carl Bergquist
5aa11b4578 Merge pull request #3400 from counsyl/wait-for-dashboard-render 
Wait for all panels to render in PhantomJS
 2015-12-15 14:22:18 +01:00
carl bergquist
c48da9b5cf fix(tests): fix broken unittest due to merge conflict 2015-12-15 14:03:15 +01:00
carl bergquist
12d65bfdfa Merge branch 'xaka-patch-2' 2015-12-15 13:59:35 +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