IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,952 Commits 5,454 Branches 554 Tags 1.9 GiB
b824fa1916
Commit Graph

8952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist
f2cbfece2c feat(notification): add helptext for using multiple email addresses 2016-10-19 17:04:17 +02:00
bergquist
6ea0f0120e feat(notifications): switch to ; seperator 
using \n caused problems with the json deserialisation.

closes #6326
 2016-10-19 16:34:12 +02:00
bergquist
3ac38dfe70 Merge branch 'alerting_opentsdb' 2016-10-19 13:16:16 +02:00
bergquist
2df8c649b7 Merge branch 'master' into alerting_opentsdb 2016-10-19 13:15:22 +02:00
bergquist
5fbab038e8 fix(opentsdb): can always return false 2016-10-19 13:14:42 +02:00
Torkel Ödegaard
a826591eed Merge branch 'master' of github.com:grafana/grafana 2016-10-19 13:14:34 +02:00
Carl Bergquist
497eca0190 Merge pull request #6325 from utkarshcmu/alerting_opentsdb 
Implmented targetContainsTemplate for OpenTSDB
 2016-10-19 13:07:33 +02:00
utkarshcmu
62895114e1 Implmented targetContainsTemplate for OpenTSDB 2016-10-19 03:54:41 -07:00
bergquist
4c2f2eeb58 feat(opentsdb): add mock method for detecting targets with template values 2016-10-19 11:45:39 +02:00
bergquist
20bfe443fe feat(prometheus): trim labelname lookup key 
closes #6300
 2016-10-19 08:57:58 +02:00
bergquist
b2d5b920f5 feat(alerting): allow editor to modify notifications 
closes #6314
 2016-10-19 08:01:31 +02:00
Carl Bergquist
a1e97b0067 Merge pull request #6290 from utkarshcmu/alerting_opentsdb 
Opentsdb alerting feature completed, ready for testing
 2016-10-19 07:50:40 +02:00
Eric Uldall
9468ddeed5 Issues/6317 empty google login (#6318) 
* added Login property to google_oauth model

* fixed spacing

* fixed google_oauth syntax error, missing comma before newline

* set noexpandtab for commit
 2016-10-19 07:43:32 +02:00
utkarshcmu
333a853948 Fixed for loop and append 2016-10-18 08:48:06 -07:00
bergquist
d1eceedf55 feat(webhook): add httpmethod to webhook 
closes #6255
 2016-10-18 16:50:16 +02:00
bergquist
9429434cb5 feat(influxdb): use database auth if provided 
closes #6310
 2016-10-18 15:12:04 +02:00
Mitsuhiro Tanda
a8dd44918b support future time range 2016-10-18 19:39:04 +09:00
bergquist
2b55cf609c tech(build): include sha1 as artifact 2016-10-18 11:42:25 +02:00
bergquist
d016fc1da1 tech(build): create sha files for windows build 2016-10-18 10:54:17 +02:00
Carl Bergquist
860865bd55 Merge pull request #6303 from mtanda/cw_region 
(cloudwatch) add region
 2016-10-18 08:48:44 +02:00
Mitsuhiro Tanda
888619d74e (cloudwatch) add region 2016-10-18 12:28:20 +09:00
utkarshcmu
10d581dd0a Added unit tests for query parsing 2016-10-17 14:51:51 -07:00
utkarshcmu
2374d09877 Fixed query parsing bugs 2016-10-17 14:50:53 -07:00
bergquist
97008f90c4 tech(build): semicölöns 2016-10-17 15:19:00 +02:00
bergquist
75a1ff1037 tech(build): dont override arch for windows 2016-10-17 15:09:35 +02:00
bergquist
0abc22f272 tech(build): make artifact path less strict 2016-10-17 14:35:09 +02:00
mkm85
977cdd5933 Fix cloudwatch multivalue (#6282) 
* Fixed missing contains variable problem

* allow All option to be used in cloudwatch templating
 2016-10-17 11:33:28 +02:00
bergquist
b6d112f8d7 tech(build): appveyor formating 2016-10-17 09:34:58 +02:00
bergquist
6c7e227d2f Merge branch 'master' of github.com:grafana/grafana 2016-10-17 09:29:29 +02:00
Paul Traylor
a45a487ad3 Update query for "Rule Eval Duration" (#6294) 
This query was changed to use seconds in f69e668fc4
 2016-10-17 08:37:59 +02:00
utkarshcmu
ace81760ea Added tests file for writing tests 2016-10-16 12:10:13 -07:00
utkarshcmu
b7744b4928 Added tags and filters params to alerting 2016-10-16 10:55:07 -07:00
utkarshcmu
35f93f4117 Added rate params to alerting 2016-10-16 05:20:58 -07:00
utkarshcmu
cc0a39f816 Added downsampling params to alerting 2016-10-16 04:12:13 -07:00
benrubson
807bc5eb47 Add time back to result array 2016-10-16 01:09:00 +02:00
benrubson
9792bd7b08 Typo 2016-10-16 00:46:56 +02:00
benrubson
604dcbc6b2 Missing values, corect tooltip 2016-10-16 00:30:50 +02:00
benrubson
07bf4c0b82 Missing values, keep interpolation 2016-10-16 00:29:15 +02:00
benrubson
04a276dc2c Missing values, correctly highlight last point 2016-10-15 16:51:18 +02:00
benrubson
8d5269dea7 Typo 2016-10-15 13:17:11 +02:00
benrubson
43129aa563 Missing values, correct graph specs 2016-10-15 13:10:19 +02:00
benrubson
c976448f6a Missing values, stack null & missing values 2016-10-15 13:07:41 +02:00
benrubson
2cdd097b3a Missing values, correct timeStep 2016-10-15 11:43:36 +02:00
Ben RUBSON
d1e8418c74 Correct tooltip timestamp (#6283) 
Corrects #6275, follows #6211
 2016-10-15 08:02:07 +02:00
Torkel Ödegaard
c1567ae595 fix(build): fixes #6284 2016-10-15 08:00:48 +02:00
Torkel Ödegaard
04c23ef322 fix(SIGHUP): ignore SIGHUP syscall, fixes #6276 2016-10-14 14:23:22 +02:00
Torkel Ödegaard
30645a6d3d refactor(alerting): initial step for seperating alerting and dash model, #6273 2016-10-14 13:06:29 +02:00
bergquist
466e62968e tech(build): publish artifacts to s3 2016-10-14 10:37:31 +02:00
bergquist
ec4260e14f tech(build): remove commented build steps 2016-10-14 10:26:08 +02:00
bergquist
5e0fa0f0ad feat(opentsdb): context aware http requests 2016-10-14 10:21:47 +02:00