IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,535 Commits 1,121 Branches 715 Tags
e5a6c523d779ca9d2723df5b5fa2130d9852bc72
Commit Graph
9535 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard e5a6c523d7 Merge branch 'master' of github.com:grafana/grafana 2017-01-13 17:39:41 +01:00
Torkel Ödegaard 49fe74228b fix(browser history): fixes and enhancements to browser history, it now works properly again AND it can restore previous time ranges in dashboards, closes #7259 2017-01-13 17:37:53 +01:00
Carl Bergquist c43bb7fb99 Extractor should not modify dashboard json (#7256) 
* test(dashboard): tests that he extractor does not modify original json

* feat(extractor): validate a cloned version of the dashboard json
 2017-01-13 15:46:23 +01:00
bergquist 2d441bfb37 docs(changelog): note about closing #7149 2017-01-13 15:20:15 +01:00
Carl Bergquist 1efeaafdbf Merge pull request #7249 from grafana/alerting_test_alertrule 
Enable error and no_data overrides when testing alerting.
 2017-01-13 15:18:02 +01:00
Torkel Ödegaard d354f3a8af fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247) 
* fix(alerting): fixed evaluation for no_value condition, fixes #7244

* feat(alerting): moving null library into grafana, fixing handling on no value / no series
 2017-01-13 12:32:30 +01:00
bergquist 0873d493c2 feat(alerting): moves getNewState to evalHandler 
closes #7149
 2017-01-13 11:02:24 +01:00
