bergquist
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
Torkel Ödegaard
330c1b945e
refactor(datasource): refactoring datasource secure json fields handling, #6697 , #6692
2016-12-14 21:06:10 +01:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
bergquist
7bc1c3cc1c
feat(cloudwatch): make it possible to reset keys
...
closes #6697
2016-11-24 16:37:33 +01:00
Daniel Lee
2893b25a05
feat(datasources): allow updating of tls certs
...
The tls files are stored as a json blob in the
SecureJsonData field. To update one file, the
json has to be fetched from the db first and
then updated with the cert file that has been
changed.
Also, a change to the dto with flags that are
used in the frontend to show if a file has
been uploaded. For example, if tlsClientKeySet
is set to true then means a file for the
client key is saved in the db. This is to
avoid sending any private data to the frontend.
2016-11-24 13:22:25 +01:00
Daniel Lee
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
Joe Lanford
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
Torkel Ödegaard
fd512457d8
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
2016-11-18 16:31:54 +01:00
Torkel Ödegaard
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
utkarshcmu
690868c837
Added firingEvalution to Rule test
2016-11-17 01:28:17 -08: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
Torkel Ödegaard
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
bergquist
c6cf7647ff
feat(alerting): pausing alerts requires alert id
2016-10-11 10:53:24 +02:00
bergquist
804797245d
feat(alerting): make it possible to pause from alert tab
2016-10-11 08:40:38 +02:00
bergquist
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +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
Torkel Ödegaard
39af588a94
fix(playlist): fixed sorting issue with playlist playback, fixes #5467
2016-09-22 10:06:03 +02:00
Torkel Ödegaard
b0c7e61ef8
feat(alerting): removed severity
2016-09-13 15:09:55 +02:00
Torkel Ödegaard
4a2f2fba73
feat(alerting): show panel specific alert annotations, #5694
2016-09-09 11:30:55 +02:00
Torkel Ödegaard
d60bd77658
feat(annotations): added support to show grafana stored annotations in graphs, #5982
2016-09-08 11:25:45 +02:00
bergquist
c893e5d241
feat(notifications): add support for default notifications
...
ref #5883
2016-09-05 21:35:37 +02:00
bergquist
d11bc57c37
feat(notifications): make it possible to send test alert notifications
...
closes #5847
2016-09-05 14:45:15 +02:00
bergquist
11a4ff0f8a
feat(alerting): add basic UI for history in alert tab
...
ref #5850
2016-08-30 13:22:59 +02:00
bergquist
650a87dc05
feat(alerting): add alert history api endpoint
...
ref #5850
2016-08-30 09:32:56 +02:00
Torkel Ödegaard
5cf9711862
feat(alerting): added eval match to test results
2016-08-18 11:22:24 +02:00
Torkel Ödegaard
f934081bcb
feat(alerting): making progress on alerting list, #5784
2016-08-16 09:52:45 +02:00
bergquist
16e75a3036
feat(alerting): add alert message to slack integration
2016-08-12 10:12:04 +02:00
Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
Torkel Ödegaard
a6c6094775
feat(alerting): started reworking notifications
2016-07-22 16:45:17 +02:00
Torkel Ödegaard
7eb2d2cf47
feat(alerting): working on state management
2016-07-22 13:14:09 +02:00
Torkel Ödegaard
783d697529
feat(alerting): more output when testing alert
2016-07-21 21:54:12 +02:00
Torkel Ödegaard
3ad38eefd2
feat(alerting): test results look better
2016-07-21 13:57:19 +02:00
Torkel Ödegaard
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
9e91aacd34
feat(alerting): progress on testing alerts
2016-07-21 10:29:11 +02:00
Torkel Ödegaard
fb636344a6
feat(alerting): began work on testing alert rule from UI without having to save it
2016-07-20 16:13:36 +02:00
Torkel Ödegaard
d9096110f8
Merge branch 'master' into alerting
...
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +02:00
Torkel Ödegaard
5595fc2683
refactor(): refactored date handling and locale handling in #5517
2016-07-05 17:59:43 +02:00
bergquist
0c5da9155f
feat(alerting): only expose DTO info when requesting all notifications
2016-06-20 11:31:20 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
34e17f7282
feat(alerting): requests looks to be working again
2016-06-06 17:11:46 +02:00
bergquist
7224ea5229
chore(alerting): convert alert levels to float
2016-05-31 14:18:12 +02:00
bergquist
077be210da
tech(alerting): change interval -> frequency
2016-05-30 09:31:05 +02:00
bergquist
16a9e56eca
tech(alerting): change queryrange to int from str
2016-05-30 09:18:22 +02:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
Torkel Ödegaard
ba6573af61
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +02:00
Torkel Ödegaard
9a7817a271
Merge branch 'master' into footer
...
Conflicts:
pkg/api/frontendsettings.go
2016-05-23 20:59:23 +02:00
Torkel Ödegaard
7cd663bbe8
feat(import): more import work
2016-05-14 10:00:43 +02:00
bergquist
35c73902da
Merge branch 'master' into alerting_definitions
2016-05-09 11:34:56 +02:00
Torkel Ödegaard
f4a013946f
feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled
2016-05-03 19:00:42 +02:00
