Commit Graph

10922 Commits

Author SHA1 Message Date
Alexander Zobnin
6b5400bdb6 ace: fix loading text snippets error 2017-08-10 11:23:32 +03:00
Torkel Ödegaard
149e694ce6 ace: prometheus completion improvements 2017-08-10 10:08:09 +02:00
Torkel Ödegaard
0b2cc404ff ace: working on editor completion stuff 2017-08-10 09:33:17 +02:00
Torkel Ödegaard
b9540e4c49 ace: minor ace theme tweaks 2017-08-09 21:12:15 +02:00
Daniel Lee
43fa852cc1 mysql: change logging from into to debug for scan 2017-08-09 19:33:09 +02:00
Daniel Lee
1105bb371f mysqlds: adds support for template variables
Fixes #8855
2017-08-09 19:32:53 +02:00
Daniel Lee
59513ff963 tempvar: bug fix for duplicate template var
and a fix for when selecting the same value twice in
a template variable if it is not multi select. It threw an
exception on the second selection
2017-08-09 14:28:23 +02:00
Torkel Ödegaard
459a8ed695 ace: minor changes to ace directive 2017-08-09 11:43:02 +02:00
Torkel Ödegaard
80f5c914e8 ace: removed the old text areas 2017-08-09 11:06:21 +02:00
Torkel Ödegaard
68cac6ccb5 Merge branch 'master' into ace-editor 2017-08-09 10:51:31 +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
Alexander Zobnin
5c0773023f code-editor: increase autocomplete popup size 2017-08-09 11:23:05 +03:00
Alexander Zobnin
1c8c746956 code-editor: prometheus metrics autocomplete 2017-08-09 10:58:00 +03: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
Alexander Zobnin
aa670244f1 code-editor: initial prometheus syntax definition 2017-08-08 22:27:47 +03:00
Alexander Zobnin
e0bbb74b0c code-editor: test editors for MySQL and prometheus 2017-08-08 18:42:26 +03:00
Alexander Zobnin
0e0e60317e code-editor: tabSize option 2017-08-08 18:41:11 +03:00
Alexander Zobnin
152c4170da code-editor: onChange option and usage docs 2017-08-08 18:31:13 +03:00
Torkel Ödegaard
1652426dfe :Merge branch 'master' of github.com:grafana/grafana 2017-08-08 17:08:49 +02:00
Torkel Ödegaard
68c4ce34d5 fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510 2017-08-08 17:08:35 +02:00
Torkel Ödegaard
fec41cf038 Update CHANGELOG.md 2017-08-08 16:21:20 +02:00
Torkel Ödegaard
fee1e6df41 Merge branch 'master' of github.com:grafana/grafana 2017-08-08 16:18:26 +02:00
Torkel Ödegaard
addeccb4f0 Merge branch 'v4.4.x' 2017-08-08 16:18:08 +02:00
Torkel Ödegaard
a47b31ac62 fix: MySQL/Postgress max_idle_conn default was wrongly set to zero, which does not mean unlimited but zero, which in practice disables connection pooling, not good. now max idle conn is set to golang's default which is 2, fixes #8513 2017-08-08 16:17:52 +02:00
Alexander Zobnin
cd16db4d09 code-editor: use data- attributes for editor options 2017-08-08 16:28:51 +03: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
Alexander Zobnin
59d1654df4 code-editor: adjust editor styles 2017-08-08 16:05:15 +03: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
Alexander Zobnin
eb944551c0 code-editor: add autocomplete styles 2017-08-08 15:32:23 +03:00
Alexander Zobnin
928fedaad7 code-editor: minor refactor 2017-08-08 15:19:15 +03:00
Torkel Ödegaard
d3680d290c fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997 2017-08-08 13:51:54 +02:00
Torkel Ödegaard
83beff300b Merge branch 'v4.4.x' 2017-08-08 11:26:45 +02:00
Torkel Ödegaard
64b5153e7d fix: change view json to use the grafana built json viewer, fixes #9002 2017-08-08 11:26:16 +02:00
Torkel Ödegaard
781dd25c82 Merge branch 'elasticsearch-filtering' 2017-08-08 11:09:00 +02:00
Torkel Ödegaard
f979e95820 tablepanel: minor update to table panel, #8052 2017-08-08 11:08:51 +02:00
Torkel Ödegaard
1507c02ebb Merge branch 'feat-8539' of https://github.com/alexanderzobnin/grafana 2017-08-08 09:33:23 +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 Zobnin
bf8171fd63 code-editor: initial autocomplete 2017-08-07 21:30:36 +03:00
Alexander Zobnin
b74fe05fec code-editor: support language mode 2017-08-07 20:19:15 +03:00
Alexander Zobnin
ecb66e7678 code-editor: disable depreacation warning 2017-08-07 19:43:58 +03:00
Alexander Zobnin
e4dabb657c code-editor: initial directive for rich code editor (ace) 2017-08-07 19:31:50 +03:00
Torkel Ödegaard
48fa642727 Update CHANGELOG.md 2017-08-07 16:03:03 +02:00
Torkel Ödegaard
3e392ef921 ux: added minor help tip to graphite ds settings 2017-08-07 15:55:05 +02:00
Torkel Ödegaard
0e2b809f7e docker: added graphite v1.x docker block 2017-08-07 15:12:12 +02:00
Alexander Zobnin
4fe79edd40 Graphite 1.0 functions (#8987)
* graphite-ds: add graphite version to config editor

* graphite-ds: modify add-graphite-function to show only version-related functions

* graphite-ds: refactor, move func filtering to gfunc.js

* graphite-ds: add new functions for graphite 1.0.x

* graphite-ds: fix unit tests (add jsonData)
2017-08-07 15:10:59 +02:00
Alexander
35522c475f Fix #8998 by not overriding GOMAXPROCS (#8999) 2017-08-07 15:02:04 +02:00