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
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
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
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
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
bergquist
4fdfee739a
fix(influxdb): add support for regex measurments
...
closes #6560
2016-11-14 08:48:19 +01:00
bergquist
a87fd11f26
feat(stats): add alerts to global admin stats
2016-11-11 14:04:38 +01:00
bergquist
ad97db937c
feat(stats_usage): add stats about alerts
2016-11-11 13:57:11 +01:00
bergquist
e04d27c0b0
fix(influxdb): return internal influxdb errors
...
ref #6523
2016-11-11 08:47:53 +01:00
bergquist
f924b241ae
tech(influxdb): refactor query builder
...
trying to reduce the amounts of moving parts for influxdb
2016-11-10 14:38:07 +01:00
bergquist
a948dfe514
fix(influxdb): fixes broken raw query usage
2016-11-10 14:18:10 +01:00
Torkel Ödegaard
575828f1e9
Merge branch 'getting-started-panel' of github.com:grafana/grafana into getting-started-panel
2016-11-10 13:25:18 +01:00
bergquist
ecba23e883
Merge branch 'master' into influxdb_alias_seriename
2016-11-10 12:22:17 +01:00
bergquist
4f3c8c6663
fix(influxdb): add default operator
...
ref #6523
2016-11-10 11:21:38 +01:00
bergquist
ef08a243c5
fix(influxdb): fixes possible nil pointer
...
closes #6531
2016-11-10 08:23:58 +01:00
bergquist
82e1d3f6aa
feat(influxdb): disable debug logging in appmode
2016-11-09 14:48:05 +01:00
bergquist
f0a0e647a0
feat(influxdb): backend support for alias by segment
...
ref #6510
2016-11-09 12:45:59 +01:00
Torkel Ödegaard
fb57bf77da
ux(getting started): progress on getting started panel and persited help flag states, #6466
2016-11-09 10:41:39 +01:00
bergquist
c897d39d5e
feat(influxdb): add support for serie alias replacement
...
ref #6510
2016-11-09 10:22:11 +01:00
bergquist
24a3a100ed
feat(influxdb): add alias to query
2016-11-09 10:05:12 +01:00
bergquist
eb34855adb
feat(pagerduty): add support for auto resolve
...
closes #6513
2016-11-08 20:38:38 +01:00
utkarshcmu
610ea090dc
Send test notification fixed
2016-11-08 11:22:03 -08:00
bergquist
5542b0ab9e
tech(pagerduty): sync calls should be using context
2016-11-08 20:05:43 +01:00
bergquist
98a7bf181a
tech(influxdb): close body reader
2016-11-08 19:19:49 +01:00
Torkel Ödegaard
fd09f17cd3
docs(): alerting docs, #6490
2016-11-08 14:53:28 +01:00
utkarshcmu
841fb74b39
Reversed loop for last function
2016-11-07 23:16:57 -08:00
utkarshcmu
74632b5e98
Added last function for alerting conditions
2016-11-07 23:16:57 -08:00
bergquist
5bbdd99d35
tech(notifications): remove async webhook
2016-11-08 08:06:42 +01:00
bergquist
66f257e382
tech(pagerduty): make api call sync
2016-11-08 07:51:19 +01:00
bergquist
7bc80d0374
tech(pagerduty): declare url as constant
2016-11-08 07:50:58 +01:00
bergquist
6dd076efc1
Merge branch 'alerting_pagerduty' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_pagerduty
2016-11-08 07:48:20 +01:00
Roger Swingle
69ff13adce
add govcloud
2016-11-07 13:56:29 -05:00
utkarshcmu
5549d8658a
Fixed description message
2016-11-07 07:27:31 -08:00
utkarshcmu
f8d1eb11a9
Removed ExecError state
2016-11-07 07:12:43 -08:00
utkarshcmu
4b53ea0a56
Fixed pagerduty tests
2016-11-07 07:08:52 -08:00
utkarshcmu
638d3bcb42
Removed NoData option
2016-11-07 07:08:51 -08:00
utkarshcmu
de0fa3d479
Added pagerduty tests
2016-11-07 07:08:51 -08:00
utkarshcmu
df8cd764b2
Added trigger options with Pagerduty
2016-11-07 07:08:51 -08:00
utkarshcmu
139bbecc10
Added Pagerduty basic alerting
2016-11-07 07:08:51 -08:00
Carl Bergquist
3607316920
Merge pull request #6489 from bergquist/reduce_notification_states
...
Reduce alerting states
2016-11-07 15:18:07 +01:00
bergquist
56340bfdfb
fix(influxdb): fixes bug when using regexps/numbers in tags
...
closes #6488
2016-11-07 14:26:20 +01:00
bergquist
d7f11c304c
tech(alerting): set prev state when creating eval context
2016-11-07 13:01:54 +01:00
bergquist
489f087fbd
feat(alerting): reduce states. Make exeuction result configurable.
...
ref #6444
2016-11-07 12:42:39 +01:00
Carl Bergquist
d670f1b959
Merge pull request #6479 from utkarshcmu/playlist_bug
...
Removed playlist item when dashboard is deleted
2016-11-07 08:00:57 +01:00
bergquist
f0b591b89b
feat(alerting): extract logic state updates and notifications
...
ref #6444
2016-11-07 07:57:34 +01:00
Torkel Ödegaard
2d19af601a
fix(alerting): various alerting fixes
2016-11-06 15:40:02 +01:00
utkarshcmu
c737704eeb
Removed playlist item when dashboard is deleted
2016-11-06 01:49:43 -08:00
utkarshcmu
dc3a62da83
Added slack tests , fixed webhook tests
2016-11-04 06:05:44 -07:00
utkarshcmu
2f60929d1e
Added slack mention functionality
2016-11-04 06:05:44 -07:00
Torkel Ödegaard
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
bergquist
f0d9d133c6
tech(slack): format code using gofmt
2016-11-04 07:55:15 +01:00
bergquist
2d7bb4a9f3
fix(tsdb): broken build :(
2016-11-03 19:20:53 +01:00
bergquist
b578d06e4a
chore(notification): improve log message
2016-11-03 18:04:50 +01:00
bergquist
1afe0e90f9
fix(tsdb): fixes broken legend buidler for prometheus
...
closes #6456
2016-11-03 18:04:09 +01:00
bergquist
0059beb85d
chore(tsdb): remove commented code
2016-11-03 17:34:57 +01:00
bergquist
4af420f759
tech(alerting): refactor how evalhandler uses conditions
2016-11-03 17:31:36 +01:00
bergquist
c138b04c5e
feat(alerting): avoid double logging
2016-11-03 07:25:00 +01:00
bergquist
ff5d4e8e0c
fix(alerting): temp fix for broken AND condition
...
This should be refactored. lets return condition results instead
of setting new value on the evalContext. The condition execution
should only be able to update its own state.
closes #6449
2016-11-03 07:18:39 +01:00
Carl Bergquist
89a3d023ce
Merge pull request #6453 from utkarshcmu/alert_message_typo
...
Log bad alert config and fixed alert message typo
2016-11-03 07:12:36 +01:00
Carl Bergquist
bb7f03c91e
Merge pull request #6446 from utkarshcmu/graphite_alerting_fix
...
Fixed intervalFormat for Graphite Alerting
2016-11-03 06:58:51 +01:00
utkarshcmu
fc91231104
Fixed failing tests
2016-11-02 22:31:59 -07:00
utkarshcmu
d009c6b953
Log bad alert config
2016-11-02 18:22:24 -07:00
utkarshcmu
942de5497e
Fixed alert message typo
2016-11-02 18:13:11 -07:00
bergquist
d1d7c240f9
tech(mailer): dont use deprecated method
2016-11-02 22:11:59 +01:00
utkarshcmu
33ee85ede9
Commented strange behavior of tests
2016-11-02 11:11:06 -07:00
utkarshcmu
a4a2e35bb2
Verified interval format function and gofmt check
2016-11-02 02:07:08 -07:00
bergquist
d4bc92b267
feat(tsdb): default tsdb httpclient
2016-11-02 08:51:34 +01:00
utkarshcmu
2088363bf9
Added tests for graphite alerting
2016-11-02 00:00:18 -07:00
