f05cae23d2
feat(alerting): alert rule selector
2016-05-23 10:07:04 +02:00
c60d737928
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-23 09:29:14 +02:00
411178d384
tech(alerting): disable feature toggle
...
this feature toggle caused migration tests to fail
2016-05-23 08:24:10 +02:00
45b2b4bc52
feat(alerting): add feature toggles for alerting functions
2016-05-23 08:00:42 +02:00
43ba563a1c
fix(logging): change log level to trace for plugin proxy logging call, fixes #5126
2016-05-23 07:55:55 +02:00
1d27a7f93d
(cloudwatch) fix wrong cache key of credentials ( #5124 )
2016-05-21 09:02:04 +02:00
9d016a2756
feat(alerting): add migration for create and update
2016-05-20 14:23:24 +02:00
855e913bbd
feat(dashboards): began work on dashboard list
2016-05-19 11:03:10 +02:00
cac723dab3
Merge branch 'master' into export-dashboard
2016-05-19 08:48:24 +02:00
ef4f5147be
Merge branch 'master' into alerting_definitions
2016-05-19 08:05:35 +02:00
b6dcf6bd02
Merge branch 'v3.0.x'
2016-05-18 14:23:59 +02:00
d474eba53a
fix(logging): fixed reading config level from config file, fixes #5079
2016-05-18 14:18:08 +02:00
6632f883c0
Merge branch 'master' into export-dashboard
...
Conflicts:
.floo
.flooignore
2016-05-18 08:08:15 +02:00
07d355851e
(cloudwatch) assume role support ( #5065 )
...
* (cloudwatch) assume role support
* save godep
* (cloudwatch) add assumeRoleArn field
* (cloudwatch) set cred provider for sts
* (cloudwatch) fix test
2016-05-18 07:54:24 +02:00
958f97232f
fix(pluginlist): fixed issue with plugin list, fixes #5068
2016-05-17 21:51:19 +02:00
83f5080274
feat(angular): disable debug in production for angular compiler
2016-05-17 15:00:48 +02:00
c133a00125
feat(alerting): minor progress on scheduler
2016-05-17 14:31:52 +02:00
ad7a1e15b4
feat(export): began working on export modal
2016-05-17 10:29:57 +02:00
8dbb5bad4b
test(alerting): fix broken unit tests
2016-05-16 16:20:28 +02:00
77b7cdfadb
feat(alerting): added few fields to alert rule
2016-05-16 15:39:09 +02:00
495404ef73
Merge branch 'master' into alerting_definitions
2016-05-16 14:12:56 +02:00
31698a1c55
Merge branch 'master' into alerting_definitions
2016-05-16 09:28:14 +02:00
7cd663bbe8
feat(import): more import work
2016-05-14 10:00:43 +02:00
c6744925c4
Add new parameter to config: default_theme.
2016-05-12 18:21:11 +03:00
28eae1e7ff
Merge branch 'master' into export-dashboard
...
Conflicts:
packaging/publish/publish.sh
public/app/features/dashboard/dynamicDashboardSrv.js
public/test/specs/dynamicDashboardSrv-specs.js
2016-05-12 10:50:37 +02:00
9f9f4e7fef
use new plugin-specific repo route when installing or updating a single plugin ( #4992 )
2016-05-12 10:43:31 +02:00
9b0da20d90
Fix typo in error message from update checker
2016-05-10 16:06:51 +00:00
db664c61a4
Merge branch 'master' into export-dashboard
2016-05-10 16:46:58 +02:00
1fe2055743
tech(alerting): disable DEL for alert rules in the api
2016-05-10 15:02:11 +02:00
1bb8bc58b8
feat(alerting): add parameteters for filtering alerts
2016-05-10 09:45:56 +02:00
b2cf2e877a
test(alerting): improve unit test
2016-05-09 15:19:11 +02:00
1be513fabd
feat(alerting): add support for alert page filter
2016-05-09 14:44:44 +02:00
3e462f2914
chore(alerting): style refactoring
2016-05-09 12:10:53 +02:00
35c73902da
Merge branch 'master' into alerting_definitions
2016-05-09 11:34:56 +02:00
47070f2d1f
chore(alerting): struct names and url refactoring
2016-05-09 11:25:21 +02:00
27274f37e8
feat(alerting): update paths for alert state
2016-05-06 14:37:41 +02:00
0764a4313b
AWS Elasticsearch Service Dimensions ( #4903 )
2016-05-04 10:47:35 +02:00
26941284da
feat(alerting): add limit and since id options for alert logs
2016-05-04 09:57:53 +02:00
303cd8a5af
[RenderToPng fix] ( #4901 )
...
* removing useless code
* fix various minor typo
* don't silence phantomjs timeout and allow more time
* fix gofmt
2016-05-04 09:07:45 +02:00
f4a013946f
feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled
2016-05-03 19:00:42 +02:00
1624dc9dfd
feat(alerting): separate operator and level
2016-05-03 17:31:04 +02:00
27c34745a6
feat(alerting): add link to alerts in side menu
2016-05-03 16:46:10 +02:00
bb6f4fff87
feat(export/import): minor progress
2016-05-03 16:40:21 +02:00
de26a17dc7
feat(footer): began work on page footer
2016-05-03 09:00:58 +02:00
bac89775e2
tech(alerting): fixes broken refactoring
2016-05-02 18:00:10 +02:00
b606d9b7da
test(alerting): fixes broken test
2016-05-02 16:27:02 +02:00
743a6fa37c
feat(alerting): add support for deleting alert rules
2016-05-02 16:07:19 +02:00
bc892789c1
feat(alerting): change state from ALERT to CRITICAL
2016-05-02 14:33:38 +02:00
6d66d9f42d
feat(alerting): adds fearture toogle for alerting
2016-04-29 14:35:58 +02:00
bd30a4d23e
Merge branch 'master' into alerting_definitions
2016-04-28 16:04:28 +02:00
bergquist
Torkel Ödegaard
Mitsuhiro Tanda
Anton Chevychalov
Dan Cech
Peggy Li
Martin Häger
fg2it