IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,123 Commits 5,454 Branches 554 Tags 1.9 GiB
da59d6547f
Commit Graph

1465 Commits

Author SHA1 Message Date
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
3c0b5fe78e tech(alerting): add graphite dateformat replacer 2016-06-10 13:26:19 +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
b17298c97c test(alerting): remove unused code to enable gorename 2016-06-10 07:11:14 +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
Torkel Ödegaard
1584dac00a Merge branch 'master' of github.com:grafana/grafana 2016-06-09 10:43:46 +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
1d8fdc09e7 feat(logging): added log format option, #4590 2016-06-08 08:48:46 +02:00
Torkel Ödegaard
7d6cda4916 Merge branch 'master' of github.com:grafana/grafana 2016-06-08 08:10:22 +02:00
Torkel Ödegaard
b25cb60259 Merge branch 'new-logger' 
Conflicts:
	CHANGELOG.md
 2016-06-08 08:09:59 +02:00
Torkel Ödegaard
87e98f01cd feat(logging): updated syslog writer to work with log15 log interface, closes #4590 2016-06-08 08:09:29 +02:00
Karl
22cda198ae Apply EscapeFilter to username to address grafana/grafana#5121 (#5279) 2016-06-08 07:28:16 +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
67ad903556 feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299 2016-06-08 05:45:13 +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
d7c03359ea feat(alerting): fixed test issues 2016-06-07 14:54:30 +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
65aad44464 feat(logging): added uname to context logger 2016-06-07 12:20:46 +02:00
Torkel Ödegaard
a02cf5beb7 feat(logging): added loging filters 2016-06-07 12:11:41 +02:00
Torkel Ödegaard
3dc7706c45 feat(loggin): improved http request panic handling 2016-06-07 10:05:10 +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
Torkel Ödegaard
f36a44c49a Merge branch 'master' into alerting_definitions 
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
 2016-06-06 08:43:01 +02:00
Karl
2f5ae85d33 Initial patch for grafana/grafana#4267 (#5280) 2016-06-06 07:15:37 +02:00
Torkel Ödegaard
7cbaf06097 feat(instrumentation): check if enabled in http api metrics route 2016-06-03 21:22:34 +02:00
Torkel Ödegaard
1059a35bbc feat(instrumentation): documented instrumentation options, closes #4696 2016-06-03 18:38:19 +02:00
Torkel Ödegaard
064e474b0a Merge branch 'metrics_reporting' 2016-06-03 18:06:41 +02:00
Torkel Ödegaard
aef2b6b45f feat(instrumentation): finial polish 2016-06-03 17:15:17 +02:00
Torkel Ödegaard
35a7a3a52b feat(instrumentation): added some more timers 2016-06-03 17:00:39 +02:00
Torkel Ödegaard
e0c6048820 feat(instrumentation): added gauge and http endpoint 2016-06-03 16:15:36 +02:00
bergquist
6a49d4ed6b feat(alerting): remove orgid from alertrule query 2016-06-03 15:24:53 +02:00
bergquist
b08f8bab71 Merge branch 'dakerfp-patch-3' 2016-06-03 15:09:18 +02:00
Torkel Ödegaard
1a05ae2eaa feat(instrumentation): more work 2016-06-03 15:06:57 +02:00
bergquist
961c31a747 test(util): add unit test for string util 2016-06-03 15:06:54 +02:00
bergquist
d1a345bb03 Merge branch 'patch-3' of https://github.com/dakerfp/grafana into dakerfp-patch-3 2016-06-03 15:02:46 +02:00
bergquist
2cf797b567 tech(alerting): minor refactoring and code style 2016-06-03 15:01:42 +02:00
Carl Bergquist
236aed112f Merge pull request #5255 from dakerfp/patch-1 
Unify signal registration in a single syscall.
 2016-06-03 14:59:42 +02:00
