Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
Carl Bergquist
b47410af6a
Merge pull request #6670 from tomkozlowski/feature/postgres-certs
...
generalized database connection cert support and added to postgres
2016-11-29 21:40:27 +01:00
bergquist
253324fc32
style(sqlstore): remove comment
2016-11-29 21:24:45 +01:00
Pavlos Daoglou
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02: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
Tom Kozlowski
c21ffcc6c9
generalized database connection cert support and added to postgres
2016-11-22 15:29:22 -08:00
Torkel Ödegaard
fd512457d8
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
2016-11-18 16:31:54 +01:00
bergquist
a87fd11f26
feat(stats): add alerts to global admin stats
2016-11-11 14:04:38 +01:00
bergquist
ad97db937c
feat(stats_usage): add stats about alerts
2016-11-11 13:57:11 +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
utkarshcmu
c737704eeb
Removed playlist item when dashboard is deleted
2016-11-06 01:49:43 -08: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
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
Utkarsh Bhatnagar
b382d17e34
Fixed alerting bug for mysql ( #6375 )
2016-10-25 14:52:20 +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
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
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +02:00
Torkel Ödegaard
4a116ad4ad
fix(build): fixed failing unit test
2016-10-01 17:36:56 +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
5ec86a9ef4
fix(build): fixed broken build, unreachable code in migrator.go
2016-09-30 09:23:26 +02:00
Torkel Ödegaard
2b8177e3e5
fix(migration): fix for sqlstore migration, the execution of the migration and recording of the success of it was not done in same transaction, fixes #5315
2016-09-30 07:49:40 +02:00
Torkel Ödegaard
c28d004731
Merge branch 'go_routines'
2016-09-28 21:06:07 +02:00
Torkel Ödegaard
71e2c6f6ef
refactor(backend): refactoring management of go routines in backend
2016-09-28 21:06:00 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
bergquist
dbb7852f21
feat: purge old files and snapshots
...
closes #4087
closes #2172
2016-09-26 14:33:40 +02:00
bergquist
e5c64732f1
fix(sql): Add boolstr to all dialects
...
closes #6116
2016-09-23 09:36:15 +02: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
Dan Cech
630a8ed8aa
support setting default org role when adding user via grafana.net auth
2016-09-20 12:36:36 -04:00
bergquist
4e567b5f02
feat(alert): order alerts by name.. instead of nothing.
2016-09-14 14:51:31 +02:00
bergquist
a23b7f1371
fix(alerting): add missing evaldata field to set state command
2016-09-14 14:35:05 +02:00
bergquist
d0f9623037
feat(alertlistpanel): support state filter
...
ref #5981
2016-09-14 10:49:05 +02:00
Torkel Ödegaard
8c30babdf1
feat(alerting): fixed build issues
2016-09-13 16:24:00 +02:00
Torkel Ödegaard
3af891d023
feat(alerting): restored alert history
2016-09-13 16:13:41 +02:00
Torkel Ödegaard
b0c7e61ef8
feat(alerting): removed severity
2016-09-13 15:09:55 +02:00
Torkel Ödegaard
6375418d8c
Merge branch 'alerting' into grafana-annotations
2016-09-13 09:38:12 +02:00
Rubycut
501f89e829
Increase datasource limit to 1000 #3910
2016-09-12 10:45:17 +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
712061ab4f
test(alerting): fixes broken unit tests
2016-09-07 11:45:38 +02:00
Torkel Ödegaard
fbae6abb3c
feat(alerting): progress on handling no data in alert query, #5860
2016-09-06 20:40:12 +02:00
bergquist
2ca7284a56
tech(notifications): splitt into 3 queries
...
closes #5883
2016-09-06 08:43:15 +02:00
bergquist
c893e5d241
feat(notifications): add support for default notifications
...
ref #5883
2016-09-05 21:35:37 +02:00
bergquist
650a87dc05
feat(alerting): add alert history api endpoint
...
ref #5850
2016-08-30 09:32:56 +02:00
bergquist
d0ca4ca3cd
chore(alerting): remove unused files
2016-08-22 17:01:23 +02:00
bergquist
26c6437846
Merge branch 'master' into alerting
2016-08-22 12:27:08 +02:00
bergquist
c663e32ea8
Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url
2016-08-19 13:15:44 +02:00
bergquist
d3421c671c
fix(alerting): make sure xorm can reset execution_error
2016-08-18 17:25:32 +02:00
Torkel Ödegaard
75a6c2b612
feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841
2016-08-18 09:03:46 +02:00
Torkel Ödegaard
63a283b4bc
feat(alerting): working on alert state filters for alert list
2016-08-17 11:00:00 +02:00
bergquist
6497b307c4
feat(alerting): save execution error upon state changed
2016-08-17 09:27:29 +02:00
bergquist
9915f15ed0
feat(alerting): adds sql layer for saving execution errors
2016-08-17 07:49:14 +02:00
Torkel Ödegaard
0b7fa3c19d
feat(alerting): minor progress on alert list, #5784
2016-08-16 16:50:36 +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
1edd224168
feat(alerting): fixing failing unit tests
2016-08-01 14:34:58 +02:00
Torkel Ödegaard
357358898d
feat(annotations): working on alert annotations, #5694
2016-08-01 10:07:00 +02:00
Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
Torkel Ödegaard
6cb1dafb1d
feat(alerting): progress on notifications
2016-07-25 16:26:28 +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
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
0f555d6ab5
fix(alerting): minor fix
2016-07-19 09:28:49 +02:00
Torkel Ödegaard
f13b869aa4
feat(alerting): work on alerting
2016-07-14 13:32:16 +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
68a8d9bc91
feat(apps): more work on plugin dashboard sync
2016-07-08 13:41:46 +02:00
Torkel Ödegaard
85be7dd902
feat(apps): progress on app dashboard sync
2016-07-08 12:26:51 +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
Soulou
03d0f11407
Accept URL parameter [database] config
2016-06-28 15:31:34 +02:00
bergquist
6bf42dde18
tech(alerting): remove some logging
2016-06-27 01:27:30 +02:00
bergquist
48e1a17ac2
feat(alerting): remove dummie values from email notifier
2016-06-23 16:30:12 +02:00
bergquist
67197d54f9
feat(alerting): add triggeredAlerts as json to alert_state
2016-06-23 11:14:40 +02:00
bergquist
488b42377b
feat(alerting): update state if not been updated for 15min
2016-06-23 11:03:27 +02:00
bergquist
5d62c84a19
feat(alerting): adds default checkbox to ui
2016-06-20 16:19:15 +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
Torkel Ödegaard
10daf1d63a
Revert "Enable the "limit" param in /api/search"
...
This reverts commit 3d77685108
2016-06-17 11:22:39 +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
b907ce341c
feat(alerting): enables deletes for alert notifications
2016-06-16 15:21:44 +02:00
bergquist
9a8416416d
feat(alerting): converter for db model to notification
2016-06-16 08:16:16 +02:00
bergquist
6eca26e8ec
style(alerting): improve formating
2016-06-16 08:16:16 +02:00
bergquist
dbf3795aaf
feat(alerting): add sql layer for alert notifications
2016-06-16 08:16:16 +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
bergquist
779ea55ee0
style(alerting): rename executor -> handler
2016-06-15 11:49:20 +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
3ad90c389c
style(alerting): improve naming
2016-06-13 14:01:57 +02:00
bergquist
1e41eb8c97
tech(alerting): remove frequency from alert model
2016-06-13 10:42:36 +02:00
bergquist
2cf72715fb
test(alerting): fixes broken unit tests
2016-06-13 09:33:14 +02:00
Torkel Ödegaard
1500c0e954
feat(alerting): alert threshold handles progress
2016-06-11 22:33:02 +02:00
Torkel Ödegaard
66c2594262
feat(alerting): sql update fixes
2016-06-11 14:08:55 +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
a362984c57
feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part
2016-06-11 10:26:48 +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
ea8fb66f73
test(alerting): fixes broken unittests
2016-06-10 13:47:54 +02:00
bergquist
8cd1d17916
feat(alerting): new alerting model\
2016-06-10 13:15:16 +02:00
bergquist
0c69c5afb1
test(alerting): fixes broken unittests
2016-06-10 11:37:03 +02:00
bergquist
ef35184a80
feat(alerting): rename alertrule model to alertruleDAO
2016-06-10 10:00:00 +02:00
bergquist
fdf051ad5a
feat(alerting): begin alert rule storage refactoring
2016-06-09 22:21:28 +02:00
Torkel Ödegaard
dee5f582d7
Merge branch 'master' into alerting_definitions
2016-06-09 10:45:16 +02:00
bergquist
a1f97e0b77
feat(alerting): add heartbeat writer
2016-06-09 10:00:34 +02:00
Torkel Ödegaard
a66027830b
Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions
2016-06-08 09:42:31 +02:00
Torkel Ödegaard
26d93d7130
Merge branch 'master' into alerting_definitions
2016-06-08 09:36:50 +02:00
Carl Bergquist
fe5673134f
Merge pull request #5292 from Thib17/master
...
Enable the "limit" param in /api/search
2016-06-08 09:19:58 +02:00
bergquist
366fb11416
style(alerting): add fmt fixes
2016-06-08 08:50:11 +02:00
Torkel Ödegaard
b25cb60259
Merge branch 'new-logger'
...
Conflicts:
CHANGELOG.md
2016-06-08 08:09:59 +02:00
Zdenek Styblik
5eceabf810
fix(): Check Organization exists before User is added ( #5302 )
...
Commit adds a check whether Organization exists before User is added to
the organization.
Fixes #3151 .
2016-06-08 05:46:21 +02:00
Torkel Ödegaard
93fdc18fd4
feat(logging): fixed dependencies
2016-06-07 15:59:50 +02:00
bergquist
8d4aa5d114
test(alerting): update dashboard json
2016-06-07 15:52:33 +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
3289225b77
feat(alerting): fixed test issues
2016-06-07 14:51:53 +02:00
Torkel Ödegaard
8105ec4660
feat(alerting): fixed test issues
2016-06-07 14:27:56 +02:00
Torkel Ödegaard
0667d73660
Merge branch 'new-logger' into alerting_definitions
...
Conflicts:
pkg/api/api.go
pkg/setting/setting.go
2016-06-07 13:31:56 +02:00
Torkel Ödegaard
a02cf5beb7
feat(logging): added loging filters
2016-06-07 12:11:41 +02:00
Torkel Ödegaard
9741af2031
feat(logging): progress on new logging #4590
2016-06-07 09:29:47 +02:00
Torkel Ödegaard
22778e6efd
feat(logging): a lot of progress on moving to new logging lib, #4590
2016-06-06 23:06:44 +02:00
Thibault Chataigner
3d77685108
Enable the "limit" param in /api/search
2016-06-06 16:15:20 +00:00
Torkel Ödegaard
34e17f7282
feat(alerting): requests looks to be working again
2016-06-06 17:11:46 +02:00
Torkel Ödegaard
7a34c129fe
feat(alerting): things are compiling and tests pass
2016-06-06 13:50:47 +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
Karl
2f5ae85d33
Initial patch for grafana/grafana#4267 ( #5280 )
2016-06-06 07:15:37 +02:00
bergquist
6a49d4ed6b
feat(alerting): remove orgid from alertrule query
2016-06-03 15:24:53 +02:00
bergquist
76758d270f
feat(alerting): set basic description text of status ok
2016-05-31 20:03:15 +02:00
bergquist
7224ea5229
chore(alerting): convert alert levels to float
2016-05-31 14:18:12 +02:00
bergquist
1498db11a9
feat(alerting): extracts alert rule reading
2016-05-30 18:52:38 +02:00
bergquist
c5c261e955
feat(alerting): improve spacing in alerting tab
2016-05-30 17:50:35 +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
Torkel Ödegaard
0d4c76a029
feat(import): save gnetId for dashbards imported from grafana.net
2016-05-27 16:42:32 +02:00
