 Daniel Lee
|
af07adb146
|
refactor(securejsondata): extract to class
Extract from pluginsettings class so that the
securejsondata type can be used in the other
classes. Encrypt and decrypt functions
extracted too.
|
2016-11-24 13:22:25 +01:00 |
|
 Joe Lanford
|
56b7e2dfaf
|
Added support for TLS client auth for datasource proxies (#5801)
|
2016-11-24 13:22:25 +01:00 |
|
 Torkel Ödegaard
|
2233938ba7
|
Merge branch 'master' into getting-started-panel
|
2016-11-24 13:17:22 +01:00 |
|
 bergquist
|
421c1eed82
|
fix(dashboard): fixes bug when saving dashboards
|
2016-11-24 11:22:13 +01:00 |
|
|
Carl Bergquist
|
df2b2e3058
|
feat(alerting): validate alerts before saving dashboard (#6691)
ref #6576
|
2016-11-24 09:50:35 +01:00 |
|
|
Torkel Ödegaard
|
ea5cb0d076
|
fix(server side rendering): Fixed address used when rendering panel via phantomjs and using non default http_addr config, fixes #6660
|
2016-11-23 15:35:43 +01:00 |
|
|
Torkel Ödegaard
|
773fb5d1ae
|
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
|
2016-11-23 14:55:10 +01:00 |
|
 Pavlos Daoglou
|
c365d52a80
|
[6486] Fix status code when adding an existing user to org (#6678)
|
2016-11-23 14:38:44 +01:00 |
|
 Tom Kozlowski
|
c21ffcc6c9
|
generalized database connection cert support and added to postgres
|
2016-11-22 15:29:22 -08:00 |
|
|
bergquist
|
6882dcfb99
|
feat(alerting): add backend support for median reducer
|
2016-11-22 14:09:35 +01:00 |
|
|
bergquist
|
50811c80ea
|
fix(alerting): fixes bug that prevents noData from triggering
closes #6631
|
2016-11-22 11:47:52 +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
|
c1a15648c7
|
Merge branch 'master' of github.com:grafana/grafana into getting-started-panel
|
2016-11-21 09:00:40 +01:00 |
|
|
bergquist
|
5dea0fda51
|
fix(settings): remove nil pointer exception
|
2016-11-18 16:43:14 +01:00 |
|
|
Torkel Ödegaard
|
fd512457d8
|
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
|
2016-11-18 16:31:54 +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 |
|
|
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
|
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 |
|
 utkarshcmu
|
aae33b36dd
|
Added tests for firingEvaluation string
|
2016-11-17 01:41:23 -08: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 |
|
|
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
|
b0620a9d4b
|
Add VictorOps alert notification capability
|
2016-11-16 14:02:34 -08:00 |
|
|
Torkel Ödegaard
|
18e965c775
|
fix(error handling): fixed server side error handling page
|
2016-11-16 17:41:44 +01:00 |
|
|
bergquist
|
9572f086ae
|
feat(mqe): add timerange to query
|
2016-11-16 17:09:34 +01:00 |
|
|
Torkel Ödegaard
|
e3564d12a1
|
fix(404): fixed 404 page
|
2016-11-16 17:09:00 +01:00 |
|
 Dan Cech
|
eacb7c8aba
|
Merge pull request #6584 from tomkozlowski/bugfix/oauth-login-bearer-token
explicitly set oauth2 token to Bearer Type
|
2016-11-16 10:35:32 -05:00 |
|
|
Tom Kozlowski
|
a353c8d1bb
|
added explicitly setting token as Bearer Type
|
2016-11-16 09:55:14 -05:00 |
|
|
bergquist
|
fa8213d8d5
|
feat(mqe): send http requests
|
2016-11-16 15:28:31 +01:00 |
|
|
bergquist
|
f1897b7e96
|
feat(mqe): add response parser
|
2016-11-16 14:42:43 +01:00 |
|
|
bergquist
|
c6ad0cc5ec
|
test(mqe): basic test for response parser
|
2016-11-16 13:00:25 +01:00 |
|
|
bergquist
|
113020aabe
|
feat(mqe): support basic aliases
|
2016-11-16 11:04:15 +01:00 |
|
|
bergquist
|
430104aaac
|
feat(mqe): add support for wildcard series
|
2016-11-16 10:03:22 +01:00 |
|
|
bergquist
|
fa92dfb7b2
|
feat(mqe): add support for apps in where clause
|
2016-11-16 09:54:45 +01:00 |
|
|
bergquist
|
ab7263579f
|
Merge branch 'master' into alerting_mqe
|
2016-11-16 09:28:26 +01:00 |
|
|
bergquist
|
4739608ffb
|
tests(mqe): add query builder
|
2016-11-15 18:37:34 +01:00 |
|
|
utkarshcmu
|
8d0bcd23f8
|
Added tests for checking nested operators
|
2016-11-15 08:07:05 -08:00 |
|
|
utkarshcmu
|
dfb1b1918c
|
Implemented operator based firiing in backend
|
2016-11-15 06:35:25 -08:00 |
|
|
bergquist
|
b9d709ab27
|
feat(alerting): improve error logging for extracting alerts
ref #6576
|
2016-11-15 11:47:46 +01:00 |
|