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
71c1c0ab65
feat(alerting): trying to get things to work with new model
2016-06-11 13:49:11 +02:00
Torkel Ödegaard
0ef6801117
Merge branch 'master' into alert_ui_take2
2016-06-11 12:17:14 +02:00
Torkel Ödegaard
77a5e3f14d
feat(alerting): minor fixes
2016-06-11 11:54:46 +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
1fa9ae810b
test(alerting): enable disabled tests
2016-06-10 15:49:23 +02:00
bergquist
83c422e6ef
feat(alerting): implement transform objects
2016-06-10 15:31:17 +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
bergquist
1e4761854e
Merge branch 'alerting_definitions' into alert_ui_take2
2016-06-09 13:03:40 +02:00
bergquist
66d47a9303
tech(alerting): go vet fix
2016-06-09 10:49:25 +02:00
Torkel Ödegaard
dee5f582d7
Merge branch 'master' into alerting_definitions
2016-06-09 10:45:16 +02:00
bergquist
544073b7e1
feat(alerting): make sure saved alerts are valid
2016-06-09 10:27:23 +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
0d9c9526b9
feat(alerting): fixed graphite log issue
2016-06-07 13:47:22 +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
d1acfb4494
feat(alerting): minor progress
2016-06-06 14:24:14 +02:00
Torkel Ödegaard
7a34c129fe
feat(alerting): things are compiling and tests pass
2016-06-06 13:50:47 +02:00
Torkel Ödegaard
0cbf4ae773
feat(alerting): began work on splitting scheduler into scheduler and engine
2016-06-06 11:56:58 +02:00
Torkel Ödegaard
a191b9b1cf
feat(alerting): moved alerting models back to alerting package, models is more for storage dtos
2016-06-06 10:31:21 +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
2cf797b567
tech(alerting): minor refactoring and code style
2016-06-03 15:01:42 +02:00
bergquist
5bbfe39f84
tech(alerting): replace goreq with native http
2016-06-03 11:38:56 +02:00
bergquist
9c7e6a2133
feat(alerting): add basic auth support for graphite
2016-06-03 11:07:55 +02:00
bergquist
eab81a7781
style(alerting): go lint fixes
2016-06-03 09:11:20 +02:00
bergquist
50d98b161c
feat(alerting): adds support for retries
2016-06-03 09:04:20 +02:00
bergquist
68f01d57d3
tech(alerting): use range in loops when possible
2016-06-03 08:44:22 +02:00
bergquist
cc65dd8bcf
tech(alerting): use pointers for updating alertjobs
2016-06-03 08:33:53 +02:00
bergquist
910253bc42
tech(alerting): remove datasource ref from alertjob
2016-06-03 07:40:47 +02:00
bergquist
0bea0cc5b9
feat(alerting): add interface for alert backend
2016-06-02 16:34:25 +02:00
bergquist
69229211b2
fix(alerting): move backend to seperate file
2016-06-01 11:25:29 +02:00
bergquist
4e1f801f6c
feat(alerting): add serie name to failed alert description
2016-05-31 21:02:26 +02:00
bergquist
76758d270f
feat(alerting): set basic description text of status ok
2016-05-31 20:03:15 +02:00
bergquist
7c3dbe2a38
chore(alerting): move aggregations into alerting package
2016-05-31 15:29:56 +02:00
bergquist
7224ea5229
chore(alerting): convert alert levels to float
2016-05-31 14:18:12 +02:00
bergquist
338fdcb576
feat(alerting): add copy of AlertRule to AlertResult
2016-05-31 13:27:12 +02:00
bergquist
d1daa2c817
style(alerting): give better info about actual value
2016-05-30 19:21:28 +02:00
bergquist
b75631e021
chore(alerting): move alert result to models
2016-05-30 19:08:04 +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
3d5c27df91
test(alerting): add tests for multi serie checks
2016-05-30 14:58:32 +02:00
bergquist
411568351d
feat(alerting): revert operand positions
2016-05-30 14:47:59 +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
bergquist
51511dd654
feat(alerting): save alert state
2016-05-30 09:03:14 +02:00
Torkel Ödegaard
0d4c76a029
feat(import): save gnetId for dashbards imported from grafana.net
2016-05-27 16:42:32 +02:00
bergquist
e80000ce94
tech(alerting): skip if operator does not exist
2016-05-27 15:53:18 +02:00
bergquist
1f990da5c3
tech(alerting): use the timeseries ctor function
2016-05-27 15:51:34 +02:00
bergquist
22d8723c1d
feat(alerting): generelize aggregator functions
2016-05-27 15:17:48 +02:00
bergquist
abc1ae3956
feat(alerting): add timeserie aggregation functions
2016-05-27 14:59:13 +02:00
bergquist
205afd7212
style(alerting): remove some logging
2016-05-27 12:13:09 +02:00
bergquist
422234d03a
feat(alerting): abstract graphite from executor
2016-05-27 12:06:41 +02:00
bergquist
3d66ec816d
chore(alerting): minor refactoring
2016-05-27 10:34:44 +02:00
bergquist
8ac635b631
style(alerting): change const names
2016-05-26 07:41:23 +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
0f58f8a679
feat(alerting): add timeout handler for check execution
2016-05-24 10:30:39 +02:00
bergquist
448ee5812c
feat(alerting): make sure the map contains the responding alert
2016-05-24 07:24:45 +02:00
bergquist
7229fb7a76
tech(alerting): change from array to map
2016-05-23 17:04:57 +02:00
bergquist
77ec575b46
tech(alerting): fixes broken unit-tests
2016-05-23 14:51:41 +02:00
bergquist
9d500df2bb
chore(alerting): remove redundant code
2016-05-23 14:36:24 +02:00
bergquist
9f8c67e352
feat(alerting): only start unfinnished jobs
2016-05-23 14:14:02 +02:00
bergquist
cb21bf41b0
tech(alerting): split code into different files
2016-05-23 12:15:36 +02:00
bergquist
b496b6a252
test(alerting): add test for alertjob selection
2016-05-23 12:04:34 +02:00
bergquist
4fce82344e
feat(alerting): async exeuction on a shoestring
2016-05-23 11:47:41 +02:00
bergquist
f95fa51322
feat(alerting): make rule execution async
2016-05-23 11:17:07 +02:00
bergquist
a7fcb3a2cc
feat(alerting): add dummie executor
2016-05-23 10:59:28 +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
Torkel Ödegaard
c133a00125
feat(alerting): minor progress on scheduler
2016-05-17 14:31:52 +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
bergquist
0f0fa0c257
feat(alerting): adds endpoint for getting alert states log
2016-04-28 10:59:46 +02:00
bergquist
3ecc13506c
feat(alerting): adds alert state go ui
2016-04-28 08:53:34 +02:00
bergquist
1631673485
feat(alerting): dont change state when updating alert definitions
2016-04-28 08:42:51 +02:00
bergquist
e7be7d2835
feat(alerting): add api endpoint for alert state
2016-04-28 08:23:50 +02:00
bergquist
44dd98e277
tech(alerting): rename alerting sql server
2016-04-27 09:25:11 +02:00
bergquist
7041169ffb
feat(alerting): add datasource name field
2016-04-27 09:06:19 +02:00
bergquist
973db1ac38
feat(alerting): add api route for alert changes
2016-04-27 08:59:33 +02:00
bergquist
9b50313f11
feat(alerting): add api endpoints for listing alerts
2016-04-26 17:36:50 +02:00
bergquist
996eec3ce2
tech(alerting): refactored save alerts code
2016-04-26 16:31:13 +02:00
bergquist
3ef2be13df
feat(alerting): move alert deletion to alert code
2016-04-26 15:48:29 +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
f167ce19ab
test(alerting): add test for deleting alerts
2016-04-25 13:00:05 +02:00
bergquist
bdd3e2ad73
Merge branch 'master' into alerting_definitions
2016-04-25 11:22:35 +02:00
Torkel Ödegaard
97656d65ec
db(dashboard): minor fix for dashboard delete
2016-04-25 11:22:13 +02:00
bergquist
5d5999561a
test(dashboard): add failing test for deleting dashboards
2016-04-25 08:46:15 +02:00
bergquist
44310921b5
test(alerting): add commented failed test
2016-04-25 08:34:48 +02:00
bergquist
03e6fc951f
feat(alerting): delete alerts when dashboard gets deleted
2016-04-23 14:14:18 +02:00
bergquist
ec6dbe3067
tests(alerting): connect alerts to dashboard
2016-04-23 10:41:50 +02:00
bergquist
84115c8038
feat(alerting): delete alerts when panels are removed
2016-04-22 17:49:50 +02:00
bergquist
8bb62a79d0
feat(alerting): excisting alerts are now updated
2016-04-22 16:51:24 +02:00
bergquist
96e88ee84d
refactor(alerting): changes interval to string from int
2016-04-20 16:57:03 +02:00
bergquist
262821e7e7
feat(alerting): tests that alertes can be read from db
2016-04-20 16:46:24 +02:00
bergquist
ef92fd4ebc
feat(alerting): renames error_level to crit_level
2016-04-20 15:02:49 +02:00
bergquist
7860a2a1b8
feat(alerting): make sure dashboard id exists
2016-04-20 09:55:32 +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
9c14b9672f
fix(): admin stats and postgres
2016-04-11 18:16:35 -04: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
ab1048b7ee
feat(preferences): theme and home dashbord settings now work work on profile and org settings page
2016-04-02 13:54:06 -07:00
Torkel Ödegaard
38a10f8be4
progress
2016-04-01 17:34:30 -07:00
Torkel Ödegaard
7023dedc05
feat(preferences): refactoring PR #4399
2016-03-20 11:52:19 +01:00
Torkel Ödegaard
9e98c86ae1
Merge branch 'master' into preferences
2016-03-20 11:27:49 +01:00
utkarshcmu
66621d762e
Added getDashboardSlugById api
2016-03-17 01:01:58 -07:00
utkarshcmu
9dd6aefcec
Minor corrections
2016-03-16 23:35:06 -07:00
utkarshcmu
749fd618a9
Saving home dashboard id in table
2016-03-16 23:22:27 -07:00
Torkel Ödegaard
fcaf2bfdba
fix(datasource): when addding data source withCredentials did not get set, fixes #4389
2016-03-16 15:16:28 +01:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01:00
Torkel Ödegaard
e06756bcab
Merge branch 'preferences' of github.com:grafana/grafana into preferences
2016-03-15 22:15:27 +01:00
Torkel Ödegaard
9c222a445f
Merge branch 'master' into preferences
2016-03-15 22:14:35 +01:00
utkarshcmu
e371e03696
Able to save preference version, created, updated fields
2016-03-14 03:12:52 -07:00
Torkel Ödegaard
0398face05
feat(plugins): dashboard import for data sources is working! #4298
2016-03-12 10:13:49 +01:00
Torkel Ödegaard
3fb0b71822
refactor(): refactoring json usage
2016-03-12 00:13:06 +01:00
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
utkarshcmu
9c8d508247
Made API handling better, removed unused components
2016-03-06 12:32:22 -08:00
utkarshcmu
8f42bec270
Implemented GetUserPreferences API
2016-03-06 11:42:15 -08:00
utkarshcmu
660d3fa1e9
Implemented savePreferences API
2016-03-06 03:47:39 -08:00
utkarshcmu
cf926134ef
Added savePreferencesAPI
2016-03-05 13:15:49 -08:00
bergquist
dd7e215e78
feat(dashslist): make sure dashbords exists in recently viewd dashboards
...
closes #4249
2016-03-05 12:27:37 +01: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
56c080417a
fix(logging): only log to xorm.log when in dev mode, fixes #4182
2016-02-29 13:42:07 +01: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
Torkel Ödegaard
b5dc1727d2
fix(postgres): If password or user is empty use empty quotes for connection string, #3985
2016-02-12 10:10:07 +01:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
fcc960e9a2
Merge pull request #3792 from utkarshcmu/snapshot-view
...
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
Torkel Ödegaard
12460af0ec
Merge pull request #3830 from raintank/apiPlugin
...
Add secureJsonData field to appSettings model
2016-01-29 17:17:37 -05:00
Daniel Lee
21632d22ab
Merge pull request #3882 from bergquist/playlist_tags
...
Add support for playlist based on tags
2016-01-29 21:32:58 +01:00
bergquist
d405176367
chore(playlist): remove commented code
2016-01-29 20:33:01 +01:00
bergquist
15087251fb
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
2016-01-29 20:24:19 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08:00
bergquist
d27bb4d3fb
style(playlist): move dashboard access to dashboard.go
2016-01-29 01:41:23 +01:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
8bd07287f8
Fixed dashboard_tag query
2016-01-27 17:41:23 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
Carl Bergquist
251bf7a2b4
Merge pull request #3840 from utkarshcmu/stats
...
Grafana stats view as mentioned in #3812
2016-01-27 19:41:10 +01:00
utkarshcmu
442db7fee1
Changed sql query for grafana_admin_count
2016-01-25 14:30:36 -08:00
bergquist
92cba94031
tech(fmt): remove unused code
2016-01-25 22:11:24 +01:00
bergquist
52403ca17e
feat(playlist): add usage statisics
2016-01-25 21:39:45 +01: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
utkarshcmu
2190392e05
Added grafana_admins count
2016-01-25 00:39:31 -08:00
utkarshcmu
da67afa51e
Fixed api bugs, stats endpoint working
2016-01-24 21:18:17 -08:00
utkarshcmu
c7fae5386d
Added backend API for stats
2016-01-24 11:01:33 -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
Anthony Woods
423eca6e7d
add support for fetching appSettings by appId
2016-01-21 11:41:02 +08:00
utkarshcmu
ca55d1f315
Minor bug fixes
2016-01-19 05:05:24 -08:00
utkarshcmu
41fd0ed467
Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view
2016-01-19 05:05:03 -08:00
utkarshcmu
bcb44b7b31
UI and backend connectivity implemented
2016-01-19 05:02:22 -08:00
utkarshcmu
1ab1154010
Optimized backend queries
2016-01-19 04:09:57 -08:00
utkarshcmu
8f067a5ed2
Added backend functionality for searching snapshots
2016-01-19 01:37:36 -08:00
utkarshcmu
1952ebf7c4
Fixed failing gofmt tests
2016-01-19 00:33:30 -08:00
utkarshcmu
70481953fd
Snapshot name is saved in DB now
2016-01-19 00:26:20 -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
Carl Bergquist
f7fecdc6de
Merge pull request #3655 from grafana/playlist
...
Persistable playlists
closes #515
closes #1137
2016-01-12 15:20:43 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
bergquist
98dccb8641
feat(playlist): refactor FE to support playlistitems
2016-01-12 08:17:44 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
bergquist
0918063c55
fix(playlist): move dashboard uri cration to Backend
2016-01-08 16:13:49 +01:00
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
bergquist
6c8d084664
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
2016-01-07 17:08:31 +01:00
nikita-graf
ee400df930
remove dashboard from playlist when its destroyed
2016-01-05 04:14:39 +03:00
Carl Bergquist
311624beaa
Merge pull request #3598 from eddawley/ISSUE-2818
...
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-28 10:33:49 +01:00
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
Torkel Ödegaard
69eb62c09f
Merge pull request #3597 from eddawley/ISSUE-3461
...
Issue 3461: Session table is now created automatically
2015-12-24 09:59:34 +01:00
Ed Dawley
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
Ed Dawley
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
Daniel Low
3f9f0679ec
gofmt
2015-12-22 13:10:34 +00:00
Daniel Low
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
utkarshcmu
22fd2aed02
Removed columns from snapshot table
2015-12-18 00:30:44 -08:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
utkarshcmu
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08:00
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
Torkel Ödegaard
c7e3ed096f
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
2015-12-14 10:19:53 +01:00
Mitsuhiro Tanda
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
utkarshcmu
79d0f47ee7
Added columns in dashboard_snapshot
2015-12-07 04:24:29 -08:00
utkarshcmu
42d1205260
Fixed gofmt checks
2015-12-06 23:59:58 -08:00
utkarshcmu
3d90340446
Added new columns to dashboard table
2015-12-06 23:51:43 -08:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
utkarshcmu
fe2d8f1ea0
Used dialect for postgres
2015-11-07 05:21:22 -08:00
utkarshcmu
2676f24e0a
Fixed user deletion in Postgres SQL
2015-11-06 20:17:27 -08:00
Torkel Ödegaard
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +02:00
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
woodsaj
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
woodsaj
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
woodsaj
6488324cf1
enhance quota support.
...
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08:00
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
