Commit Graph

17272 Commits

Author SHA1 Message Date
Peter Holmberg
70f6100d53 fixed type 2018-10-29 15:08:36 +01:00
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Peter Holmberg
7dc5173a9b removed angular code 2018-10-29 14:21:11 +01:00
Torkel Ödegaard
befee108c4
Merge pull request #13872 from grafana/css-loading-sync
Revert to sync loading of css, sometimes js loaded before css which c…
2018-10-29 13:48:39 +01:00
Peter Holmberg
026588cbf1 test and some refactoring 2018-10-29 13:46:12 +01:00
Torkel Ödegaard
2481d19dc8
Merge pull request #13875 from bergquist/branch_param_to_build
build: adds branch info to binary build
2018-10-29 13:45:27 +01:00
bergquist
c9ac762fb1 build: adds branch info to binary build 2018-10-29 13:27:29 +01:00
Torkel Ödegaard
dc961a8274
Merge pull request #13870 from grafana/davkal/make-node_modules
Makefile: dependency-driven target to build node_modules
2018-10-29 12:31:23 +01:00
Torkel Ödegaard
2dde2c4f9b now that css is loaded sync again I can remove some styles from index html body css 2018-10-29 04:26:44 -07:00
Torkel Ödegaard
d06ad98ec9 Revert to sync loading of css, sometimes js loaded before css which caused issues 2018-10-29 04:19:45 -07:00
David Kaltschmidt
a4ef1d6175 Makefile: dependency-driven target to build node_modules
- added `node_modules` as new target
- dependency on `package.json` and `yarn.lock` allows for quick `make
  node_modules` after a branch change, which noops when the deps have
 not changed
- also added `clean` target
2018-10-29 11:08:30 +01:00
Carl Bergquist
1f6df77a80
Merge pull request #13869 from bergquist/delete_old_deocs
removes old invalid release guide
2018-10-29 10:47:18 +01:00
bergquist
0e34a6be0f removes old invalid release guide
closes #13864
2018-10-29 10:37:30 +01:00
Torkel Ödegaard
e47de5602b added missing alpha state prop to graph2 panel 2018-10-28 12:46:18 -07:00
Torkel Ödegaard
9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
Torkel Ödegaard
7863d2d882 Merge branch 'master' of github.com:grafana/grafana 2018-10-28 11:34:25 -07:00
Torkel Ödegaard
52669032d0 updated graph tests dashboard 2018-10-28 11:29:55 -07:00
Torkel Ödegaard
d94cd3f2b4 Merge branch 'fix-missing-points' of https://github.com/jsferrei/grafana into jsferrei-fix-missing-points 2018-10-28 11:17:36 -07:00
Torkel Ödegaard
9f35b8a65e
Merge pull request #13827 from grafana/remove-projectname-from-query-response
stackdriver: Remove redundant project name assignment
2018-10-28 19:08:38 +01:00
David
121ac93d08
Merge pull request #13847 from miqh/fix/multi-line-aggregation
Fix label suggestions inside multi-line aggregation contexts
2018-10-28 18:05:31 +01:00
David Kaltschmidt
9245dad53e Fix query hint tests after refactor 2018-10-28 17:48:17 +01:00
David
2ec827f02f
Merge pull request #13774 from miqh/feat/sum-query-suggestion
Implement sum aggregation suggestion with placeholder support
2018-10-28 17:37:42 +01:00
Torkel Ödegaard
8faf74d441
Merge pull request #13862 from buroa/master
Fixing issue 13855
2018-10-28 15:38:23 +01:00
Steve Kreitzer
e44dde3f14 Fixing issue 13855 2018-10-28 10:25:42 -04:00
Michael Huynh
d1d5e9f7d3
Add tests to cover PlaceholdersBuffer and sum hint
Related: #13615
2018-10-28 21:07:40 +08:00
Michael Huynh
c255b5da11
Add sum aggregation query suggestion
Implements rudimentary support for placeholder values inside a string
with the `PlaceholdersBuffer` class. The latter helps the newly added
sum aggregation query suggestion to automatically focus on the label
so users can easily choose from the available typeahead options.

Related: #13615
2018-10-28 21:03:39 +08:00
Torkel Ödegaard
add2e4447e
Merge pull request #13849 from grafana/mode-change-performance-changes
Reduce re-renderings when changing view modes
2018-10-27 17:43:42 +02:00
Torkel Ödegaard
c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard
10e5d725bc updated singlestat logo 2018-10-27 15:13:57 +02:00
Michael Huynh
61843b58db
Add tests to cover aggregation context cases
This should cover use cases involving multi-line queries and range
vector syntax inside aggregation contexts.

Related: #12890
2018-10-27 17:02:03 +08:00
Michael Huynh
2a4a19388f
Fix label suggestions for multi-line aggregation queries
No label suggestions were being returned for multi-line aggregation
contexts because the parsed selector string does not see the full
context before a `by` or `without` clause.

This solution stitches together all text nodes that comprise the query
editor to ensure the selector has sufficient context to generate
suggestions.

Also, an additional workaround has been included to ensure range vector
syntax does not disrupt label suggestions in aggregation contexts.

Related: #12890
2018-10-27 16:54:12 +08:00
Leonard Gram
58a567173e build: builds grafana docker for enterprise at release. 2018-10-26 15:19:53 +02:00
Jon Ferreira
07cb622729 Add code to flot that plots any datapoints which to not have neighbors
as 0.5 radius points
 - fixes https://github.com/grafana/grafana/issues/13605
2018-10-26 09:10:07 -04:00
Peter Holmberg
ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Leonard Gram
a80e2e1acd build: ge build fix. 2018-10-26 14:37:51 +02:00
Leonard Gram
e2f74b55d2
build: grafana enterprise docker. (#13839) 2018-10-26 14:23:30 +02:00
Peter Holmberg
affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
David
239dfbc9ae
Merge pull request #13824 from grafana/davkal/explore-plugins
Explore: move suggestions logic to datasource language provider
2018-10-26 11:40:52 +02:00
Marcus Efraimsson
361864bec6
changelog: add notes about closing #13769
[skip ci]
2018-10-26 09:06:32 +02:00
Marcus Efraimsson
6052257515
Merge pull request #13820 from grafana/13769_mysql_time_filter
mysql: fix timeFilter macro should respect local time zone
2018-10-26 09:02:59 +02:00
Torkel Ödegaard
b3c7a41e13
Merge pull request #13819 from mtanda/cw_desc_region
use default region to call DescribeRegions
2018-10-26 08:35:17 +02:00
Mitsuhiro Tanda
220c4f4ab4 add test 2018-10-26 03:13:02 +09:00
Mitsuhiro Tanda
3447b8b299 cache region result 2018-10-26 01:23:44 +09:00
Mitsuhiro Tanda
c40baa1a23 use default region to call DescribeRegions 2018-10-26 01:23:44 +09:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard
4112591042
Merge pull request #13818 from mtanda/cw_stat_template
support template variable in stat field
2018-10-25 17:08:09 +02:00
Torkel Ödegaard
2b1ab9843d
Merge pull request #13828 from bergquist/docs_es_provisioning
docs: improve ES provisioning examples
2018-10-25 17:06:47 +02:00
Torkel Ödegaard
f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg
a98f7e548f simple select 2018-10-25 16:56:49 +02:00
Leonard Gram
30cb28df55
build: correctly adds enterprise to the filename. (#13831) 2018-10-25 16:55:27 +02:00