c9b2c694f1
refactor(dataproxy): TLS Client Auth
...
Use a SecureJsonData field for TLS
Client Auth instead of 3 new db
fields. Same model as used for
PluginSettings.
Saves and encrypts the pem file
content rather than just saving
the paths to the cert and key.
This allows for uploading from
the Edit Datasource page in
Grafana.
2016-11-24 13:22:25 +01:00
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
421c1eed82
fix(dashboard): fixes bug when saving dashboards
2016-11-24 11:22:13 +01:00
df2b2e3058
feat(alerting): validate alerts before saving dashboard ( #6691 )
...
ref #6576
2016-11-24 09:50:35 +01:00
773fb5d1ae
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
2016-11-23 14:55:10 +01:00
c365d52a80
[6486] Fix status code when adding an existing user to org ( #6678 )
2016-11-23 14:38:44 +01:00
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
457ae74343
Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting
2016-11-17 14:43:24 +01:00
690868c837
Added firingEvalution to Rule test
2016-11-17 01:28:17 -08:00
e3564d12a1
fix(404): fixed 404 page
2016-11-16 17:09:00 +01:00
a353c8d1bb
added explicitly setting token as Bearer Type
2016-11-16 09:55:14 -05:00
69ff13adce
add govcloud
2016-11-07 13:56:29 -05:00
d670f1b959
Merge pull request #6479 from utkarshcmu/playlist_bug
...
Removed playlist item when dashboard is deleted
2016-11-07 08:00:57 +01:00
2d19af601a
fix(alerting): various alerting fixes
2016-11-06 15:40:02 +01:00
c737704eeb
Removed playlist item when dashboard is deleted
2016-11-06 01:49:43 -08:00
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
7490c49f60
Alert un paused to pending state
2016-11-01 07:58:38 -07:00
2fbe8cde8a
Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode
2016-10-29 11:50:57 +02:00
658fc1a67a
added hosted domain suppport to google oauth login ( #6372 )
2016-10-28 12:00:47 +02:00
7acdbde8f0
Cloudwatch: add support for Aurora specific RDS metrics ( #6378 )
2016-10-28 12:00:22 +02:00
c609586ff0
ux(dashboard): making progress on new add panel experiance
2016-10-26 17:42:39 +02:00
b32bbbd1a2
fix(influxdb): enforce database restriction, fixes #6352
2016-10-22 10:03:02 +02:00
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
b2d5b920f5
feat(alerting): allow editor to modify notifications
...
closes #6314
2016-10-19 08:01:31 +02:00
30645a6d3d
refactor(alerting): initial step for seperating alerting and dash model, #6273
2016-10-14 13:06:29 +02:00
4c26c55fea
fix(api): minor change to how pause alert was done
2016-10-14 09:58:22 +02:00
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
150d21800c
Do not pass Authorization header in Grafana.net proxy ( #6243 )
2016-10-12 06:54:33 +02:00
446bde2421
Merge branch 'pause_alert_rules'
...
closes #6135
2016-10-11 10:54:58 +02:00
c6cf7647ff
feat(alerting): pausing alerts requires alert id
2016-10-11 10:53:24 +02:00
8b0c29b104
Merge branch 'master' into pause_alert_rules
2016-10-11 09:46:48 +02:00
4bbc2108f9
feat(alerting): add pause button to alert list
2016-10-11 09:45:38 +02:00
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
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
804797245d
feat(alerting): make it possible to pause from alert tab
2016-10-11 08:40:38 +02:00
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
f3825263d4
feat(alerting): add pause button in alert list
2016-10-10 15:17:14 +02:00
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +02:00
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
81443bf8b4
Added a state parameter for all OAuth requests
2016-10-08 01:22:32 -05:00
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 324b006c96687da18a542942f39c10c99119430c.
* feat(alerting): give alerts some time to finish before closing down
2016-10-03 09:38:03 +02:00
c6cf6d4655
fix(api): fixed issue with api content-type in api success messages, fixes #6160
2016-10-01 16:52:52 +02:00
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
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
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
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
a4648607bb
feat(testdata): added csv test data scenario
2016-09-28 10:37:30 +02:00
63caedb094
Merge branch 'master' of github.com:grafana/grafana
2016-09-28 08:09:51 +02:00
3ecd96e682
feat(testdata): lots of work on new test data data source and scenarios
2016-09-27 18:17:39 +02:00
