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
bergquist
957cb407c5
feat(alerting): naiv graphite executor
2016-05-25 17:21:20 +02:00
bergquist
b2a4d8083e
feat(alerting): add datasource ref to alert rule
2016-05-25 12:57:49 +02:00
bergquist
7229fb7a76
tech(alerting): change from array to map
2016-05-23 17:04:57 +02:00
bergquist
f05cae23d2
feat(alerting): alert rule selector
2016-05-23 10:07:04 +02:00
bergquist
411178d384
tech(alerting): disable feature toggle
...
this feature toggle caused migration tests to fail
2016-05-23 08:24:10 +02:00
bergquist
45b2b4bc52
feat(alerting): add feature toggles for alerting functions
2016-05-23 08:00:42 +02:00
bergquist
9d016a2756
feat(alerting): add migration for create and update
2016-05-20 14:23:24 +02:00
bergquist
8dbb5bad4b
test(alerting): fix broken unit tests
2016-05-16 16:20:28 +02:00
Torkel Ödegaard
77b7cdfadb
feat(alerting): added few fields to alert rule
2016-05-16 15:39:09 +02:00
Torkel Ödegaard
495404ef73
Merge branch 'master' into alerting_definitions
2016-05-16 14:12:56 +02:00
Anton Chevychalov
c6744925c4
Add new parameter to config: default_theme.
2016-05-12 18:21:11 +03:00
bergquist
1bb8bc58b8
feat(alerting): add parameteters for filtering alerts
2016-05-10 09:45:56 +02:00
bergquist
b2cf2e877a
test(alerting): improve unit test
2016-05-09 15:19:11 +02:00
bergquist
1be513fabd
feat(alerting): add support for alert page filter
2016-05-09 14:44:44 +02:00
bergquist
47070f2d1f
chore(alerting): struct names and url refactoring
2016-05-09 11:25:21 +02:00
bergquist
27274f37e8
feat(alerting): update paths for alert state
2016-05-06 14:37:41 +02:00
bergquist
26941284da
feat(alerting): add limit and since id options for alert logs
2016-05-04 09:57:53 +02:00
bergquist
1624dc9dfd
feat(alerting): separate operator and level
2016-05-03 17:31:04 +02:00
bergquist
b606d9b7da
test(alerting): fixes broken test
2016-05-02 16:27:02 +02:00
bergquist
743a6fa37c
feat(alerting): add support for deleting alert rules
2016-05-02 16:07:19 +02:00
bergquist
bd30a4d23e
Merge branch 'master' into alerting_definitions
2016-04-28 16:04:28 +02:00
bergquist
f442adca47
feat(alerting): adds api endpoints for alerts per dashboard and panel
2016-04-28 15:13:42 +02:00
woodsaj
ad8dbbb559
allow updates to secureJsonData.
...
SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.
2016-04-28 18:39:23 +08:00
bergquist
1f414c1372
test(alerting): add test that validates rule updates do not change state
2016-04-28 11:47:14 +02:00
bergquist
ecfbc2edca
feat(alerting): adds alert history page
2016-04-28 11:42:03 +02:00
