Torkel Ödegaard
a826591eed
Merge branch 'master' of github.com:grafana/grafana
2016-10-19 13:14:34 +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
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
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
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
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
Torkel Ödegaard
4c26c55fea
fix(api): minor change to how pause alert was done
2016-10-14 09:58:22 +02:00
Torkel Ödegaard
46bab0bb37
feat(alerting): remove annotations when deleting alert, closes #6244
2016-10-14 09:43:30 +02:00
Torkel Ödegaard
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
bergquist
aeb0c5cb53
Merge branch 'master' into interval
2016-10-14 09:15:04 +02:00
bergquist
f4e0a9245e
feat(influxdb): choose highest interval value
2016-10-14 09:14:13 +02:00
bergquist
fb99d9d680
feat(build): remove dist from artifact path
2016-10-14 07:05:36 +02:00
bergquist
b2acc7cf03
feat(build): build zipfile before creating artifact
2016-10-13 17:51:09 +02:00
Carl Bergquist
0793811b7e
Merge pull request #6192 from polynomial/fix_typo
...
fix(docs): duplicate word data in Graph Panel
2016-10-13 17:17:49 +02:00
bergquist
da2aaf7095
feat(build): trigger windows build after successfull CI build
2016-10-13 17:11:04 +02:00
Carl Bergquist
7bdedff89c
feat(plugins): make sure windows data plugin path is absolute ( #6264 )
2016-10-13 15:36:35 +02:00
Torkel Ödegaard
44f064392d
feat(alerting): different colored lines/icons for alert annotations based on state, #6244
2016-10-13 15:22:54 +02:00
mdadm
fa492c6828
fixed scoping issue with certPool variable ( #6261 )
2016-10-13 13:38:55 +02:00
bergquist
4144eacc24
feat(influxdb): start parsing interval parameters
2016-10-13 11:42:51 +02:00
bergquist
1506df8c11
feat(alerting): parse the interval value from the panel
2016-10-13 11:19:44 +02:00
Carl Bergquist
c0596d0dd0
Merge pull request #6257 from utkarshcmu/opentsdb_lodash
...
Opentsdb queries fixed without alias but with tags/filters
2016-10-13 07:34:00 +02:00
utkarshcmu
6638605fd1
Removed console.log
2016-10-12 13:47:40 -07:00
utkarshcmu
cc3b928708
Opentsdb queries broken if no alias is uses with tags/filters
2016-10-12 13:32:37 -07:00
bergquist
2e4ca64783
fix(cli): improve error handling
...
closes #6256
2016-10-12 22:31:28 +02:00
Torkel Ödegaard
0f2fa33daf
docs(changelog): added fix for #4393 to the changelog
2016-10-12 13:17:30 +02:00
Uros Meglic
e1739b6025
(fix)elasticsearch: IP addresses don't survive terms aggregation ( #4393 ) ( #6246 )
2016-10-12 13:14:57 +02:00
Carl Bergquist
ce60efea8a
Merge pull request #6249 from txisme/master
...
Fixed latest builds URL
2016-10-12 13:06:38 +02:00
txisme
2fc7957485
Fixed latest builds URL
2016-10-12 11:27:21 +01:00
bergquist
5a39bf5c58
fix(alert_tab): dont add dup notifications to repeater
...
closes #6233
2016-10-12 11:27:49 +02:00
Torkel Ödegaard
0bae12e4ae
change(graph): Changed default for stack hover value
2016-10-12 11:21:23 +02:00
bergquist
c0829903ba
fix(alerting): scope variable was updated
...
closes #6228
2016-10-12 09:46:32 +02:00
Torkel Ödegaard
b8b577eafb
fix(spelling): minor spelling fix in alerting code
2016-10-12 09:17:48 +02:00
