public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Holmberg 70f6100d53 fixed type 2018-10-29 15:08:36 +01:00
David b00e709aee Merge pull request #13842 from grafana/davkal/explore-error-handling 
Explore: error handling and time fixes
 2018-10-29 15:08:14 +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
David Kaltschmidt c1347e4ecb WIP babel 7 2018-10-29 12:20:10 +01: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
Sebastian 85aed0276e Update grafana_stats.json 
The grafana_stats.json used the following prometheus query: "increase(grafana_alerting_result_total[1m])" But a metric called "grafana_alerting_result_total" is currently not there anymore. So i changed the query to "increase(grafana_alerting_active_alerts[1m])" and updated the title as well (Before: "Grafana alert results", Now: "Grafana active alerts").
 2018-10-29 12:05:24 +01: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 1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +01:00
Torkel Ödegaard e47de5602b added missing alpha state prop to graph2 panel 2018-10-28 12:46:18 -07:00
Torkel Ödegaard e24dc37966 minor update 2018-10-28 12:44:47 -07:00
Torkel Ödegaard 5dd9247762 Merge branch 'master' into panel-edit-ux 2018-10-28 12:11:47 -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
Torkel Ödegaard 6bf0531f81 fixed width of panel edit mode 2018-10-28 10:26:49 -07: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 60b6bd10a4 fixes to angular panel edit mode 2018-10-28 11:31:42 +01:00
Torkel Ödegaard 3da62f1083 Merge branch 'master' into panel-edit-ux 2018-10-27 17:44:04 +02: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 4d4369b77f Merge branch 'master' into panel-edit-ux 2018-10-27 15:14:19 +02:00
Torkel Ödegaard 10e5d725bc updated singlestat logo 2018-10-27 15:13:57 +02:00
Torkel Ödegaard b1b534a005 more ux progress 2018-10-27 15:09:36 +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
Torkel Ödegaard a4674ecaa1 panel edit mode changes 2018-10-27 10:14:38 +02:00
Carlos Mondragon 35688b223a Update snapshots. 2018-10-26 10:20:03 -07:00
Carlos Mondragon bb227d5c3a Use jest.fn instead of string. 2018-10-26 10:12:27 -07:00
David Kaltschmidt bf1af66292 Explore: error handling and time fixes 
- use global range types
- add ErrorBoundary around individual Explore components
- fix table merge on empty results
- fix TimePicker date parsing on ISO dates
- fix TimePicker range string after relative move
 2018-10-26 18:16:00 +02:00
Torkel Ödegaard bcf669fab5 ux experiments 2018-10-26 16:29:08 +02: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