bergquist
276916cd5d
docs(changelog): note about closing #7035
2017-01-17 10:05:56 +01:00
bergquist
ed9595a20d
Merge branch 'show_no_data_in_list'
2017-01-17 09:53:38 +01:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
Torkel Ödegaard
0683742e83
tech(library upgrade): fixed unit test broken by angularjs upgrade, #7274
2017-01-16 22:27:35 +01:00
Torkel Ödegaard
6f87f88690
tech(lib upgrade): upgraded angularjs from 1.5.8 to 1.6.1, closes #7274
2017-01-16 21:31:55 +01:00
Torkel Ödegaard
710d07d7a5
Merge branch 'mtanda-clipboard_js'
2017-01-16 21:08:47 +01:00
Torkel Ödegaard
c5955bacd2
refactor(): minor refactor
2017-01-16 21:08:39 +01:00
Torkel Ödegaard
09cec8535e
Merge branch 'clipboard_js' of https://github.com/mtanda/grafana into mtanda-clipboard_js
2017-01-16 20:57:16 +01:00
Mitsuhiro Tanda
d683b0379b
fix monkey patch for clipboard.js
2017-01-17 01:12:37 +09:00
bergquist
f29f83ca75
chore: adds comment out why the code was added
2017-01-16 15:04:53 +01:00
bergquist
3c9357a2e9
fix(alerting): supports lowercase metrics
...
this fix is due to EvalMatch now serailize as lower case.
ref #7257
2017-01-16 15:01:57 +01:00
bergquist
01c6658a7a
docs(changelog): adds note about closing #7269
2017-01-16 14:42:31 +01:00
bergquist
bfa3c590e7
fix(alertlist): changes scroll to auto
...
close #7269
2017-01-16 14:38:01 +01:00
bergquist
22601fa736
docs(changelog): adds note about closing #7209
2017-01-16 12:48:29 +01:00
bergquist
76c9f62265
Merge branch 'Ricky-N-feature/dataProxyAuditLog'
2017-01-16 12:44:40 +01:00
bergquist
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
bergquist
d4a96b9741
tech(dataproxy): make the code a little bit more defensive
2017-01-16 12:24:08 +01:00
bergquist
dd84fb563a
style(dataproxy): renames log functions
2017-01-16 12:23:49 +01:00
bergquist
51bca7d84b
tech(dataproxy): moves all parameters to Info call
2017-01-16 12:16:41 +01:00
bergquist
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
xginn8
873a8bc520
wrap the title of a panel and dashboard search results. fixes #7203 ( #7213 )
2017-01-16 12:02:07 +01:00
bergquist
ee1c15b9cc
docs(changelog): adds note about closing #7234
2017-01-16 11:54:38 +01:00
bergquist
99f18f9d69
merge branch 'oliverpool-diff-aggregate'
2017-01-16 11:52:34 +01:00
bergquist
480a58d377
Merge branch 'diff-aggregate' of https://github.com/oliverpool/grafana into oliverpool-diff-aggregate
2017-01-16 11:52:22 +01:00
bergquist
8a8de91a8b
Merge branch 'andrewhowdencom-master'
2017-01-16 11:50:23 +01:00
bergquist
2fdb47ae97
docs(prometheus): rewrote and shorten the note about templates
2017-01-16 11:50:12 +01:00
bergquist
2696d6cd3f
Merge branch 'master' of https://github.com/andrewhowdencom/grafana into andrewhowdencom-master
2017-01-16 11:47:13 +01:00
bergquist
c73e86e557
docs(testdata): some minor changes
2017-01-16 11:21:23 +01:00
bergquist
ae08386ce3
docs(testdata): adds docs page about test datasource
2017-01-16 11:13:52 +01:00
bergquist
92f0a22fd7
docs: moves datsources pages to feature folder
2017-01-16 11:13:27 +01:00
bergquist
bd414c1793
docs: moves panels to panel folder
2017-01-16 08:17:37 +01:00
bergquist
20bdc48f13
docs(guides): remove (Latest) from menu name
2017-01-16 08:15:47 +01:00
bergquist
f4713956f0
tech: updates latest.json to 4.1.1
2017-01-16 07:07:32 +01:00
bergquist
eb8d1dfa34
docs(smtp): adds info about how to use passwords with #
...
closes #7265
2017-01-16 07:03:35 +01:00
bergquist
62eaa683c0
docs(changelog): note about closing #7256
2017-01-16 07:00:51 +01:00
And^Cw Howden
6edbc4604c
Add additional documentation about Prometheus + Templated queries
2017-01-15 20:56:53 +01:00
Ryuichi Sakai
1bc55a2d38
Enable image rendering to use browser time offset
2017-01-15 22:01:28 +09:00
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
deff24d2c1
Merge branch 'clipboard_js' of https://github.com/mtanda/grafana into mtanda-clipboard_js
2017-01-13 14:57:23 +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
Mitsuhiro Tanda
1672ca4edb
call clipboard destroy()
2017-01-13 02:58:44 +09:00
Mitsuhiro Tanda
3df119002d
patch for clipboard.js work
2017-01-13 02:19:02 +09: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
