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
Torkel Ödegaard
0d4c76a029
feat(import): save gnetId for dashbards imported from grafana.net
2016-05-27 16:42:32 +02:00
bergquist
b2a4d8083e
feat(alerting): add datasource ref to alert rule
2016-05-25 12:57:49 +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
47070f2d1f
chore(alerting): struct names and url refactoring
2016-05-09 11:25:21 +02:00
bergquist
1624dc9dfd
feat(alerting): separate operator and level
2016-05-03 17:31:04 +02:00
bergquist
0f0fa0c257
feat(alerting): adds endpoint for getting alert states log
2016-04-28 10:59:46 +02:00
bergquist
e7be7d2835
feat(alerting): add api endpoint for alert state
2016-04-28 08:23:50 +02:00
bergquist
7041169ffb
feat(alerting): add datasource name field
2016-04-27 09:06:19 +02:00
bergquist
25f6ec8b53
feat(alerting): add support for alert_rule updates
2016-04-25 16:18:28 +02:00
bergquist
c83af353b2
feat(alerting): renames alert table to alert_rule
2016-04-25 14:42:24 +02:00
bergquist
96e88ee84d
refactor(alerting): changes interval to string from int
2016-04-20 16:57:03 +02:00
bergquist
ef92fd4ebc
feat(alerting): renames error_level to crit_level
2016-04-20 15:02:49 +02:00
bergquist
ca3ad7d17c
tests(alerting): add tests for saving alerts
2016-04-19 16:52:20 +02:00
bergquist
daa5468801
feat(alerting): parses dashboard alerts
2016-04-18 14:15:03 +02:00
bergquist
769016783f
feat(alerting): add aggregator field
2016-04-18 11:10:52 +02:00
bergquist
91a1a823e2
feat(alerting): add basic tables for alerting definitions
2016-04-13 10:33:45 +02:00
Torkel Ödegaard
9b30634217
fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558
2016-04-05 11:24:21 -04:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01:00
utkarshcmu
e371e03696
Able to save preference version, created, updated fields
2016-03-14 03:12:52 -07:00
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08:00
utkarshcmu
ac499b3aff
Minor Pre-PR fixes
2016-03-04 01:29:46 -08:00
utkarshcmu
662579e9a9
Added preferences migrations
2016-03-03 02:08:51 -08:00
Torkel Ödegaard
8db7cf49a6
feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins
2016-02-25 14:55:31 +01:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
Anthony Woods
05868bc1df
fix typo
2016-01-26 04:24:44 +08:00
Anthony Woods
40d946a6e3
add drop table to ensure existing installs get new schema
2016-01-26 04:18:18 +08:00
Anthony Woods
32f78d465b
add secureJsonData to appSettings model.
...
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
2016-01-23 06:17:22 +08:00
Torkel Ödegaard
66eebd1ac3
refactor(playlist): refactor of playlist feature, and PR #3776
2016-01-18 16:01:14 +01:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
