public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,083 Commits 655 Branches 650 Tags
0392fde34edc22e660cdae33474d4ac9dcafe40c
Commit Graph
8083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard dd3295da60 Merge pull request #3449 from EricSmekens/patch-1 
Cleaned up jquery.flot.events.js
 2015-12-08 12:09:47 +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
utkarshcmu 79d0f47ee7 Added columns in dashboard_snapshot 2015-12-07 04:24:29 -08:00
Torkel Ödegaard 1ebb18ae57 Merge pull request #3432 from toni-moreno/add_rpm_deb_separate_commands 
add option pkg-rpm and pkg-deb to create separately both packages #3407
 2015-12-07 11:46:00 +01: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
utkarshcmu 42d1205260 Fixed gofmt checks 2015-12-06 23:59:58 -08:00
utkarshcmu 3d90340446 Added new columns to dashboard table 2015-12-06 23:51:43 -08:00
Torkel Ödegaard d68e1fd308 Merge pull request #3444 from mtanda/cloudwatch_fix_period 
(cloudwatch) fix period overwrite
 2015-12-07 06:43:33 +01:00
Mitsuhiro Tanda 217d5df276 (cloudwatch) fix period overwrite 2015-12-07 13:40:54 +09:00
Mitsuhiro Tanda d1ccf83236 (cloudwatch) use paging 2015-12-06 21:35:20 +09:00
Mitsuhiro Tanda 28968144d6 update aws-sdk-go v1.0.0 2015-12-06 21:35:19 +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
toni-moreno 7e63978a3f fix formatting for CircleCI test 2015-12-04 22:55:23 +01:00
toni-moreno c9674f84e8 add option pkg-rpm and pkg-deb to create separately both packages #3407 2015-12-04 22:36:38 +01:00
woodsaj 0697274695 I add plugin dependency check. 
This check ensures that all of the plugins required by a bundle
are loaded.
 2015-12-05 01:20:42 +08: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 df0a5cf52f updated appveyor again 2015-12-04 16:56:37 +01:00
Torkel Ödegaard caa6337952 updated appveyor 2015-12-04 16:48:35 +01:00
Torkel Ödegaard 700a3f9f84 Merge branch 'master' of github.com:grafana/grafana v2.6.0-beta1 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 e9e6ac64bd minor change to build script 2015-12-04 11:21:38 +01:00
Torkel Ödegaard 36ab8ae19c fix(table): minor fix for table panel 2015-12-04 10:44:17 +01:00
Torkel Ödegaard df366da721 updated version to 2.6.0-beta1 2015-12-04 10:39:50 +01:00
Torkel Ödegaard 67dc761344 fix(security): do not print ENV config values when they are passwords, fixes #3337 2015-12-04 10:38:27 +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 eb5822bc7c update cloudwatch docs 2015-12-04 01:04:50 +09:00