Torkel Ödegaard
|
a5c0295a0e
|
docs(): updated doc download links
|
2016-11-21 10:18:43 +01:00 |
|
Torkel Ödegaard
|
c643466d57
|
bumped version to v4-beta2
|
2016-11-21 09:51:59 +01:00 |
|
bergquist
|
2b6013ce81
|
fix(notifications): failed image upload should not stop notification
closes #6638
|
2016-11-21 09:47:59 +01:00 |
|
Torkel Ödegaard
|
6fa4b8c0b6
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-11-21 09:42:46 +01:00 |
|
Torkel Ödegaard
|
8d80812601
|
Merge branch 'issue-6566' of https://github.com/benrubson/grafana into benrubson-issue-6566
|
2016-11-21 09:39:35 +01:00 |
|
Torkel Ödegaard
|
c1a15648c7
|
Merge branch 'master' of github.com:grafana/grafana into getting-started-panel
|
2016-11-21 09:00:40 +01:00 |
|
benrubson
|
e71114f4fb
|
Come back to #6287 for graph_tooltip.js
as it is an only one loop solution
|
2016-11-19 09:12:10 +01:00 |
|
benrubson
|
9797845460
|
Typo
|
2016-11-18 19:14:12 +01:00 |
|
benrubson
|
0034b6ede7
|
Highlight correct point when series has null values
|
2016-11-18 18:49:20 +01:00 |
|
benrubson
|
1eb0ea3450
|
Correctly stack series with null and missing values
|
2016-11-18 18:14:40 +01:00 |
|
benrubson
|
becb6303e5
|
Revert #6287 for graph_tooltip.js
|
2016-11-18 17:50:54 +01:00 |
|
Torkel Ödegaard
|
1dc581bdfa
|
ux(gettingstarted): progress on getting started panel, #6466
|
2016-11-18 17:42:14 +01:00 |
|
bergquist
|
5dea0fda51
|
fix(settings): remove nil pointer exception
|
2016-11-18 16:43:14 +01:00 |
|
benrubson
|
850d39fc50
|
Revert #6287 for jquery.flot.stack.js
|
2016-11-18 16:32:00 +01:00 |
|
Torkel Ödegaard
|
fd512457d8
|
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
|
2016-11-18 16:31:54 +01:00 |
|
Torkel Ödegaard
|
0c9001c7ae
|
ux(gettingstarted): progress on getting started panel, #6466
|
2016-11-18 16:31:19 +01:00 |
|
bergquist
|
1b0005a9e5
|
feat(mqe): add support for app and host alias
|
2016-11-18 11:40:38 +01:00 |
|
bergquist
|
61bb9cbc13
|
test(alerting): fixes broken unit test
|
2016-11-18 10:53:27 +01:00 |
|
Ryan McKinley
|
7958615097
|
Use ms rather than second precision
|
2016-11-17 09:21:25 -08:00 |
|
bergquist
|
a3b0fbcaba
|
fix(influxdb): fixes broken tag rendering for influxdb alerting
closes #6626
ref #6523
|
2016-11-17 15:50:49 +01:00 |
|
Torkel Ödegaard
|
7ce33c31ec
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-11-17 15:50:08 +01:00 |
|
Torkel Ödegaard
|
b9cfb19ab8
|
changelog(): added entry for PR #6579
|
2016-11-17 15:50:00 +01:00 |
|
Torkel Ödegaard
|
e34bf9a1fa
|
Merge branch 'utkarshcmu-or_alerting'
|
2016-11-17 15:49:52 +01:00 |
|
Torkel Ödegaard
|
62e8a039a1
|
refactor(alerting): refactoring PR for OR conditions, #6579
|
2016-11-17 15:48:15 +01:00 |
|
bergquist
|
3ea66ebe3f
|
fix(alerting): remove possible divide by zero panic
ref #6599
|
2016-11-17 15:20:14 +01:00 |
|
Torkel Ödegaard
|
457ae74343
|
Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting
|
2016-11-17 14:43:24 +01:00 |
|
Torkel Ödegaard
|
98d1748e43
|
fix(templating): work on fixing exporting issues when using templating variables, like data source variables, and panel repeats, requires more work #6189
|
2016-11-17 12:32:11 +01:00 |
|
Torkel Ödegaard
|
9d5928ddd6
|
feat(templating): don't persist template variable options when variable has refresh enabled, closes #6586
|
2016-11-17 11:38:06 +01:00 |
|
Torkel Ödegaard
|
eafe0d6bfa
|
fix(templating): fixed issue when adding template variable, fixes #6622
|
2016-11-17 11:28:33 +01:00 |
|
utkarshcmu
|
aae33b36dd
|
Added tests for firingEvaluation string
|
2016-11-17 01:41:23 -08:00 |
|
Torkel Ödegaard
|
196fdbfd31
|
fix(dashboard): fixed issue when dragging new panel to drop zone
|
2016-11-17 10:31:37 +01:00 |
|
utkarshcmu
|
fc82dac868
|
Added braces to single condition firingEvaluation string
|
2016-11-17 01:30:50 -08:00 |
|
utkarshcmu
|
690868c837
|
Added firingEvalution to Rule test
|
2016-11-17 01:28:17 -08:00 |
|
Torkel Ödegaard
|
a45fdfdd3f
|
fix(dashboard): minor fixes, and restored in-activity timer to 1min
|
2016-11-17 10:11:59 +01:00 |
|
bergquist
|
5c153f0383
|
Merge branch 'master' into alerting_mqe
|
2016-11-17 09:57:56 +01:00 |
|
bergquist
|
0a0f558c48
|
style(mqe): improve code
|
2016-11-17 08:52:27 +01:00 |
|
bergquist
|
23387bd39b
|
feat(mqe): simplify timestamp parsing
|
2016-11-17 08:42:09 +01:00 |
|
ichekrygin
|
f6b70c7d82
|
Fix formatting
|
2016-11-16 17:30:42 -08:00 |
|
ichekrygin
|
acc729131a
|
Add VictorOps Test.
|
2016-11-16 16:14:02 -08:00 |
|
ichekrygin
|
8f0d51171d
|
Resolve rebase w/ upstream conflicts.
Remove: `Alert on Exec Error` (no longer needed)
Add: `ruleUrl` to VictorOps message body.
|
2016-11-16 16:13:33 -08:00 |
|
ichekrygin
|
bbca9861fb
|
Fix return on nil and cleanup debug messages
|
2016-11-16 14:02:34 -08:00 |
|
ichekrygin
|
b46cbc5fbe
|
Add option to alert on ExecutionError
|
2016-11-16 14:02:34 -08:00 |
|
ichekrygin
|
4ca304b756
|
Change VictorOps fa from fa-exclamation-triangle -> fa-pagelines
|
2016-11-16 14:02:34 -08:00 |
|
ichekrygin
|
1e558e3936
|
Fix user-facing text
|
2016-11-16 14:02:34 -08:00 |
|
ichekrygin
|
b0620a9d4b
|
Add VictorOps alert notification capability
|
2016-11-16 14:02:34 -08:00 |
|
Torkel Ödegaard
|
42167a65c6
|
testdata(): added test graph for null stacking scenario, #6566
|
2016-11-16 19:00:23 +01:00 |
|
Torkel Ödegaard
|
f52c6aafe7
|
docs(): minor update to centos docs about font packages needed for phantomjs
|
2016-11-16 18:49:14 +01:00 |
|
Torkel Ödegaard
|
4581bb4a7a
|
fix(singletat): Support repeated template variables in prefix/postfix, fixes #6595
|
2016-11-16 18:44:39 +01:00 |
|
Torkel Ödegaard
|
e6776f71d9
|
cleanup(sass): removed tight-form styles
|
2016-11-16 18:26:39 +01:00 |
|
Torkel Ödegaard
|
d7e8753c59
|
cleanup(): removed unused gfbox style
|
2016-11-16 18:08:45 +01:00 |
|