public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,208 Commits 655 Branches 650 Tags
ebec02ffaedc48a4e11dbdda4a15fe3cc9824a2e
Commit Graph
9208 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist ebec02ffae style(elastic): minor code style changes 2016-12-09 11:40:00 +01:00
bergquist 99c5f7d571 feat(elastic): remove support for ES 1.x 2016-12-09 11:34:19 +01:00
bergquist 873024b917 tech(elastic): use bool conditions for all es queries 2016-12-09 11:13:28 +01:00
bergquist 6440d884db elastic: make sure old tests are for es2 2016-12-06 14:17:03 +01:00
bergquist 005a17d52f Merge branch 'master' of https://github.com/lpic10/grafana into lpic10-master 2016-12-06 10:15:36 +01:00
bergquist 464553a453 docs: explains how to use comment chars in passwords 2016-12-06 09:48:56 +01:00
bergquist 8f1ed07275 metrics: 64bit fields should come first in structs 
https://golang.org/pkg/sync/atomic/#pkg-note-BUG
 2016-12-06 09:08:51 +01:00
bergquist 21353f4ba5 docs: adds note about closing #6779 2016-12-06 09:08:50 +01:00
Torkel Ödegaard 9bb440bc82 Merge branch 'master' of github.com:grafana/grafana 2016-12-06 09:02:51 +01:00
Torkel Ödegaard 62269bb894 change(influxdb): always specify absolute time range in milliseconds, refactoring #6571 2016-12-06 08:56:01 +01:00
Torkel Ödegaard c6bb86d833 Merge branch 'master' of https://github.com/ryantxu/grafana into ryantxu-master 2016-12-06 08:38:29 +01:00
jifwin e73b82d54f Disable web-security for phantomjs rendering (#6469) 2016-12-06 08:37:36 +01:00
Ben RUBSON e51525dbde Only take bar series to calculate barWidth (#6756) 
* Only take bar series to calculate barWidth

solves #6751

* Typo

* Typo

* Typo

* Typo

* Refactor

* Simplify
 2016-12-06 08:36:23 +01:00
Mitsuhiro Tanda 5f6a3ecd56 (cloudwatch) don't expand variable when panel or row repeat is used (#6618) 
* (cloudwatch) don't expand variable when panel or row repeat is used

* fix test
 2016-12-06 08:16:41 +01:00
Mitsuhiro Tanda be26c017f6 (cloudwatch) percentile support (#6634) 
* support extended statistics

* handle different response format for extended statistics
 2016-12-06 08:12:30 +01:00
Torkel Ödegaard d56b9a720a feat(alerting): added confirm text when removing panel with alert rule 2016-12-06 08:11:21 +01:00
Adrian Muraru f91fcaf5cf Dashboard PNG export (#6644) 2016-12-06 08:05:13 +01:00
Torkel Ödegaard 167936f9b9 updated changelog 2016-12-06 07:43:39 +01:00
Torkel Ödegaard ee36234196 Merge branch 'v4.0.x' 2016-12-06 07:42:35 +01:00
Torkel Ödegaard f9fba0e935 fix(timerange): fixed time range zoom out shortcut, fixes #6837 2016-12-06 07:42:22 +01:00
Torkel Ödegaard 88e1d56bc2 fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829 2016-12-06 07:36:10 +01:00
Torkel Ödegaard 4c406dec2f cleanup(): removed unused (old) migrate stuff 2016-12-05 12:52:34 +01:00
Torkel Ödegaard aea3093d85 change(Timepicker): removed last 90 days to make room for Last 2 days, #6758 2016-12-05 11:52:00 +01:00
Jaime Soriano Pastor f2d5829944 Add 'Last 2 days' option to quick ranges (#6758) 2016-12-05 11:51:02 +01:00
Torkel Ödegaard 37c1a49dc9 updated changelog 2016-12-05 11:44:50 +01:00
Torkel Ödegaard 50022253bd Merge branch 'v4.0.x' 2016-12-05 11:44:02 +01:00
Torkel Ödegaard 890e5ce8ca feat(playlist): added support for kiosk mode & minor polish/fix, closes #6727 2016-12-05 11:43:51 +01:00
Torkel Ödegaard 80f7a6a896 updated changelog 2016-12-05 11:20:54 +01:00
Torkel Ödegaard 1f50c6d76f Merge branch 'v4.0.x' 2016-12-05 11:20:14 +01:00
Torkel Ödegaard cc46b81961 fix(rendering): fixed server side rendering issue when sertting enforce_domain to true, fixes #6769 2016-12-05 11:20:01 +01:00
Torkel Ödegaard c5ff1e4584 Merge branch 'v4.0.x' 2016-12-05 11:04:24 +01:00
Torkel Ödegaard a9c0f66cda fix(influxdb): Fix for Ad-Hoc Filters variable & changing dashboards, fixes #6821 2016-12-05 11:04:05 +01:00
Torkel Ödegaard e1d52902c1 Merge branch 'master' of github.com:grafana/grafana 2016-12-05 10:54:40 +01:00
Torkel Ödegaard d1feaaf4f3 Merge branch 'v4.0.x' 2016-12-05 10:54:01 +01:00
Torkel Ödegaard ab07667b69 fix(rendering): minor fix for server side rendering when using non default http addr setting and non default domain setting, #6813 2016-12-05 10:51:46 +01:00
silvestre-abruzzo 48a14cb4c6 Use correct domain in render.js (#6813) 
Phantomjs is always rendering login page because domain is not considered. According to http://phantomjs.org/api/webpage/method/add-cookie.html a correct domain must be passed. Probably this change is now necessary due to https://github.com/grafana/grafana/issues/6660
 2016-12-05 10:50:23 +01:00
bergquist b81e97c99c webhook: adds json content-type 
closes #6822
 2016-12-05 10:46:04 +01:00
bergquist 4a2a935c8f changelog: adds note about closing #6822 2016-12-05 10:45:22 +01:00
bergquist 87dbdb8300 webhook: adds json content-type 
closes #6822
 2016-12-05 10:44:31 +01:00
bergquist 1b68116922 changelog: add bugfix header 2016-12-05 09:42:31 +01:00
bergquist ea829988da changelog: add note about closing #6807 2016-12-05 09:39:20 +01:00
bergquist 0403f53b6f feat(webhook): adds alert rule message to webhook 
close #6807
 2016-12-05 09:34:35 +01:00
bergquist b88478a7e5 docs(readme): remove link to old CLA page 2016-12-03 03:46:51 +01:00
Carl Bergquist fbf2113904 Merge pull request #6795 from hvnsweeting/patch-1 
Use space to separate multiple modes
 2016-12-03 03:15:31 +01:00
bergquist 6c9cf87080 feat(alerting): calculate avg of valid points 2016-12-02 23:44:14 +01:00
bergquist c9b7f8603e tech(): replace spaces to handle input more graceful 2016-12-02 23:43:02 +01:00
bergquist 9dd6cf45ac feat(webhook): adds alert rule message to webhook 
close #6807
 2016-12-02 22:24:36 +01:00
bergquist 96cd13044b change to golang 1.7.4 2016-12-02 21:27:12 +01:00
bergquist f70d7ff3a3 fix(influxdb): align tsdb.influxdb with dataproxy 
ref #6784
 2016-12-02 21:10:29 +01:00
bergquist 368889828d update latest.json to 4.0.1 2016-12-02 21:10:11 +01:00