Torkel Ödegaard
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
utkarshcmu
7490c49f60
Alert un paused to pending state
2016-11-01 07:58:38 -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
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
Torkel Ödegaard
b32bbbd1a2
fix(influxdb): enforce database restriction, fixes #6352
2016-10-22 10:03:02 +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
b2d5b920f5
feat(alerting): allow editor to modify notifications
...
closes #6314
2016-10-19 08:01:31 +02:00
Torkel Ödegaard
30645a6d3d
refactor(alerting): initial step for seperating alerting and dash model, #6273
2016-10-14 13:06:29 +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
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
marcv81
150d21800c
Do not pass Authorization header in Grafana.net proxy ( #6243 )
2016-10-12 06:54:33 +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
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
bergquist
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +02:00
bergquist
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
Eric Perrino
81443bf8b4
Added a state parameter for all OAuth requests
2016-10-08 01:22:32 -05:00
Carl Bergquist
c38f6ff182
Make alerting notifcations sync ( #6158 )
...
* tech(routines): move the async logic from notification to alerting notifier
* tech(notification): reduce code dupe
* fix(notification): dont touch the response unless its an error
* feat(alerting): make alerting exeuction async but flow sync
* tech(alerting): remove commented code
* tech(alerting): remove unused code
* tech(alerting): fix typo
* tech(alerting): implement Context on EvalContext
* tech(alerting): wait for all alerts to return
* feat(alerting): dont allow alert responses to cancel
* Revert "feat(alerting): dont allow alert responses to cancel"
This reverts commit 324b006c96
2016-10-03 09:38:03 +02:00
Torkel Ödegaard
c6cf6d4655
fix(api): fixed issue with api content-type in api success messages, fixes #6160
2016-10-01 16:52:52 +02:00
Torkel Ödegaard
a6918617ff
feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes #6164
2016-10-01 16:41:27 +02:00
Torkel Ödegaard
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
Torkel Ödegaard
2750c8a801
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
Torkel Ödegaard
a4648607bb
feat(testdata): added csv test data scenario
2016-09-28 10:37:30 +02:00
Torkel Ödegaard
63caedb094
Merge branch 'master' of github.com:grafana/grafana
2016-09-28 08:09:51 +02:00
Torkel Ödegaard
3ecd96e682
feat(testdata): lots of work on new test data data source and scenarios
2016-09-27 18:17:39 +02:00
Torkel Ödegaard
34f15d92d0
feat(testdata): worked on testdata app
2016-09-27 14:39:51 +02:00
bergquist
1a32ab64b6
tech(renderer): improve renderOpts names
2016-09-26 11:07:36 +02:00
Torkel Ödegaard
175c651e65
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115 , fixes #5906
2016-09-23 12:29:53 +02:00
Carl Bergquist
d6a0ec85c4
Merge pull request #6111 from grafana/pluginreadme
...
allow non-admin users to view plugin readme
2016-09-22 19:51:47 +02:00
Dan Cech
2c3dd84ebb
allow non-admin users to view plugin readme
2016-09-22 13:46:11 -04:00
Torkel Ödegaard
936146768f
fix(snapshots): fixed issue with viewing embedded/solo/png panel from snapshot without login, fixes #3769
2016-09-22 11:46:58 +02:00
Torkel Ödegaard
39af588a94
fix(playlist): fixed sorting issue with playlist playback, fixes #5467
2016-09-22 10:06:03 +02:00
Dan Cech
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Torkel Ödegaard
b4111d78e1
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
2016-09-21 15:03:14 +02:00
Dan Cech
630a8ed8aa
support setting default org role when adding user via grafana.net auth
2016-09-20 12:36:36 -04:00
Dan Cech
da95a23080
remove 'Github' from oauth login error messages
2016-09-20 11:36:13 -04:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
bergquist
9dd8b3b408
wip
2016-09-14 14:12:19 +02:00
bergquist
d0f9623037
feat(alertlistpanel): support state filter
...
ref #5981
2016-09-14 10:49:05 +02:00
Torkel Ödegaard
9cd517780f
Merge branch 'master' of github.com:grafana/grafana
2016-09-13 16:25:48 +02:00
