961c31a747
test(util): add unit test for string util
2016-06-03 15:06:54 +02:00
d1a345bb03
Merge branch 'patch-3' of https://github.com/dakerfp/grafana into dakerfp-patch-3
2016-06-03 15:02:46 +02:00
3d7facf6ee
fix(cli): fixes broken import
2016-06-03 13:40:48 +02:00
6de1399cf0
fix(cli): fixes broken import
2016-06-03 12:35:17 +02:00
15aeb4aec2
tech(cli): rename log to logger to separate from server logger
2016-06-03 12:22:30 +02:00
4c4189d631
Update ISSUE_TEMPLATE.md
2016-06-03 08:38:48 +02:00
015b409f2f
Update ISSUE_TEMPLATE.md
2016-06-03 08:38:07 +02:00
510360a509
docs(elastic): updates readme
2016-06-02 14:56:31 +02:00
49fe90874a
Merge branch 'v3.0.x'
2016-06-02 12:09:10 +02:00
acbaef1907
fix(influxdb): fixed issue with backslash escaping in tag filter, fixes #5249
2016-06-02 12:08:13 +02:00
8ab324988c
Merge branch 'v3.0.x'
2016-06-02 09:57:20 +02:00
1283461b89
fix(gzip): add plugin proxy to gzip exclusion, fixes #5237
2016-06-02 09:56:53 +02:00
38790e2c4b
fix(elasticsearch): fixed templating lucene / json escaping issue, fixes #5228 , fixes #5227
2016-06-02 09:54:28 +02:00
aa718b4dce
Merge pull request #5253 from minkikim89/fix_seperate_typo
...
fixed separate typo
2016-06-02 07:42:04 +02:00
2d09dfd34f
Using variadic argument to StringFallback implementation
2016-06-02 01:46:18 -03:00
8db00073b4
Merge pull request #5232 from peggyl/peggyl/fix-tags-popover-text
...
Fix wording of the dashboard tags popover text
2016-05-31 19:47:24 +02:00
d36c1769e0
Fix wording of the dashboard tags popover text
2016-05-31 17:29:31 +00:00
53ecb4c1ae
Merge pull request #5222 from akiomik/patch-1
...
Fixed assets urls in 500.html
2016-05-31 07:59:24 +02:00
616dd5c4a5
Fixed assets urls in 500.html
2016-05-31 14:26:13 +09:00
2edb0ad94d
feat(influxdb): adds spread functionallity
...
closes #5211
2016-05-30 14:23:24 +02:00
f8a535c6e8
Merge pull request #5195 from matschaffer/cloudwatch_metric_update_elasticbeanstalk
...
Add metrics for AWS/ElasticBeanstalk
2016-05-30 08:05:09 +02:00
f1bd614770
Merge pull request #5183 from nfnty/master
...
package.json: Upgrade grunt-contrib-compress, Fixes #5071
2016-05-30 08:02:00 +02:00
1ea54049d0
feat(templating): added new template variable type constant
2016-05-28 16:59:29 +02:00
ca8543348b
docker(): added collectd system metrics collector that writes to graphite, just for testing
2016-05-28 10:13:51 +02:00
cf87e8ecf5
Fix parsing of intervals. defined in ms ( #5151 )
...
* Fix parsing of intervals. defined in ms
Fix parsing of intervals. defined in ms.
Increase accuracy for sub-second inrevals.
Closes #5008
* Tests for sub-ms intervals
Unit test for https://github.com/grafana/grafana/commit/2034d4b9710b0cb9fd0cdf14aa9981cd0417eda4
2016-05-27 17:26:20 +02:00
a6afd85526
Merge pull request #5197 from minkikim89/fixtypo
...
Fixed type
2016-05-27 16:57:07 +02:00
bf90fbc678
fix(templating): fixed failing templating unit test
2016-05-27 09:23:08 +02:00
2b9d260686
docs(rebuild): Include new http api preferences docs in menus ( #5194 )
...
This updates the mkdocs.yml source file such that the HTTP Preferences
API is included in the website navigation bar and in the HTTP API
overview page.
This commit also refreshes the docs/README.md file with more verbose
instructions for building and viewing the documentation locally.
* Original issue: #5069 Document org & user preferences HTTP docs
* Original PR: #5087
Closes #5193
2016-05-27 08:58:42 +02:00
18f704533f
Add enhanced elasticbeanstalk metrics
2016-05-27 11:47:53 +09:00
aedba5411c
Add basic metrics for AWS/ElasticBeanstalk
2016-05-27 11:30:16 +09:00
696fad702f
Merge branch 'v3.0.x'
...
Conflicts:
public/app/features/templating/templateValuesSrv.js
2016-05-26 14:21:17 +02:00
724a511995
fix(templating): fixed issue with value being shown instead of it's text representation, fixes #5172
2016-05-26 13:18:02 +02:00
90c9c70416
fix(): another fix for panel image rendering
2016-05-26 08:49:55 +02:00
f8a4661d05
Merge branch 'master' of github.com:grafana/grafana
2016-05-26 08:37:19 +02:00
dd494e648a
fix(rendering): fixed issue with phantomjs panel rendering
2016-05-26 07:45:53 +02:00
c9d6321f38
Allow for proxying Authorization header and automatically convert ( #4832 )
...
Authorization header to X-DS-Authorization in backend_srv.js
2016-05-26 07:13:29 +02:00
4038b4d17e
Set active org through admin api ( #5179 )
2016-05-26 06:51:23 +02:00
46551e9d65
package.json: Upgrade grunt-contrib-compress, Fixes #5071
2016-05-26 01:03:22 +02:00
1060eeb197
feat(dashboard): include org id query parameter in dashboard url, #1613
2016-05-25 17:06:41 +02:00
f923edc424
Merge branch 'v3.0.x'
2016-05-25 12:29:35 +02:00
2712d9ae8b
Update latest.json
2016-05-25 12:23:32 +02:00
3312a042dd
docs(): updated download links
2016-05-25 11:50:00 +02:00
5040570ea9
docs(): updated changelog
2016-05-25 11:07:29 +02:00
f5c5d1b1da
Merge branch 'master' of github.com:grafana/grafana
2016-05-25 11:04:27 +02:00
2cd6c2e7e0
Merge branch 'v3.0.x'
2016-05-25 11:04:12 +02:00
0daadc954c
fix(templating): fixed issue with detecting data source variable in other template variable definition, fixes #5165
2016-05-25 10:46:55 +02:00
ec98b7d672
docs(changelog): add note about fix for 5167
2016-05-25 10:01:49 +02:00
8c2b6b532d
fix(preferences): fixes broken default home dashboard
...
closes #5167
2016-05-25 09:56:45 +02:00
71d62012e1
fix(panel): fixed issue with fullscreen panel view and switching to another dashboard, fixes #5163
2016-05-25 09:46:15 +02:00
41deea90ee
feat(dashboard): template variable changes updates url, closes #5002
2016-05-24 16:34:17 +02:00
bergquist
Torkel Ödegaard
Torkel Ödegaard
Daker Fernandes Pinheiro
Peggy Li
Akiomi KAMAKURA
hc4
Tim Bielawa
Mat Schaffer
Jared Wiltshire
Mukesh
nfnty