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
Alin Sinpalean
84c6caabc5
Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000.
2017-08-28 15:45: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
Dmitry Bedrin
ad14ccf4bd
non_negative_difference() function in InfluxDB 1.3 ( #9104 )
...
Add support of non_negative_difference() function from InfluxDB 1.3
https://docs.influxdata.com/influxdb/v1.3/administration/differences/#functions
2017-08-28 08:53:41 +02:00
Alexander Zobnin
9375441991
ace: add default light theme
2017-08-26 13:46:39 +03:00
Alexander Zobnin
ef3c543620
ace: fix directive docs
2017-08-26 12:52:32 +03:00
Alexander Zobnin
54f932e960
ace: fix error when getCompleter() wasn't passed
2017-08-26 12:48:37 +03:00
Alexander Zobnin
451ecce4ab
ace: styles tweak
2017-08-26 12:36:08 +03:00
Alexander Zobnin
ef162c3dc7
ace: minor css refactor
2017-08-26 12:14:45 +03:00
Torkel Ödegaard
ba1fbe0786
ux: alternative row design
2017-08-25 18:53:35 +02:00
Torkel Ödegaard
4819e50441
newgrid: fixes to default home dashboard
2017-08-25 14:47:57 +02:00
Torkel Ödegaard
1aa5ed0cde
ux: minor fixes
2017-08-25 10:41:24 +02:00
Torkel Ödegaard
d87653b079
ux: new grid progress
2017-08-25 10:19:08 +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
Torkel Ödegaard
160d8cec92
grid: minor progres on new grid
2017-08-24 16:37:00 +02:00
Joseph Weigl
81d3ab37c3
Add thumbnail to card
2017-08-24 14:52:23 +02:00
Torkel Ödegaard
47cf8e6337
grid: minor progres on new grid
2017-08-24 14:08:05 +02:00
Joseph Weigl
9666f45e9c
Add values to the hipchat card
2017-08-24 13:40:33 +02:00
Joseph Weigl
c6f7d34c55
Reorder editorconfig
2017-08-24 13:40:19 +02:00
Alexander Zobnin
a0cb744746
ace: reduce docs lines width
2017-08-24 13:58:26 +03:00
Alexander Zobnin
dc7616e560
ace: prometheus functions docs
2017-08-24 13:56:22 +03:00
Alexander Zobnin
f7ec8e0de0
Merge branch 'master' into ace-editor
2017-08-24 12:37:18 +03: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
Daniel Lee
bf4ffe41b0
Merge branch 'v4.4.x'
2017-08-23 15:19:51 +02:00
Daniel Lee
e763104a6f
csv: add toggle for export to Excel
...
Adds back feature that adds 'sep=;' text that excel needs in a csv file.
Also adds toggle to make this optional if exporting to other spreadsheet
programs. Fixes #9083 .
2017-08-23 15:17:53 +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
bcb3dfac9f
Merge branch 'master' of github.com:grafana/grafana
2017-08-23 10:52:56 +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
