lucapette
032ecad3b7
Fix typo
2017-02-03 12:10:22 +01:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +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
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
6257ae094c
feat(sqlstore): added index for dashboard_id in dashboard_tag table, fixes #5868
2016-09-21 21:32:51 +02:00
Torkel Ödegaard
8c30babdf1
feat(alerting): fixed build issues
2016-09-13 16:24:00 +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
6497b307c4
feat(alerting): save execution error upon state changed
2016-08-17 09:27:29 +02:00
Torkel Ödegaard
f934081bcb
feat(alerting): making progress on alerting list, #5784
2016-08-16 09:52:45 +02:00
Torkel Ödegaard
9f29c54170
Merge branch 'query_part_refactor' into alerting
...
Conflicts:
pkg/services/sqlstore/migrations/alert_mig.go
pkg/services/sqlstore/migrations/heartbeat_mig.go
2016-08-15 17:54:42 +02:00
Torkel Ödegaard
1418cbbd8b
feat(query_part): refactoring query part
2016-08-15 17:20:45 +02:00
Torkel Ödegaard
0392fde34e
feat(alerting): doing schema changes
2016-08-15 15:12:43 +02:00
bergquist
16e75a3036
feat(alerting): add alert message to slack integration
2016-08-12 10:12:04 +02:00
Torkel Ödegaard
357358898d
feat(annotations): working on alert annotations, #5694
2016-08-01 10:07:00 +02:00
Torkel Ödegaard
6cb1dafb1d
feat(alerting): progress on notifications
2016-07-25 16:26:28 +02:00
Torkel Ödegaard
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
624cd6fc0a
feat(alerting): cleanup, removed alert changes table and code
2016-07-13 11:58:55 +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
d44325affd
feat(apps): progress on app dashboard imports
2016-07-08 09:35:06 +02:00
Torkel Ödegaard
b62f1f00cd
feat(apps): auto update dashboard dashboards, #5529
2016-07-07 18:11:03 +02:00
bergquist
4fc16c36ed
feat(alerting): saves new state when alert updates
2016-06-29 00:05:48 +02:00
bergquist
67197d54f9
feat(alerting): add triggeredAlerts as json to alert_state
2016-06-23 11:14:40 +02:00
bergquist
fa309ec925
feat(alerting): add default notification group
2016-06-20 15:24:48 +02:00
bergquist
96e5ad3f5c
Merge branch 'alerting' into alerting_notifications
2016-06-20 10:45:05 +02:00
bergquist
dd8c3d0355
Merge branch 'master' into alerting
2016-06-20 10:44:48 +02:00
Torkel Ödegaard
305a6ae110
feat(dashboards): dashboard sharing fixes
2016-06-17 11:36:35 +02:00
bergquist
ebada26b85
Merge branch 'alerting' into alerting_notifications
2016-06-17 08:27:58 +02:00
bergquist
e8a324c7f5
feat(alerting): add frequency back to alert model
2016-06-17 08:27:38 +02:00
bergquist
a0418da160
Merge branch 'alerting' into alerting_notifications
2016-06-16 16:49:16 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
bergquist
8b91e57ef6
feat(alerting): notification query
2016-06-16 08:16:16 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
dac8b35a1a
feat(alerting): renamed scheduler to handler
2016-06-13 15:58:22 +02:00
bergquist
7f22b9eb6e
tech(alerting): expression -> settings
2016-06-13 15:18:19 +02:00
bergquist
1e41eb8c97
tech(alerting): remove frequency from alert model
2016-06-13 10:42:36 +02:00
Torkel Ödegaard
0ef6801117
Merge branch 'master' into alert_ui_take2
2016-06-11 12:17:14 +02:00
Torkel Ödegaard
086b59483e
feat(loggin): disable logging by default so unit tests are not full of logging
2016-06-11 11:38:25 +02:00
Torkel Ödegaard
382f396247
feat(alerting): more model changes
2016-06-11 10:54:24 +02:00
Torkel Ödegaard
2b4a9954b1
feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package
2016-06-11 10:13:33 +02:00
bergquist
fdf051ad5a
feat(alerting): begin alert rule storage refactoring
2016-06-09 22:21:28 +02:00
Torkel Ödegaard
e4ea24dfc4
Merge branch 'new-logger' into alerting_definitions
...
Conflicts:
pkg/services/sqlstore/migrations/migrations_test.go
2016-06-07 15:51:22 +02:00
Torkel Ödegaard
73b0e6c37b
feat(logging): disable migrator logging during test
2016-06-07 15:50:16 +02:00
Torkel Ödegaard
34e17f7282
feat(alerting): requests looks to be working again
2016-06-06 17:11:46 +02:00
Torkel Ödegaard
70cb8400c3
feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting
2016-06-06 09:17:29 +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
