Commit Graph

832 Commits

Author SHA1 Message Date
Daniel Lee
413ee33d5d mysql: fix go vet error 2017-04-23 20:07:20 +02:00
Torkel Ödegaard
97e2d75f51 mysql: added support for tables in mysql queries 2017-04-21 15:07:43 +02:00
Torkel Ödegaard
c78c460f79 mysql: worked on mysql data soruce 2017-04-20 17:10:23 +02:00
Torkel Ödegaard
50e70cf3db build: fixed unit test 2017-04-20 13:04:42 +02:00
Torkel Ödegaard
fc878bc8ad build: fixed order 2017-04-20 11:59:11 +02:00
Torkel Ödegaard
11806dfa78 mysql: progress 2017-04-19 17:26:37 +02:00
Torkel Ödegaard
e164eba677 mysql: began work on backend macro engine 2017-04-19 10:10:08 +02:00
Torkel Ödegaard
9bdcc4ec5f influxdb: holt winters edits 2017-04-11 14:40:08 +02:00
Torkel Ödegaard
26804d630f Merge branch 'master' into sql-proxy 2017-04-07 10:34:51 +02:00
Alexander Zobnin
2b81bfe9bf alerting: fix $timeFilter cannot be used twice (#7969) (#8037) 2017-04-05 17:17:55 +02:00
Torkel Ödegaard
5af81b974e mysql: graph showing 2017-03-31 13:57:10 +02:00
Torkel Ödegaard
a7babfb7cf tech: updated xorm libs 2017-03-31 12:54:39 +02:00
Torkel Ödegaard
e5a5bef200 mysql: minor update 2017-03-31 12:49:05 +02:00
Torkel Ödegaard
d6d2080f11 mysql: minor progress on response processing 2017-03-31 11:45:25 +02:00
Torkel Ödegaard
080d2a2054 mysql: reading arbitrary SQL data in go is really strange, data is only in strings? 2017-03-30 13:46:46 +02:00
Torkel Ödegaard
00fcaaf171 mysql: commented out old code from old PR 2017-03-29 22:55:37 +02:00
Torkel Ödegaard
8f90c6115d mysql: progress on mysql data source 2017-03-29 22:54:18 +02:00
Pranay Kanwar
6ab90425c4 Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified (#7743) 2017-03-06 16:19:37 +01:00
bergquist
c7febca447 mqe: fixes broken test for indexalias 2017-02-09 16:43:57 +01:00
bergquist
aa7292fac6 mqe: adds support for wildcard and index aliases 2017-02-09 16:25:03 +01:00
Carl Bergquist
7d205ae2b8 Merge pull request #7466 from hagen1778/prometheus-basicauth-query
allow setting basic auth headers for prometheus datasource
2017-02-07 11:18:17 +01:00
hagen1778
a1e835884b use configured Transport instead of defaultHttpTransport 2017-02-07 11:56:59 +02:00
r.khavronenko
25be602dce go fmt 2017-02-06 17:17:16 +02:00
bergquist
57d36b3d42 feat(alerting): transform labels into tags for prometheus tsdb 2017-02-06 15:25:15 +01:00
r.khavronenko
80b92335bb allow setting basic auth headers for prometheus datasource 2017-02-06 16:22:09 +02:00
bergquist
3827c0a69c tech(alerting): adds tags to alerting data model 2017-02-06 14:59:29 +01:00
bergquist
46e4a54a6e style: go fmt with simplify 2017-01-27 15:21:02 +01:00
Torkel Ödegaard
d354f3a8af fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247)
* fix(alerting): fixed evaluation for no_value condition, fixes #7244

* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
Torkel Ödegaard
b475f91387 feat(templating): completed work on built in template variables and , closes #7190, refactors #7170 2017-01-11 12:10:26 +01:00
Darrian
27ead53382 Set indentation to tabs 2016-12-21 22:54:56 +00:00
Darrian
b8572b69f0 Register new queries available in InfluxDB - Holt Winters fixes #5619
For correct data fill on holt winters predictions, the time function
needed modification to allow a 2nd param for offset, as per
https://docs.influxdata.com/influxdb/v1.0/query_language/data_exploratio
n/#advanced-group-by-time-syntax
2016-12-21 22:30:32 +00:00
bergquist
4e306590f8 Merge branch 'v4.0.x' 2016-12-21 10:02:28 +01:00
bergquist
8cef4cc74e fix(influxdb): handles time(auto) like time($interval)
closes #6997
2016-12-21 10:01:20 +01:00
bergquist
df3adbc0f8 refactor(mqe): reduce duplication 2016-12-16 08:01:58 +01:00
bergquist
51c4385c92 fix(mqe): only parse none empty functions 2016-12-15 08:52:43 +01:00
bergquist
e3b53fe599 test(mqe): adds test for double function usage 2016-12-15 07:36:06 +01:00
bergquist
7dece3ff0c test(mqe): solves brittle unit test 2016-12-15 07:36:06 +01:00
bergquist
dde6e73fed feat(mqe): add basic support for functions list 2016-12-14 22:29:17 +01:00
bergquist
ca6a667555 feat(mqe): renames app tag into cluster 2016-12-14 16:49:16 +01:00
bergquist
f8871f9e4a chore(mqe): remove comments 2016-12-14 16:16:42 +01:00
bergquist
6d57e42246 feat(mqe): restricts the executor to max 4 concurrent outgoing requests 2016-12-14 15:40:15 +01:00
huydx
adb441e5c8 (format) run go fmt in pkg 2016-12-14 12:17:38 +09:00
bergquist
362162d6fa feat(mqe): add token cache 2016-12-13 14:01:48 +01:00
bergquist
69d6316512 style(mqe): instance dependencies in ctor func 2016-12-13 12:47:57 +01:00
bergquist
549c3ab78b tech(mqe): update todo 2016-12-13 11:42:06 +01:00
bergquist
99e3db8208 Merge branch 'master' into alerting_mqe 2016-12-12 19:01:50 +01:00
Carl Bergquist
2c7adccf12 Use cache for http.client in tsdb package. (#6833)
* datasource: move caching closer to datasource struct

* tsdb: use cached version of datasource http transport

closes #6825
2016-12-07 11:10:42 +01:00
bergquist
c9b7f8603e tech(): replace spaces to handle input more graceful 2016-12-02 23:43:02 +01:00
bergquist
f70d7ff3a3 fix(influxdb): align tsdb.influxdb with dataproxy
ref #6784
2016-12-02 21:10:29 +01:00
bergquist
1b0005a9e5 feat(mqe): add support for app and host alias 2016-11-18 11:40:38 +01:00
bergquist
a3b0fbcaba fix(influxdb): fixes broken tag rendering for influxdb alerting
closes #6626
ref #6523
2016-11-17 15:50:49 +01:00
bergquist
0a0f558c48 style(mqe): improve code 2016-11-17 08:52:27 +01:00
bergquist
23387bd39b feat(mqe): simplify timestamp parsing 2016-11-17 08:42:09 +01:00
bergquist
9572f086ae feat(mqe): add timerange to query 2016-11-16 17:09:34 +01:00
bergquist
fa8213d8d5 feat(mqe): send http requests 2016-11-16 15:28:31 +01:00
bergquist
f1897b7e96 feat(mqe): add response parser 2016-11-16 14:42:43 +01:00
bergquist
c6ad0cc5ec test(mqe): basic test for response parser 2016-11-16 13:00:25 +01:00
bergquist
113020aabe feat(mqe): support basic aliases 2016-11-16 11:04:15 +01:00
bergquist
430104aaac feat(mqe): add support for wildcard series 2016-11-16 10:03:22 +01:00
bergquist
fa92dfb7b2 feat(mqe): add support for apps in where clause 2016-11-16 09:54:45 +01:00
bergquist
ab7263579f Merge branch 'master' into alerting_mqe 2016-11-16 09:28:26 +01:00
bergquist
4739608ffb tests(mqe): add query builder 2016-11-15 18:37:34 +01:00
bergquist
1bdda76ba9 tests(mqe): parse mqe query model 2016-11-14 15:03:49 +01:00
bergquist
c973241435 feat(mqe): add token request 2016-11-14 14:00:35 +01:00
bergquist
4fdfee739a fix(influxdb): add support for regex measurments
closes #6560
2016-11-14 08:48:19 +01:00
bergquist
118e2a6364 WIP: more boilerplate 2016-11-13 13:51:54 +01:00
bergquist
e04d27c0b0 fix(influxdb): return internal influxdb errors
ref #6523
2016-11-11 08:47:53 +01:00
bergquist
f924b241ae tech(influxdb): refactor query builder
trying to reduce the amounts of moving parts for influxdb
2016-11-10 14:38:07 +01:00
bergquist
a948dfe514 fix(influxdb): fixes broken raw query usage 2016-11-10 14:18:10 +01:00
bergquist
ecba23e883 Merge branch 'master' into influxdb_alias_seriename 2016-11-10 12:22:17 +01:00
bergquist
4f3c8c6663 fix(influxdb): add default operator
ref #6523
2016-11-10 11:21:38 +01:00
bergquist
ef08a243c5 fix(influxdb): fixes possible nil pointer
closes #6531
2016-11-10 08:23:58 +01:00
bergquist
bd3259d07a feat(mqe): init commit 2016-11-09 15:55:47 +01:00
bergquist
82e1d3f6aa feat(influxdb): disable debug logging in appmode 2016-11-09 14:48:05 +01:00
bergquist
f0a0e647a0 feat(influxdb): backend support for alias by segment
ref #6510
2016-11-09 12:45:59 +01:00
bergquist
c897d39d5e feat(influxdb): add support for serie alias replacement
ref #6510
2016-11-09 10:22:11 +01:00
bergquist
24a3a100ed feat(influxdb): add alias to query 2016-11-09 10:05:12 +01:00
bergquist
98a7bf181a tech(influxdb): close body reader 2016-11-08 19:19:49 +01:00
bergquist
56340bfdfb fix(influxdb): fixes bug when using regexps/numbers in tags
closes #6488
2016-11-07 14:26:20 +01:00
bergquist
2d7bb4a9f3 fix(tsdb): broken build :( 2016-11-03 19:20:53 +01:00
bergquist
1afe0e90f9 fix(tsdb): fixes broken legend buidler for prometheus
closes #6456
2016-11-03 18:04:09 +01:00
bergquist
0059beb85d chore(tsdb): remove commented code 2016-11-03 17:34:57 +01:00
Carl Bergquist
bb7f03c91e Merge pull request #6446 from utkarshcmu/graphite_alerting_fix
Fixed intervalFormat for Graphite Alerting
2016-11-03 06:58:51 +01:00
utkarshcmu
fc91231104 Fixed failing tests 2016-11-02 22:31:59 -07:00
utkarshcmu
33ee85ede9 Commented strange behavior of tests 2016-11-02 11:11:06 -07:00
utkarshcmu
a4a2e35bb2 Verified interval format function and gofmt check 2016-11-02 02:07:08 -07:00
bergquist
d4bc92b267 feat(tsdb): default tsdb httpclient 2016-11-02 08:51:34 +01:00
utkarshcmu
2088363bf9 Added tests for graphite alerting 2016-11-02 00:00:18 -07:00
utkarshcmu
1e8beb8983 Fixed intervalFormat for Graphite Alerting 2016-11-01 17:55:45 -07:00
bergquist
2df8c649b7 Merge branch 'master' into alerting_opentsdb 2016-10-19 13:15:22 +02:00
bergquist
20bfe443fe feat(prometheus): trim labelname lookup key
closes #6300
2016-10-19 08:57:58 +02:00
utkarshcmu
333a853948 Fixed for loop and append 2016-10-18 08:48:06 -07:00
bergquist
9429434cb5 feat(influxdb): use database auth if provided
closes #6310
2016-10-18 15:12:04 +02: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
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
bergquist
5e0fa0f0ad feat(opentsdb): context aware http requests 2016-10-14 10:21:47 +02:00
bergquist
f44e360b0d fix(opentsdb): fmt 2016-10-14 10:15:30 +02:00
bergquist
fe24e6c8a8 Merge branch 'alerting_opentsdb' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_opentsdb 2016-10-14 09:19:42 +02:00
bergquist
455df7f0a0 Merge branch 'master' into alerting_opentsdb 2016-10-14 09:17:35 +02:00
bergquist
f4e0a9245e feat(influxdb): choose highest interval value 2016-10-14 09:14:13 +02:00
utkarshcmu
4247e92e87 Resolved conflicts 2016-10-14 00:01:36 -07:00
utkarshcmu
06f2047ced OpenTsdb alerting works with metric query 2016-10-13 23:49:28 -07:00
bergquist
b8ec1ce9a2 tech(tsdb): add basic skeleton for alerting 2016-10-13 23:49:27 -07:00
bergquist
4144eacc24 feat(influxdb): start parsing interval parameters 2016-10-13 11:42:51 +02:00
bergquist
5a91d45f3f fix(influxdb): broken unittests 2016-10-12 07:43:30 +02:00
bergquist
885e0366c5 feat(influxdb): support raw queries in alerting
ref #6231
2016-10-11 18:53:09 +02:00
Torkel Ödegaard
f1905a8485 fix(alerting): fixed issue with using nested queries in graphite query used in alerting rule, fixes #5996 2016-10-11 12:50:11 +02:00
bergquist
8d96262106 chore(tsdb): tidy up code 2016-10-10 11:58:06 +02:00
bergquist
f609623abd style(influxdb): tidy up code 2016-10-10 11:34:52 +02:00
bergquist
95b9f472d1 tech(influxdb): remove unused logging 2016-10-10 11:17:00 +02:00
bergquist
f919d04e3c docs(tsdb): improve fill comment 2016-10-10 09:52:53 +02:00
bergquist
0bfb94dc6f feat(tsdb): add interval calculator 2016-10-10 09:45:33 +02:00
bergquist
4fafefd66a feat(influxdb): proper support for group by tags 2016-10-07 15:09:54 +02:00
bergquist
e499e8850c fix(influxdb): fix for timerange 2016-10-07 11:33:17 +02:00
bergquist
0633e2c03f feat(influxdb): add real support for time ranges 2016-10-07 11:23:37 +02:00
bergquist
e36f9fa795 Merge branch 'master' into alerting_influxdb 2016-10-07 10:45:05 +02:00
bergquist
522d40fa26 fix(influxdb): support mulitple tags 2016-10-06 18:51:17 +02:00
bergquist
87650c150b feat(influxdb): add tags to serie names 2016-10-06 18:47:59 +02:00
bergquist
b0addbd7cb feat(influxdb): support multi row results 2016-10-06 15:30:09 +02:00
bergquist
d8aa38fafe tech(influxdb): refactor and cleanup 2016-10-06 14:16:26 +02:00
bergquist
ab8751767c feat(influxdb): send request and parse response 2016-10-06 12:51:45 +02:00
Torkel Ödegaard
cc1452277b added testdata scenario for null data and stacking, also updated testdata dashbord, #2912 2016-10-06 10:53:42 +02:00
bergquist
887ca40455 feat(influxdb): add support for policies 2016-10-05 20:57:28 +02:00
bergquist
4387d20222 feat(influxdb): render select and groupby 2016-10-05 20:36:05 +02:00
bergquist
9968fa5bc5 feat(influxdb): add query part definitions 2016-10-05 16:59:33 +02:00
bergquist
8588bb386c feat(influxdb): add conditions property to tag 2016-10-05 16:57:32 +02:00
bergquist
c7abd3ba4e feat(influxdb): add querypart renderers 2016-10-05 14:42:06 +02:00
bergquist
d0e6a9559e feat(influxdb): add query part model 2016-10-05 10:56:34 +02:00
bergquist
946e0bf32e feat(influxdb): parse query json 2016-10-04 21:28:05 +02:00
bergquist
e556df5b49 feat(tsdb): add draft implementation for influxdb 2016-10-04 16:25:33 +02:00
bergquist
5a201cfd35 tech(tsdb): abort batch procces when context closes 2016-10-03 14:33:47 +02:00
bergquist
d889415c4b tech(tsdb): rename context to query 2016-10-03 14:32:04 +02:00
bergquist
653a0502c4 tech(tsdb): add jsondata to tsdb datasource struct 2016-10-03 14:31:33 +02:00
bergquist
f4a834f84b fix(opentsdb): add context to opentsdb executor 2016-10-03 10:37:49 +02:00
bergquist
8368a4a88a Merge branch 'master' into alerting_opentsdb 2016-10-03 10:36:33 +02:00
Carl Bergquist
c38f6ff182 Make alerting notifcations sync (#6158)
* tech(routines): move the async logic from notification to alerting notifier

* tech(notification): reduce code dupe

* fix(notification): dont touch the response unless its an error

* feat(alerting): make alerting exeuction async but flow sync

* tech(alerting): remove commented code

* tech(alerting): remove unused code

* tech(alerting): fix typo

* tech(alerting): implement Context on EvalContext

* tech(alerting): wait for all alerts to return

* feat(alerting): dont allow alert responses to cancel

* Revert "feat(alerting): dont allow alert responses to cancel"

This reverts commit 324b006c96.

* feat(alerting): give alerts some time to finish before closing down
2016-10-03 09:38:03 +02:00
bergquist
b66d94343e tech(tsdb): add basic skeleton for alerting 2016-09-30 07:35:48 +02:00
Torkel Ödegaard
a4648607bb feat(testdata): added csv test data scenario 2016-09-28 10:37:30 +02:00
Torkel Ödegaard
8d5857661e refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers 2016-09-28 09:15:48 +02:00
Torkel Ödegaard
63caedb094 Merge branch 'master' of github.com:grafana/grafana 2016-09-28 08:09:51 +02:00
Torkel Ödegaard
460160cfa4 feat(testdata): added test case for ms resolution data 2016-09-28 08:08:46 +02:00
Torkel Ödegaard
3ecd96e682 feat(testdata): lots of work on new test data data source and scenarios 2016-09-27 18:17:39 +02:00
Torkel Ödegaard
ade8aa5b92 feat(graph): refactorings 2016-09-27 14:47:04 +02:00
Torkel Ödegaard
34f15d92d0 feat(testdata): worked on testdata app 2016-09-27 14:39:51 +02:00
bergquist
071f2205e1 tech(tsdb): ops <o> 2016-09-27 11:13:13 +02:00
bergquist
46d4f817e3 tech(graphite): return error if statuscode is not ok 2016-09-27 10:09:56 +02:00
bergquist
8cd9225eb6 feat(alerting): increase timeout to 15s 2016-09-26 08:45:55 +02:00
Mauro Stettler
cb0f19f8d4 fix context dependency 2016-09-22 21:13:08 +01:00
bergquist
ae7345b04d style(prometheus): remove commented test 2016-09-21 13:46:26 +02:00
bergquist
af551b8825 refactor(tsdb): remove toUnix from timerange 2016-09-21 13:41:25 +02:00
bergquist
9534a04d3d fix(prometheus): only accept matrix result 2016-09-21 13:30:41 +02:00
bergquist
ee0f1a0f36 feat(prometheus): handle more errors 2016-09-21 13:17:36 +02:00
bergquist
3e73be8d2e feat(prometheus): improve error handling 2016-09-21 11:31:56 +02:00
bergquist
4c88db3e43 feat(prometheus): add support for legend formatting 2016-09-21 11:17:29 +02:00
bergquist
43d8bd5a25 feat(prometheus): initial support for prometheus 2016-09-21 07:01:53 +02:00
bergquist
d7bf70a77b tech(tsdb): remove skip ssl setting. should be based on datasource settings 2016-09-12 13:37:00 +02:00
bergquist
aa80b52c07 feat(alerting): make it possible to skip ssl verification for alerting https requests 2016-09-08 16:29:31 +02:00
Torkel Ödegaard
50b41130ca feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations 2016-09-07 10:11:00 +02:00
Torkel Ödegaard
fbae6abb3c feat(alerting): progress on handling no data in alert query, #5860 2016-09-06 20:40:12 +02:00
bergquist
eb0396ad95 chore(tsdb): remove some logging 2016-09-05 21:35:24 +02:00
bergquist
86aea89214 style(tsdb): extract some methods 2016-09-01 13:03:15 +02:00
bergquist
d73547c0dc feat(tsdb): add missing content type and join url using path 2016-09-01 11:12:35 +02:00
bergquist
3d3365f242 tech(graphite): add more logging 2016-09-01 10:09:13 +02:00
bergquist
94389a3a44 tech(tsdb): improve logging for graphite client 2016-09-01 09:38:43 +02:00
bergquist
29b60329cc stupid stupid stupid me 2016-09-01 09:17:57 +02:00
bergquist
4619a05f43 feat(alerting): save execution error message to annotations 2016-08-31 14:06:54 +02:00
bergquist
c0697b99d6 fix(alerting): adds support for basic auth
closes #5897
2016-08-29 15:50:11 +02:00
Torkel Ödegaard
3ad38eefd2 feat(alerting): test results look better 2016-07-21 13:57:19 +02:00
Torkel Ödegaard
9e91aacd34 feat(alerting): progress on testing alerts 2016-07-21 10:29:11 +02:00
Torkel Ödegaard
0ce55600bb feat(alerting): progress on alerting backend 2016-07-20 14:28:02 +02:00
bergquist
3c0b5fe78e tech(alerting): add graphite dateformat replacer 2016-06-10 13:26:19 +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
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
0d9c9526b9 feat(alerting): fixed graphite log issue 2016-06-07 13:47:22 +02:00
Torkel Ödegaard
34e17f7282 feat(alerting): requests looks to be working again 2016-06-06 17:11:46 +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