rrickardt bccdd7cad1 Update postinst (#7233) 
With present postinst script on Centos 7, restart after upgrade is not working with Warning: grafana-server.service changed on disk. Run 'systemctl daemon-reload' to reload units.

So i added systemctl daemon-reload.
 2017-01-13 06:27:36 +01:00
Tomas Varneckas 54c456ec5b Make API key usage example meaningfully runable (#7243) 2017-01-13 06:25:49 +01:00
Carl Bergquist 13178d99d4 Merge pull request #7240 from tomasv/fix-tags-api-doc 
Fix typo in tags API documentation example request
 2017-01-12 17:08:14 +01:00
Tomas Varneckas 9449e93e1e Fix typo in tags API documentation example request 2017-01-12 17:55:43 +02:00
bergquist 60a2041065 tech(build): yarn install should use --pure-lockfile 2017-01-12 15:36:44 +01:00
bergquist 915b1efab9 tech(build): updates deps in yarn 2017-01-12 15:33:07 +01:00
bergquist 9a35d82e51 docs(singlestat): its called avg in grafana 
ref #7234
 2017-01-12 13:36:10 +01:00
bergquist 35db025b0a docs(installation): updates docs for 4.1.1 2017-01-12 10:38:23 +01:00
Torkel Ödegaard 821876a85b Merge branch 'master' of github.com:grafana/grafana 2017-01-11 19:48:17 +01:00
Torkel Ödegaard b8b517cd3f docs(): updated changelog 2017-01-11 19:48:06 +01:00
Mitsuhiro Tanda 4b567e35d5 suppress refresh when user is inactive (#7219) 2017-01-11 19:46:34 +01:00
Torkel Ödegaard f045fbf267 Merge branch 'master' of github.com:grafana/grafana 2017-01-11 19:40:59 +01:00
Torkel Ödegaard 9c0f7f547b fix(alerts): added alert listener for appEvents 2017-01-11 19:40:05 +01:00
Torkel Ödegaard 61214899bd docs(): updated changelog 2017-01-11 15:26:08 +01:00
Torkel Ödegaard bd8899b37d fix(graph): fixed table legend min-height, fixes #7221 2017-01-11 15:24:43 +01:00
Torkel Ödegaard edae622d8f docs(): updated changelog 2017-01-11 14:04:34 +01:00
Mitsuhiro Tanda 7e4c101d02 S3 IAM support (#7058) 
* add s3 dependencly

* rewrite image uploader by aws-sdk-go

* improve backward compatibility of s3 image uploading

* set default for expires option

* remove acl and expires
 2017-01-11 14:00:49 +01:00
Lee Briggs 2e796da441 Add support for sensu notifications (#7207) 2017-01-11 13:57:07 +01:00
Torkel Ödegaard 64f5146a62 change(text panel): removed rarely used (and not properly working), text mode option, closes #6389, closes #7214 2017-01-11 12:33:12 +01:00
Torkel Ödegaard cdc7da3ae1 docs(): updated changelog 2017-01-11 12:16:34 +01:00
Torkel Ödegaard b48273d1cf Merge branch 'master' of github.com:grafana/grafana 2017-01-11 12:11:38 +01:00
Torkel Ödegaard 149dd78298 Merge branch 'built_in_template_variables' 2017-01-11 12:10:33 +01:00
Torkel Ödegaard b475f91387 feat(templating): completed work on built in template variables and , closes #7190, refactors #7170 2017-01-11 12:10:26 +01:00
bergquist 5e14f4a16e tech(build): changes build for 4.1 release 2017-01-11 11:07:01 +01:00
bergquist 8574f100aa docs(guides): removes beta info for 4.1 2017-01-11 10:50:41 +01:00
Torkel Ödegaard 44b7a26119 fix(graph): fix for table legend and scroll, fixes #7204, fixes #6628 2017-01-11 10:35:52 +01:00
Torkel Ödegaard 8c39cd35f0 progress on interval built in variable 2017-01-11 10:18:21 +01:00
bergquist f4e9bd507b tech(build): updates packagecloud script 2017-01-11 08:59:44 +01:00
Utkarsh Bhatnagar 7e3ccdf983 Fixed opentsdb templating bug (#7208) 2017-01-10 21:35:05 +01:00
bergquist 6518a0f765 Merge branch 'docs-4.1' 2017-01-10 15:37:07 +01:00
bergquist 50b937dcb1 tech(build): updates docs to 4.1.0 2017-01-10 15:36:54 +01:00
bergquist 4d0b5ca14a tech(build): upgrades appveyour nodejs version 2017-01-10 15:01:53 +01:00
bergquist 381f8d4475 docs(changelog): adds note about closing #7195 2017-01-10 10:30:28 +01:00
Carl Bergquist edf868d46b Merge pull request #7195 from theisenmark/webhook-username 
Fix webhook username mismatch
 2017-01-09 18:03:34 +01:00
Mark Theisen afda9cbb2d Fix webhook username mismatch 
Fixing variable name mismatch so that the Authorization HTTP header is added to webhook notifications.
 2017-01-09 17:18:53 +01:00
bergquist 4f216f22e9 docs(http): fixes typos 2017-01-09 16:49:06 +01:00
Torkel Ödegaard e218837380 began work on built in template variables, #7190 2017-01-09 15:31:19 +01:00
Carl Bergquist bcfe048aae Merge pull request #7184 from simnv/git-via-https 
Use HTTPS instead of git to download tether-drop package
 2017-01-09 07:15:01 +01:00
Valeriy Simonov 1aa1f7b12c Use https instead of git for tether-drop 
git protocol (tcp/udp/9418) is forbidden when using some corporate
proxies. HTTPS is used more widely.
 2017-01-09 10:00:07 +05:00
Valeriy Simonov 5bfe0ab237 Merge remote-tracking branch 'grafana/master' 2017-01-09 09:37:19 +05:00
Vitaliy Fuks 7c376f2bda Fixed typo. (#7181) 2017-01-08 09:43:17 +01:00
Mekal Zheng e57c764410 check validation of interval string before converting to seconds 2017-01-07 18:17:44 +08:00
Mekal Zheng 333aeb43c4 use methods of kbn to convert interval string to both second and millisecond 2017-01-07 16:33:40 +08:00