bergquist
65eb373808 Merge branch 'master' into alerting_definitions 2016-06-03 13:48:36 +02:00
bergquist
3d7facf6ee fix(cli): fixes broken import 2016-06-03 13:40:48 +02:00
Torkel Ödegaard
eee49a4995 feat(instrumentation): added meter, histogram and new timer, timer now send p25, p75, p90, p99 percentiles in 1000 sample exp decaying sample 2016-06-03 12:50:51 +02:00
bergquist
6de1399cf0 fix(cli): fixes broken import 2016-06-03 12:35:17 +02:00
bergquist
d0ac258474 Merge branch 'master' into alerting_definitions 2016-06-03 12:22:46 +02:00
bergquist
15aeb4aec2 tech(cli): rename log to logger to separate from server logger 2016-06-03 12:22:30 +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
Torkel Ödegaard
3065d10931 feat(timing): timing is now working with graphite and influxdb 2016-06-03 09:17:36 +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
Torkel Ödegaard
e2c794ff31 feat(instrumentation): lots of refactoring to support tag based backend, #4696 2016-06-02 21:06:49 +02:00
Torkel Ödegaard
2a9b51d836 feat(instrumentation): influxdb is working, now need to find a way to better support tags, #4696 2016-06-02 16:56:07 +02:00
bergquist
0bea0cc5b9 feat(alerting): add interface for alert backend 2016-06-02 16:34:25 +02:00
Torkel Ödegaard
6b2a4fe8e8 feat(instrumentation): work on settings model for internal metrics publishing, #4696 2016-06-02 14:32:17 +02:00
Torkel Ödegaard
74101eaf7c feat(instrumentation): changed name to senders 2016-06-02 12:04:50 +02:00
Torkel Ödegaard
8ab324988c Merge branch 'v3.0.x' 2016-06-02 09:57:20 +02:00
Torkel Ödegaard
1283461b89 fix(gzip): add plugin proxy to gzip exclusion, fixes #5237 2016-06-02 09:56:53 +02:00
Daker Fernandes Pinheiro
2d09dfd34f Using variadic argument to StringFallback implementation 2016-06-02 01:46:18 -03:00
Daker Fernandes Pinheiro
48e4de823a Unify signal registration in a single syscall. 2016-06-02 01:34:37 -03:00
bergquist
65d8403a04 fix(metrics_reporting): adds missing formating varialbe 2016-06-01 15:16:17 +02:00
bergquist
a8ac37f517 feat(usage_metrics): add timer metrics 2016-06-01 15:04:58 +02:00
bergquist
b2c0679a7f feat(metrics): initial graphite metrics writer for internal stats 2016-06-01 13:31:11 +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
bergquist
1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +02:00
Torkel Ödegaard
0d4c76a029 feat(import): save gnetId for dashbards imported from grafana.net 2016-05-27 16:42:32 +02:00
Torkel Ödegaard
c3708b3096 feat(import): import directly from grafana.net id/url now works 2016-05-27 16:11:05 +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
5f2447976c style(alerting): add note about making timeseries model safer 2016-05-27 15:28:47 +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
Torkel Ödegaard
540def2c39 feat(import): working on unit tests for import ctrl 2016-05-27 13:52:19 +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
Mat Schaffer
18f704533f Add enhanced elasticbeanstalk metrics 2016-05-27 11:47:53 +09:00
Mat Schaffer
aedba5411c Add basic metrics for AWS/ElasticBeanstalk 2016-05-27 11:30:16 +09:00
Torkel Ödegaard
e83d13848e Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-26 14:22:22 +02:00
bergquist
8ac635b631 style(alerting): change const names 2016-05-26 07:41:23 +02:00
Jared Wiltshire
c9d6321f38 Allow for proxying Authorization header and automatically convert (#4832) 
Authorization header to X-DS-Authorization in backend_srv.js
 2016-05-26 07:13:29 +02:00
Mukesh
4038b4d17e Set active org through admin api (#5179) 2016-05-26 06:51: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
Torkel Ödegaard
ba6573af61 Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-25 12:32:56 +02:00
Torkel Ödegaard
2cd6c2e7e0 Merge branch 'v3.0.x' 2016-05-25 11:04:12 +02:00
bergquist
8c2b6b532d fix(preferences): fixes broken default home dashboard 
closes #5167
 2016-05-25 09:56:45 +02:00
bergquist
0f58f8a679 feat(alerting): add timeout handler for check execution 2016-05-24 10:30:39 +02:00
Torkel Ödegaard
10c47ee27c feat(footer): some minor changes to footer to make it look good in light theme, closes #4889 2016-05-24 08:11:28 +02:00
Torkel Ödegaard
8f0240a295 Merge branch 'footer' 2016-05-24 07:53:13 +02:00
Torkel Ödegaard
fd08c821f9 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-24 07:52:27 +02:00
Torkel Ödegaard
c41c771e9a fix(home dashboard): fixed handling error when default dashboard is not found, fixes #5141 2016-05-24 07:39:58 +02:00
bergquist
448ee5812c feat(alerting): make sure the map contains the responding alert 2016-05-24 07:24:45 +02:00
Torkel Ödegaard
9a7817a271 Merge branch 'master' into footer 
Conflicts:
	pkg/api/frontendsettings.go
 2016-05-23 20:59:23 +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
Torkel Ödegaard
c60d737928 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-23 09:29:14 +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
Torkel Ödegaard
43ba563a1c fix(logging): change log level to trace for plugin proxy logging call, fixes #5126 2016-05-23 07:55:55 +02:00
Mitsuhiro Tanda
1d27a7f93d (cloudwatch) fix wrong cache key of credentials (#5124) 2016-05-21 09:02:04 +02:00
bergquist
9d016a2756 feat(alerting): add migration for create and update 2016-05-20 14:23:24 +02:00
Torkel Ödegaard
855e913bbd feat(dashboards): began work on dashboard list 2016-05-19 11:03:10 +02:00
Torkel Ödegaard
cac723dab3 Merge branch 'master' into export-dashboard 2016-05-19 08:48:24 +02:00
bergquist
ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
Torkel Ödegaard
b6dcf6bd02 Merge branch 'v3.0.x' 2016-05-18 14:23:59 +02:00
Torkel Ödegaard
d474eba53a fix(logging): fixed reading config level from config file, fixes #5079 2016-05-18 14:18:08 +02:00
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard 
Conflicts:
	.floo
	.flooignore
 2016-05-18 08:08:15 +02:00
Mitsuhiro Tanda
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
Torkel Ödegaard
958f97232f fix(pluginlist): fixed issue with plugin list, fixes #5068 2016-05-17 21:51:19 +02:00
Torkel Ödegaard
83f5080274 feat(angular): disable debug in production for angular compiler 2016-05-17 15:00:48 +02:00
Torkel Ödegaard
c133a00125 feat(alerting): minor progress on scheduler 2016-05-17 14:31:52 +02:00
Torkel Ödegaard
ad7a1e15b4 feat(export): began working on export modal 2016-05-17 10:29:57 +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
bergquist
31698a1c55 Merge branch 'master' into alerting_definitions 2016-05-16 09:28:14 +02:00
Torkel Ödegaard
7cd663bbe8 feat(import): more import work 2016-05-14 10:00:43 +02:00
Anton Chevychalov
c6744925c4 Add new parameter to config: default_theme. 2016-05-12 18:21:11 +03:00
Torkel Ödegaard
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
Dan Cech
9f9f4e7fef use new plugin-specific repo route when installing or updating a single plugin (#4992) 2016-05-12 10:43:31 +02:00
Peggy Li
9b0da20d90 Fix typo in error message from update checker 2016-05-10 16:06:51 +00:00
Torkel Ödegaard
db664c61a4 Merge branch 'master' into export-dashboard 2016-05-10 16:46:58 +02:00
bergquist
1fe2055743 tech(alerting): disable DEL for alert rules in the api 2016-05-10 15:02:11 +02: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
3e462f2914 chore(alerting): style refactoring 2016-05-09 12:10:53 +02:00
bergquist
35c73902da Merge branch 'master' into alerting_definitions 2016-05-09 11:34:56 +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
Martin Häger
0764a4313b AWS Elasticsearch Service Dimensions (#4903) 2016-05-04 10:47:35 +02:00
bergquist
26941284da feat(alerting): add limit and since id options for alert logs 2016-05-04 09:57:53 +02:00
fg2it
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
Torkel Ödegaard
f4a013946f feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled 2016-05-03 19:00:42 +02:00
bergquist
1624dc9dfd feat(alerting): separate operator and level 2016-05-03 17:31:04 +02:00
bergquist
27c34745a6 feat(alerting): add link to alerts in side menu 2016-05-03 16:46:10 +02:00
Torkel Ödegaard
bb6f4fff87 feat(export/import): minor progress 2016-05-03 16:40:21 +02:00
Torkel Ödegaard
de26a17dc7 feat(footer): began work on page footer 2016-05-03 09:00:58 +02:00
bergquist
bac89775e2 tech(alerting): fixes broken refactoring 2016-05-02 18:00:10 +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
bc892789c1 feat(alerting): change state from ALERT to CRITICAL 2016-05-02 14:33:38 +02:00
bergquist
6d66d9f42d feat(alerting): adds fearture toogle for alerting 2016-04-29 14:35:58 +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
6a5ecb3fca feat(alerting): adds basic page for listing alerts 2016-04-27 13:02:28 +02:00
bergquist
3cf6532515 feat(alerting): add json encoding name for properties 2016-04-27 11:44:04 +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
2e097f4af1 Merge branch 'master' into alerting_definitions 2016-04-26 17:38:29 +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
55e83a3d62 feat(alerting): rename alerting dashboard names 2016-04-26 16:06:29 +02:00
bergquist
3ef2be13df feat(alerting): move alert deletion to alert code 2016-04-26 15:48:29 +02:00
Torkel Ödegaard
bce5c447b3 fix(apps): app dashboards can now be updated, fixes #4817 2016-04-26 12:52:44 +02:00
bergquist
bb42579b0f Merge branch 'master' into alerting_definitions 2016-04-25 16:42:33 +02:00
bergquist
ddd826616b feat(alerting): serialize whole target obj from dashboard 2016-04-25 16:38:27 +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
Torkel Ödegaard
04a79175bf fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784 2016-04-25 14:00:49 +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
Torkel Ödegaard
ba28d2e13f Merge branch 'master' of github.com:grafana/grafana 2016-04-25 09:26:57 +02:00
Torkel Ödegaard
711992c8e2 fix(influxdb): minor fix for duplicated db param to proxied influxdb call, fixes #4703 2016-04-25 09:26:47 +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
07b13e24fa style(cli): add some color to error messages 2016-04-23 14:39:42 +02:00
bergquist
0855f51436 feat(cli): improves defer error handling 2016-04-23 14:39:42 +02:00
bergquist
70acfb2cfd fix(cli): adds better help text. 
The zip lib is throwing panics sometimes when the response is malformed.
The cli will now try to download the zip file up to three times before
aborting. The cli gives a better error message and informes the user
about retrying.

closes #4651
 2016-04-23 14:39:42 +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
ba5978abd3 Merge branch 'master' into alerting_definitions 2016-04-22 15:52:56 +02:00
bergquist
51de894692 fix(snapshots): sets default value for snapshot name 
make it possible for < 3.0 instances to publish snapshots

ref #4778
 2016-04-21 09:59:48 +02:00
Torkel Ödegaard
41e5812a22 Merge pull request #4771 from mtanda/cloudwatch_kinesis_metrics 
(cloudwatch) add kinesis metrics
 2016-04-20 08:57:26 -07: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
Mitsuhiro Tanda
8d1ac8c7f5 (cloudwatch) add kinesis metrics 2016-04-20 14:33:08 +09:00
Carl Bergquist
9f4ad73698 Merge pull request #4758 from bergquist/cli_local_pluginfolder 
CLI: Adds support for local plugin folder
 2016-04-19 17:30:01 +02:00
bergquist
ca3ad7d17c tests(alerting): add tests for saving alerts 2016-04-19 16:52:20 +02:00
bergquist
832e38af34 feat(alerting): limit alerts to one per panel 2016-04-19 15:34:23 +02:00
bergquist
ff22f43002 fix(cli): fixes missplaced % 2016-04-19 14:46:03 +02:00
bergquist
d38d4efc18 style(cli): improve logging to find install crash 2016-04-19 10:39:55 +02:00
bergquist
a8c68e33db feat(cli): add more logging for failed install 2016-04-19 10:22:02 +02:00
bergquist
903d1b7797 tech(cli): dont use defer statements in loops 2016-04-19 09:13:58 +02:00
bergquist
5abaf26b5f style(cli): remove some logging 2016-04-19 08:39:22 +02:00
bergquist
485a377800 fix(cli): adds support for local plugin folder 
closes #4572
 2016-04-19 08:27:26 +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
bcf10a6483 Merge branch 'master' into alerting_definitions 2016-04-18 10:28:40 +02:00