IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 20:24:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,577 Commits 5,112 Branches 538 Tags 1.9 GiB
3c0b5fe78e
Commit Graph

1249 Commits

Author SHA1 Message Date
bergquist
1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +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
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
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
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
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
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
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
Anton Chevychalov
c6744925c4 Add new parameter to config: default_theme. 2016-05-12 18:21:11 +03: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
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
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
Torkel Ödegaard
d98839fc19 Revert "feat(cli): detects plugin folder for dev env" 
This reverts commit a5eda6a87b.
 2016-04-15 09:01:27 -04:00
Torkel Ödegaard
d9ad4cf2fc fix(): made plugin settings api call accessable for viewer roles 2016-04-13 13:03:41 -04:00
Torkel Ödegaard
10131aa8a0 fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686 2016-04-13 12:23:29 -04:00
bergquist
91a1a823e2 feat(alerting): add basic tables for alerting definitions 2016-04-13 10:33:45 +02:00
Torkel Ödegaard
47bba71d7f fixed update check 2016-04-12 10:28:32 -04:00
Torkel Ödegaard
e7626befc5 updated version 2016-04-12 10:17:39 -04:00
Torkel Ödegaard
51aed2dbc6 Merge branch 'master' of github.com:grafana/grafana 2016-04-11 21:11:08 -04:00
Torkel Ödegaard
497e9343aa Merge branch 'pluginlist' 2016-04-11 21:10:54 -04:00
Torkel Ödegaard
6ce934f1dd feat(pluginlist): worked on plugin list 2016-04-11 20:33:58 -04:00
Torkel Ödegaard
f1ff044967 Merge branch 'master' of github.com:grafana/grafana 2016-04-11 18:16:57 -04:00
Torkel Ödegaard
9c14b9672f fix(): admin stats and postgres 2016-04-11 18:16:35 -04:00
Torkel Ödegaard
f93b039e42 change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases 2016-04-11 18:05:28 -04:00
Torkel Ödegaard
3849b59627 feat(updates): changed to new api 2016-04-11 17:16:52 -04:00
bergquist
a5eda6a87b feat(cli): detects plugin folder for dev env 
closes #4572
 2016-04-11 22:32:46 +02:00
Torkel Ödegaard
c518fdc155 Merge branch 'updatecheck' into pluginlist 2016-04-11 13:43:29 -04:00
Torkel Ödegaard
ab34b174f9 Added update notice to plugin list 2016-04-11 13:42:52 -04:00