Commit Graph

10918 Commits

Author SHA1 Message Date
Torkel Ödegaard
22be9436f7 Update CHANGELOG.md 2017-09-05 15:16:04 +02:00
Torkel Ödegaard
bc690232fb version bump to v4.5-beta1 2017-09-05 10:39:55 +02:00
Torkel Ödegaard
0005f8e7b3 fix: fixed jshint issue 2017-09-05 10:17:24 +02:00
Torkel Ödegaard
4e387ed47a fix: Elasticsearch and adhoc filters fix, fixes #9165 2017-09-05 10:16:17 +02:00
Daniel Lee
52676161bb docs: update to http api admin section
Make it clearer that it only works with basic auth
2017-09-05 10:04:01 +02:00
bergquist
01e2729dba spring clean! 2017-09-04 23:19:09 +02:00
Carl Bergquist
a1faa6d4d9 Merge pull request #9164 from summic/master
Add the missing step of "grunt build" to the README.md
2017-09-04 23:06:42 +02:00
Allen
1a3d34b918 Add the missing step of grunt build to the readme 2017-09-05 01:56:52 +08:00
Torkel Ödegaard
5d3c3a6889 packaging: changed how pid directory is created for systemd systems, #9133 2017-09-04 16:41:07 +02:00
Torkel Ödegaard
4eabf6ce81 Update CHANGELOG.md 2017-09-04 14:49:51 +02:00
Torkel Ödegaard
2789c4f1e1 dsfix: include routes in plugin model 2017-09-04 14:09:02 +02:00
Torkel Ödegaard
9bafb108f7 docs: added docs archive for v4.3 2017-09-04 13:38:46 +02:00
Torkel Ödegaard
88e4b6ee75 docs: update changelog 2017-09-04 13:34:33 +02:00
Torkel Ödegaard
2fc67da69a Merge branch 'metrics-tab-v3' 2017-09-04 13:27:44 +02:00
Torkel Ödegaard
6e4090abf2 feat: finished work on the interval changes #9161 2017-09-04 13:27:28 +02:00
Torkel Ödegaard
284cacf560 logging: write pid file path and pid during startup 2017-09-04 12:44:54 +02:00
mxlxm
c5400ffe76 mysql: use collation instead of charset (#9156)
- use charset would issue additional 'SET NAMES <VALUE>' queries, set
collation would be better. see: https://github.com/go-sql-driver/mysql#charset
2017-09-04 12:32:07 +02:00
Torkel Ödegaard
c3cffeb10c packaging: fixed issue with pid file on systemd systems, fixes #9133 2017-09-04 10:43:04 +02:00
bergquist
ce6050f5d6 fix(graphite): jsonData is not always present. 2017-09-04 10:28:48 +02:00
Torkel Ödegaard
07e192ff47 change: more work on changing default group by time interval to min interval setting 2017-09-01 15:57:02 +02:00
Torkel Ödegaard
e8e1f1bc6d updated graphite help 2017-09-01 11:15:39 +02:00
Marcel Anacker
40c008f870 Cloudwatch Datasource: changed namespace of Web Application Firewall (#9128) 2017-09-01 10:43:23 +02:00
Nevins
66441650cd changing ordering so AWS API is only called if cache has expired (#9136) 2017-09-01 07:24:05 +02:00
Torkel Ödegaard
7b1473649b Update README.md 2017-09-01 07:16:42 +02:00
Torkel Ödegaard
eb0f5cc900 ux: progress on metrics tab changes 2017-08-31 16:38:49 +02:00
Torkel Ödegaard
84d4958a3c plugin change: make interval, cache timeout & max data points options in plugin.json, remove query.options component feature, add help markdown feature and toggle for data sources 2017-08-31 14:05:52 +02:00
Torkel Ödegaard
40ae2cef38 docs: updated changelog with #9131 2017-08-31 09:54:45 +02:00
Torkel Ödegaard
52177a45d9 influxdb: use paranthesis for influxdb queries in frontend query builder, #9131 2017-08-31 09:52:32 +02:00
Jonathan A. Sternberg
bdfbc2453f Use parenthesis to surround the selected tags for influxdb queries (#9131)
The generated queries when selecting multiple tags are incorrect. In
InfluxQL, `AND` has a higher precedence than `OR` so the condition:

    WHERE "hostname" = 'server1' OR "hostname" = 'server2' AND time > now() - 5m

This is parsed as if it were:

    WHERE "hostname" = 'server1' OR ("hostname" = 'server2' AND time > now() - 5m)

But the intention is to write a query like this:

    WHERE ("hostname" = 'server1' OR "hostname" = 'server2') AND time > now() - 5m

This change modifies the generated query so it surrounds a query with
multiple conditions in parenthesis so it doesn't conflict with the time
expression in an unexpected way.

This is currently not an issue because InfluxDB doesn't actually
evaluate the condition for the time expression correctly. It just looks
through the AST for anything that looks like a time expression and then
assumes the proper format of `AND` was used rather than validating that
it was used correctly.
2017-08-31 09:33:03 +02:00
Torkel Ödegaard
9b60a63778 ux: metrics tab v3 2017-08-30 16:39:00 +02:00
Daniel Lee
abeaef71cc DashExport: fix View JSON in export menu
ref #9002
2017-08-30 09:56:49 +02:00
Torkel Ödegaard
54129b1340 Merge branch 'master' of github.com:grafana/grafana
: Please enter a commit message to explain why this merge is necessary,
2017-08-29 15:52:17 +02:00
Torkel Ödegaard
dda1cf1a88 Merge branch 'ace-editor' 2017-08-29 15:52:03 +02:00
Torkel Ödegaard
bdb1cfb008 ace: minor fixes for ace editor 2017-08-29 15:51:54 +02:00
Torkel Ödegaard
c5c5fa0db3 Update ROADMAP.md 2017-08-29 15:45:59 +02:00
Torkel Ödegaard
78ea1ea76e Updated master version to v4.5 2017-08-29 10:13:16 +02:00
Alin Sinpalean
bdd239e933 Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000. (#9109) 2017-08-29 09:57:45 +02:00
Torkel Ödegaard
aef4eca254 fix: removed code intented to test/replicate an issue 2017-08-29 08:57:34 +02:00
Callum Loh
74ddebc8ea Fix spelling for Hipchat notifier (#9112) 2017-08-29 08:08:51 +02:00
Torkel Ödegaard
546f903141 ds: minor fix that resets data source model when switching data source type 2017-08-28 15:29:31 +02:00
Torkel Ödegaard
c2b05341e5 Merge branch 'master' of github.com:grafana/grafana 2017-08-28 13:29:36 +02:00
Torkel Ödegaard
c92317bafa fix: fixed gofmt formating for #9091 2017-08-28 13:29:24 +02:00
Torkel Ödegaard
407f1ad475 Merge branch 'master' of https://github.com/pdoan017/grafana 2017-08-28 13:28:13 +02:00
Torkel Ödegaard
ead7ae7635 Update CHANGELOG.md 2017-08-28 11:46:54 +02:00
Torkel Ödegaard
311fa66590 Update CHANGELOG.md 2017-08-28 11:46:13 +02:00
Torkel Ödegaard
72690b3962 Update CHANGELOG.md 2017-08-28 11:45:25 +02:00
Torkel Ödegaard
62f5770908 fix: changed modal to fixed positioned, this change makes modal maintain scroll position, fixes #8800 2017-08-28 11:34:44 +02:00
Torkel Ödegaard
bf110d02d1 fix: form dropdown, escape autocomplete dropdown items, fixes #9089 2017-08-28 11:00:42 +02:00
Torkel Ödegaard
e91cf28f8d elasticsearch: changed ad hoc filters from using term filters to using phrase match queries, closing #9095 2017-08-28 10:52:10 +02:00
Torkel Ödegaard
3b9fbd60d8 ux: fix for showing pending invitations tab, fixes #9094 2017-08-28 09:52:53 +02:00