IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,262 Commits 5,454 Branches 554 Tags 1.9 GiB
ba7a990f86
Commit Graph

1914 Commits

Author SHA1 Message Date
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
utkarshcmu
1e8beb8983 Fixed intervalFormat for Graphite Alerting 2016-11-01 17:55:45 -07:00
Carl Bergquist
e659eb745d Merge pull request #6420 from utkarshcmu/alerting_initial_state 
Alerts not sent when state is changed from "initialized" to "ok"
 2016-11-01 18:30:14 +01:00
utkarshcmu
7490c49f60 Alert un paused to pending state 2016-11-01 07:58:38 -07:00
utkarshcmu
d9f2519916 Renamed Initialized to Pending 2016-11-01 07:30:55 -07:00
bergquist
578507ae77 tech(cli): add default settings for transport 2016-11-01 08:58:44 +01:00
Carl Bergquist
4b8d9cac6f Merge pull request #6437 from dmvk/feature/grafana-cli-proxy 
Take grafana-cli proxy settings from env
 2016-11-01 08:53:23 +01:00
David Moravek
c6257b30c1 Take grafana-cli proxy settings from env 2016-10-31 23:14:48 +01:00
utkarshcmu
95117a0bc9 Added message parsing functionality 2016-10-31 14:55:21 -07:00
utkarshcmu
80fdd830de Added override default recipient functionality 2016-10-31 14:46:51 -07:00
Torkel Ödegaard
2fbe8cde8a Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode 2016-10-29 11:50:57 +02:00
utkarshcmu
dcaae47e96 Fixed tests 2016-10-28 14:54:55 -07:00
utkarshcmu
4c64e45a59 Added initalized state to alerts 2016-10-28 14:44:45 -07:00
Eric Uldall
658fc1a67a added hosted domain suppport to google oauth login (#6372) 2016-10-28 12:00:47 +02:00
seanclerkin
7acdbde8f0 Cloudwatch: add support for Aurora specific RDS metrics (#6378) 2016-10-28 12:00:22 +02:00
Torkel Ödegaard
c609586ff0 ux(dashboard): making progress on new add panel experiance 2016-10-26 17:42:39 +02:00
Utkarsh Bhatnagar
b382d17e34 Fixed alerting bug for mysql (#6375) 2016-10-25 14:52:20 +02:00
Torkel Ödegaard
8bb2f11505 Merge branch 'alerting_keeplast' 2016-10-22 11:51:16 +02:00
Carl Bergquist
bc90e6ce46 Alerting: Keep last state on no data (#6354) 
* feat(alerting): add support to keep last state on no data

closes #6332

* refactoring(alerting PR #6354): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354
 2016-10-22 10:56:04 +02:00
Torkel Ödegaard
a2e14f56e4 refactoring(alerting PR #6354): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354 2016-10-22 10:54:50 +02:00
Torkel Ödegaard
4999fff29b fix(alerting): fixed email notification so it splits email address multiple ways, fixes #6353 2016-10-22 10:24:31 +02:00
Torkel Ödegaard
b32bbbd1a2 fix(influxdb): enforce database restriction, fixes #6352 2016-10-22 10:03:02 +02:00
bergquist
6e65c93203 fix(cli): improve error handling 2016-10-21 16:03:02 +02:00
bergquist
2c7dbde06a feat(alerting): recover from panic 2016-10-21 14:46:58 +02:00
bergquist
ad56f67ad1 feat(alerting): add support to keep last state on no data 
closes #6332
 2016-10-21 14:00:20 +02:00
bergquist
5bf5ed68e1 tech(notifications): replace internal email code 2016-10-21 09:06:03 +02:00
bergquist
f77799837e feat(alerting): support for attached graphs in alert notifications 
closes #6183
 2016-10-21 09:06:03 +02:00
bergquist
ded5a0a9d5 tech(alerting): remove unused code 2016-10-21 09:05:54 +02:00
Eric Uldall
eda442dbf9 added support to login user oauth user by email only (#6330) 
* added support to login user oauth user by email only

* added sql handler

* fixed model method name from GetUserByEmail to GetUserByEmailQuery

* fixed variable declaration typo
 2016-10-20 06:45:10 +02:00
bergquist
6ea0f0120e feat(notifications): switch to ; seperator 
using \n caused problems with the json deserialisation.

closes #6326
 2016-10-19 16:34:12 +02:00
bergquist
2df8c649b7 Merge branch 'master' into alerting_opentsdb 2016-10-19 13:15:22 +02:00
bergquist
20bfe443fe feat(prometheus): trim labelname lookup key 
closes #6300
 2016-10-19 08:57:58 +02:00
bergquist
b2d5b920f5 feat(alerting): allow editor to modify notifications 
closes #6314
 2016-10-19 08:01:31 +02:00
Eric Uldall
9468ddeed5 Issues/6317 empty google login (#6318) 
* added Login property to google_oauth model

* fixed spacing

* fixed google_oauth syntax error, missing comma before newline

* set noexpandtab for commit
 2016-10-19 07:43:32 +02:00
utkarshcmu
333a853948 Fixed for loop and append 2016-10-18 08:48:06 -07:00
bergquist
d1eceedf55 feat(webhook): add httpmethod to webhook 
closes #6255
 2016-10-18 16:50:16 +02:00
bergquist
9429434cb5 feat(influxdb): use database auth if provided 
closes #6310
 2016-10-18 15:12:04 +02:00
utkarshcmu
10d581dd0a Added unit tests for query parsing 2016-10-17 14:51:51 -07:00
utkarshcmu
2374d09877 Fixed query parsing bugs 2016-10-17 14:50:53 -07:00
utkarshcmu
ace81760ea Added tests file for writing tests 2016-10-16 12:10:13 -07:00
utkarshcmu
b7744b4928 Added tags and filters params to alerting 2016-10-16 10:55:07 -07:00
utkarshcmu
35f93f4117 Added rate params to alerting 2016-10-16 05:20:58 -07:00
utkarshcmu
cc0a39f816 Added downsampling params to alerting 2016-10-16 04:12:13 -07:00
Torkel Ödegaard
04c23ef322 fix(SIGHUP): ignore SIGHUP syscall, fixes #6276 2016-10-14 14:23:22 +02:00
Torkel Ödegaard
30645a6d3d refactor(alerting): initial step for seperating alerting and dash model, #6273 2016-10-14 13:06:29 +02:00
bergquist
5e0fa0f0ad feat(opentsdb): context aware http requests 2016-10-14 10:21:47 +02:00
bergquist
f44e360b0d fix(opentsdb): fmt 2016-10-14 10:15:30 +02:00
Torkel Ödegaard
4c26c55fea fix(api): minor change to how pause alert was done 2016-10-14 09:58:22 +02:00
Torkel Ödegaard
46bab0bb37 feat(alerting): remove annotations when deleting alert, closes #6244 2016-10-14 09:43:30 +02:00
Torkel Ödegaard
c9d7eb0a7a feat(alerting): added clear history button to alert state history view, #6244 2016-10-14 09:33:42 +02:00
bergquist
fe24e6c8a8 Merge branch 'alerting_opentsdb' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_opentsdb 2016-10-14 09:19:42 +02:00
bergquist
455df7f0a0 Merge branch 'master' into alerting_opentsdb 2016-10-14 09:17:35 +02:00
bergquist
aeb0c5cb53 Merge branch 'master' into interval 2016-10-14 09:15:04 +02:00
bergquist
f4e0a9245e feat(influxdb): choose highest interval value 2016-10-14 09:14:13 +02:00
utkarshcmu
4247e92e87 Resolved conflicts 2016-10-14 00:01:36 -07:00
utkarshcmu
06f2047ced OpenTsdb alerting works with metric query 2016-10-13 23:49:28 -07:00
bergquist
b8ec1ce9a2 tech(tsdb): add basic skeleton for alerting 2016-10-13 23:49:27 -07:00
Carl Bergquist
7bdedff89c feat(plugins): make sure windows data plugin path is absolute (#6264) 2016-10-13 15:36:35 +02:00
mdadm
fa492c6828 fixed scoping issue with certPool variable (#6261) 2016-10-13 13:38:55 +02:00
bergquist
4144eacc24 feat(influxdb): start parsing interval parameters 2016-10-13 11:42:51 +02:00
bergquist
1506df8c11 feat(alerting): parse the interval value from the panel 2016-10-13 11:19:44 +02:00
bergquist
2e4ca64783 fix(cli): improve error handling 
closes #6256
 2016-10-12 22:31:28 +02:00
bergquist
c0829903ba fix(alerting): scope variable was updated 
closes #6228
 2016-10-12 09:46:32 +02:00
Torkel Ödegaard
b8b577eafb fix(spelling): minor spelling fix in alerting code 2016-10-12 09:17:48 +02:00
bergquist
5a91d45f3f fix(influxdb): broken unittests 2016-10-12 07:43:30 +02:00
marcv81
150d21800c Do not pass Authorization header in Grafana.net proxy (#6243) 2016-10-12 06:54:33 +02:00
bergquist
885e0366c5 feat(influxdb): support raw queries in alerting 
ref #6231
 2016-10-11 18:53:09 +02:00
bergquist
ccee1b3f96 fix(alerting): fix bug with unhandled error 
closes #6239
 2016-10-11 17:37:07 +02:00
Torkel Ödegaard
f1905a8485 fix(alerting): fixed issue with using nested queries in graphite query used in alerting rule, fixes #5996 2016-10-11 12:50:11 +02:00
bergquist
446bde2421 Merge branch 'pause_alert_rules' 
closes #6135
 2016-10-11 10:54:58 +02:00
bergquist
c6cf7647ff feat(alerting): pausing alerts requires alert id 2016-10-11 10:53:24 +02:00
Carl Bergquist
be2054fe51 Merge pull request #6229 from nijanthanh/cloudwatch_ApplicationELB_UnHealthyHostCount_fix 
(cloudwatch) Fix UnHealthyHostCount metric of ApplicationELB
 2016-10-11 10:36:19 +02:00
bergquist
3162e680c2 tech(notifiers): improve logging for notifications 
ref #6228
 2016-10-11 10:15:41 +02:00
bergquist
8b0c29b104 Merge branch 'master' into pause_alert_rules 2016-10-11 09:46:48 +02:00
bergquist
4bbc2108f9 feat(alerting): add pause button to alert list 2016-10-11 09:45:38 +02:00
Nijanthan Hariharan
2b8404e178 (cloudwatch) Fix UnHealthyHostCount metric of ApplicationELB 
The UnHealthyHostCount metric of ApplicationELB for cloudwatch datasource did not work because the capitalization was wrong - it was UnhealthyHostCount instead of UnHealthyHostCount.
Here is the AWS documentation listing the metric name - http://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-cloudwatch-metrics.html#load-balancer-metrics-alb
 2016-10-11 13:10:57 +05:30
Dan Cech
6b16fcea52 Oauth2 Updates (#6226) 
* break out go and js build commands

* support oauth providers that return errors via redirect

* remove extra call to get grafana.net org membership

* removed GitHub specifics from generic OAuth

* readded ability to name generic source

* revert to a backward-compatible state, refactor and clean up

* streamline oauth user creation, make generic oauth support more generic
 2016-10-11 08:51:44 +02:00
bergquist
804797245d feat(alerting): make it possible to pause from alert tab 2016-10-11 08:40:38 +02:00
Dan Cech
519100f1bd Merge pull request #6217 from ericpp/oauth_add_state_param 
Added a state parameter for all OAuth requests
 2016-10-10 09:58:35 -04:00
bergquist
f3825263d4 feat(alerting): add pause button in alert list 2016-10-10 15:17:14 +02:00
Carl Bergquist
b0d154d5aa Merge pull request #6221 from grafana/alerting_influxdb 
Alerting support for influxdb
 2016-10-10 14:32:47 +02:00
bergquist
264590a9c2 feat(alerting): add paused api endpoint 2016-10-10 14:26:09 +02:00
bergquist
19427b59f9 feat(alerting): do not enqueue paused rules 2016-10-10 13:29:10 +02:00
bergquist
04f417a423 feat(alerting): enabled by default. configurable elert engine 
closes #6210
 2016-10-10 13:09:16 +02:00
bergquist
8d96262106 chore(tsdb): tidy up code 2016-10-10 11:58:06 +02:00
bergquist
f609623abd style(influxdb): tidy up code 2016-10-10 11:34:52 +02:00
bergquist
95b9f472d1 tech(influxdb): remove unused logging 2016-10-10 11:17:00 +02:00
bergquist
f919d04e3c docs(tsdb): improve fill comment 2016-10-10 09:52:53 +02:00
bergquist
0bfb94dc6f feat(tsdb): add interval calculator 2016-10-10 09:45:33 +02:00
Eric Perrino
81443bf8b4 Added a state parameter for all OAuth requests 2016-10-08 01:22:32 -05:00
bergquist
4fafefd66a feat(influxdb): proper support for group by tags 2016-10-07 15:09:54 +02:00
bergquist
e499e8850c fix(influxdb): fix for timerange 2016-10-07 11:33:17 +02:00
bergquist
0633e2c03f feat(influxdb): add real support for time ranges 2016-10-07 11:23:37 +02:00
bergquist
e36f9fa795 Merge branch 'master' into alerting_influxdb 2016-10-07 10:45:05 +02:00
Eric Perrino
d3b0905899 Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191) 2016-10-07 08:49:58 +02:00
bergquist
522d40fa26 fix(influxdb): support mulitple tags 2016-10-06 18:51:17 +02:00
bergquist
87650c150b feat(influxdb): add tags to serie names 2016-10-06 18:47:59 +02:00
bergquist
b0addbd7cb feat(influxdb): support multi row results 2016-10-06 15:30:09 +02:00
bergquist
d8aa38fafe tech(influxdb): refactor and cleanup 2016-10-06 14:16:26 +02:00
bergquist
ab8751767c feat(influxdb): send request and parse response 2016-10-06 12:51:45 +02:00