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
Joseph Weigl
185b0dcc05
Merge branch 'master' into feature/enhance_hipchat_card
2017-09-02 19:04:40 +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
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
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
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
Callum Loh
74ddebc8ea
Fix spelling for Hipchat notifier ( #9112 )
2017-08-29 08:08:51 +02:00
Torkel Ödegaard
c92317bafa
fix: fixed gofmt formating for #9091
2017-08-28 13:29:24 +02:00
pdoan017
3eea5d235d
Added import for container/list
2017-08-24 15:42:54 -04:00
pdoan017
d6085755c4
Added series order according to query results
...
Raw query results would return as expected. But when appending new series to pointsBySeries map, order of keys is random. So I've added a list to keep track of series order. Should implement FIFO rules.
2017-08-24 15:38:36 -04:00
Joseph Weigl
81d3ab37c3
Add thumbnail to card
2017-08-24 14:52:23 +02:00
Joseph Weigl
9666f45e9c
Add values to the hipchat card
2017-08-24 13:40:33 +02:00
Torkel Ödegaard
47f8145246
Merge branch 'master' of github.com:grafana/grafana
2017-08-24 11:18:44 +02:00
Torkel Ödegaard
71c22fdbff
dataproxy: removed some logging, closes #9078
2017-08-24 11:18:06 +02:00
Torkel Ödegaard
71c9582944
data source with token auth is starting to work, #9078
2017-08-24 11:07:37 +02:00
Jason Stangroome
632a5e9b97
Support Azure MySQL ( #8618 )
...
Azure's MySQL implementation appears to always respond with an Authentication Method Switch Request Packet requesting `mysql_native_password` auth even though the client's initial Handshake Response already included the native password credentials.
Most MySQL client libraries support this but Golang's go-sql-driver/mysql requires the `allowNativePasswords` DSN parameter set to enable it. Without this parameter, Grafana fails to authenticate to the database with the error message "this user requires mysql native password authentication."
References:
* https://web.archive.org/web/20160814002743/http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchRequest
* https://web.archive.org/web/20160814002743/http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
* https://github.com/go-sql-driver/mysql#user-content-allownativepasswords
2017-08-24 10:24:10 +02:00
Torkel Ödegaard
3c9798bec9
datasource-proxy: token exchange
2017-08-23 17:18:43 +02:00
Torkel Ödegaard
4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
Torkel Ödegaard
8bf49c51b9
dataproxy: refactoring data source proxy to support route templates and wrote more tests for data proxy code, #9078
2017-08-23 10:52:31 +02:00
Torkel Ödegaard
63d6ab476a
feat: data source proxy refactoring and route handling, #9078
2017-08-22 17:14:15 +02:00
Daniel Lee
5c2958023d
Merge branch 'v4.4.x'
2017-08-21 13:45:04 +02:00
Torkel Ödegaard
e3bd51e38d
fix: remove duplicate set-cookie when logging in, fixes #9013
2017-08-21 11:10:59 +02:00
Andrei Burd
3222677493
Datasource Print the received error ( #9043 )
2017-08-16 16:56:51 +02:00
Daniel Lee
43fa852cc1
mysql: change logging from into to debug for scan
2017-08-09 19:33:09 +02:00
Torkel Ödegaard
668cb3c1ef
Merge branch 'v4.4.x'
2017-08-09 10:37:06 +02:00
Torkel Ödegaard
e8a20643d6
feat: store last seen date for users and present in stats and user lists, closes #9007
2017-08-09 10:36:41 +02:00
Torkel Ödegaard
eac0d30e99
Merge branch 'v4.4.x'
2017-08-09 07:20:52 +02:00
Torkel Ödegaard
26ad025705
feat: added os to stats
2017-08-09 07:20:37 +02:00
Daniel Lee
563795245a
mysqlds: support for more column types
...
Includes integration test for most column types. Fixes #8918
2017-08-08 15:24:41 +02:00
Daniel Lee
2fb25d8fa4
mysqlds: add tests for new macros
2017-08-08 14:40:27 +02:00
Brad Lhotsky
a8ac215039
Add a few more MySQL macros:
...
* $__timeFrom() -> Returns the dashboard 'from' suitable for use querying
against a MySQL TIMESTAMP field.
* $__timeTo() -> Returns the dashboard 'to' suitable for use querying
against a MySQL TIMESTAMP field.
* $__unixEpochFiler(column) -> If you store timestamps as UNIX epoch's,
this builds: column > 'from' AND column < 'to'
* $__unixEpochFrom() -> Returns the dashboard 'from' suitable for use querying
against a MySQL integer field (UNIX epochs)
* $__unixEpochTo() -> Returns the dashboard 'to' suitable for use querying
against a MySQL integer field (UNIX epochs)
2017-08-08 14:40:27 +02:00
Torkel Ödegaard
7c14ade623
Merge branch 'v4.4.x'
2017-08-08 09:28:41 +02:00
Torkel Ödegaard
7031f7e772
fix: sqlite3 and storing/displaying dates used wrong timezone, fixes #8996
2017-08-08 09:28:16 +02:00
Alexander
35522c475f
Fix #8998 by not overriding GOMAXPROCS ( #8999 )
2017-08-07 15:02:04 +02:00
Daniel Lee
649fe7e462
Merge branch 'v4.4.x'
2017-08-07 10:47:23 +02:00
Daniel Lee
aa889e59a1
tests: fix after interface change
2017-08-07 10:20:46 +02:00
Daniel Lee
1e5778174c
login: regenerates session id on login
2017-08-07 10:00:29 +02:00
David Wittman
8f5fbb4254
Fix typo in PagerDuty notifier options template ( #8978 )
2017-08-03 08:57:59 +02:00
Torkel Ödegaard
c7ca4830a8
Merge branch 'v4.4.x'
2017-08-03 08:56:46 +02:00
Torkel Ödegaard
1372d2e517
fix: update user permissions validation was not working properly, fixes #8977
2017-08-03 08:56:34 +02:00
Torkel Ödegaard
8d7186d40d
Merge branch 'v4.4.x'
2017-08-02 17:33:19 +02:00
Torkel Ödegaard
3dc9d76b38
fix: viewer role fix, fixes #8976
2017-08-02 17:33:06 +02:00
Torkel Ödegaard
c7c5730c40
Merge branch 'v4.4.x'
2017-07-31 16:04:31 +02:00
Torkel Ödegaard
34cda65998
fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710
2017-07-31 16:04:04 +02:00
Torkel Ödegaard
61d8eb1fac
Merge branch 'v4.4.x'
2017-07-31 15:07:22 +02:00
Torkel Ödegaard
73563d087c
feat: more work on #8768
2017-07-31 14:39:33 +02:00
Torkel Ödegaard
23558c61d4
feat: wip work on #8768
2017-07-31 13:03:42 +02:00
Dave Hall
0c70d271dc
Support large github organisations ( #8846 )
...
* Add new HttpGetResponse struct type
* Modify HttpGet() return to use HttpGetResponse
* Look up _all_ the teams the user is a member of
2017-07-31 12:13:29 +02:00
