Commit Graph

21353 Commits

Author SHA1 Message Date
ryan
78a9243721 remove logging 2019-03-22 00:21:04 -07:00
ryan
658f419cab add stat picker to single stat 2019-03-22 00:14:50 -07:00
ryan
f8094a6e09 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (107 commits)
  another change that didn't come with earlier commit
  change that didn't come with in last commit
  reversed dashboard-padding
  Update CloudWatch metrics/dimension list (#16102)
  brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific
  fix(prometheus): Change aligment of range queries (#16110)
  Minor refactoring of testdata query order PR #16122
  cleaner version
  maintain query order
  Update PLUGIN_DEV.md
  Merge with master, and updated logo and name
  update table data model
  fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488
  Correct table names of sql storage for remotecache
  more fixes to snapshot
  more fixes to snapshot
  Fixed gofmt issue in PR #16093
  removed empty space in snapshot
  fix: Update snapshot related to new jest version
  fixed snapshot for test
  ...
2019-03-21 08:01:11 -07:00
Torkel Ödegaard
f2e1bfcde7 Merge pull request #16099 from grafana/dashboard-variables-and-some-more
Removed dashboard variables + minor things
2019-03-21 15:56:32 +01:00
ijin08
eaaa1681e2 another change that didn't come with earlier commit 2019-03-21 12:29:13 +01:00
ijin08
45e361ef13 change that didn't come with in last commit 2019-03-21 12:26:35 +01:00
ijin08
8d03db2474 reversed dashboard-padding 2019-03-21 12:15:13 +01:00
Mitsuhiro Tanda
56251ca546 Update CloudWatch metrics/dimension list (#16102)
update cloudWatch metrics/dimension list
2019-03-21 11:13:06 +01:00
ijin08
29e68ba1fc brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific 2019-03-21 11:10:44 +01:00
David
9008fcc790 fix(prometheus): Change aligment of range queries (#16110)
- future alignment cause issues with rate charts and the display of last
values
- this change modifies the alignment to use the last available aligned
end date and no longer possibly requests data from the future
2019-03-21 10:25:20 +01:00
Torkel Ödegaard
8847da0d69 Merge pull request #16121 from joshuawoodward/patch-1
Update PLUGIN_DEV.md
2019-03-21 08:36:52 +01:00
Torkel Ödegaard
6b6029d82d Merge pull request #16117 from grafana/very-alpha-pie-chart
Very alpha pie chart
2019-03-21 08:36:25 +01:00
Torkel Ödegaard
85b0df551c Minor refactoring of testdata query order PR #16122 2019-03-21 08:01:44 +01:00
ryan
c91e5a2db4 cleaner version 2019-03-20 14:50:46 -07:00
ryan
80d6475224 maintain query order 2019-03-20 12:50:58 -07:00
Joshua Woodward
742a76e4c5 Update PLUGIN_DEV.md 2019-03-20 12:24:54 -07:00
Torkel Ödegaard
e4e553b5a2 Merge with master, and updated logo and name 2019-03-20 19:17:23 +01:00
Torkel Ödegaard
ac82fc03d9 Merge branch 'piechart-react' of https://github.com/CorpGlory/grafana into CorpGlory-piechart-react 2019-03-20 19:01:37 +01:00
Torkel Ödegaard
93677f16d3 Merge pull request #16095 from ryantxu/flot-pairs
calculate flot pairs
2019-03-20 18:52:10 +01:00
Torkel Ödegaard
3884ac855e Merge pull request #16105 from grafana/graphite-fix-0-arg
Graphite: fixed nonNegativeDerivative argument hidden if 0
2019-03-20 18:18:47 +01:00
Torkel Ödegaard
bb14be9148 Merge pull request #16115 from ryantxu/column-types
update TableData model
2019-03-20 18:12:10 +01:00
ryan
a9cc8a8992 update table data model 2019-03-20 09:45:19 -07:00
ryan
2c8e1cbdb1 merge with master 2019-03-20 08:16:34 -07:00
Torkel Ödegaard
78d93315a9 fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488 2019-03-20 15:35:34 +01:00
Oleg Gaidarenko
30f0c35006 Merge pull request #16104 from markelog/remotecache-small-fix
Correct table names of sql storage for remotecache
2019-03-20 14:08:02 +01:00
Oleg Gaidarenko
c5bc723a6e Correct table names of sql storage for remotecache 2019-03-20 13:24:56 +01:00
ijin08
6471f6feb0 more fixes to snapshot 2019-03-20 11:37:45 +01:00
ijin08
67e802c595 more fixes to snapshot 2019-03-20 11:13:19 +01:00
Torkel Ödegaard
e5d84f8c74 Merge pull request #15967 from grafana/bump-webpack
Bump npm packages related to the dev process
2019-03-20 11:00:45 +01:00
Torkel Ödegaard
665f7acade Merge branch 'master' of github.com:grafana/grafana 2019-03-20 10:59:41 +01:00
Torkel Ödegaard
1085055d61 Merge PR https://github.com/grafana/grafana/pull/16093 2019-03-20 10:59:05 +01:00
Torkel Ödegaard
d11695b8b5 Fixed gofmt issue in PR #16093 2019-03-20 10:58:20 +01:00
Torkel Ödegaard
ab5848ca14 Merge pull request #16096 from grafana/fix/15691-refresh-issue-playlists
Fixing issue with refresh playlists
2019-03-20 10:52:16 +01:00
Torkel Ödegaard
fd4ee6b032 Merge branch 'patch-1' of https://github.com/sairam0903/grafana into sairam0903-patch-1 2019-03-20 10:50:11 +01:00
ijin08
7fcb9777c0 removed empty space in snapshot 2019-03-20 10:49:34 +01:00
Johannes Schill
13f70be5f0 fix: Update snapshot related to new jest version 2019-03-20 10:36:33 +01:00
ijin08
2a53be050c fixed snapshot for test 2019-03-20 10:29:28 +01:00
Torkel Ödegaard
0091b86e9c Merge pull request #16078 from grafana/secret-input-field-component
Secret input field component
2019-03-20 10:15:33 +01:00
Johannes Schill
e0e6dd8fb0 Regenerate lockfile due to the amount of merge conflicts. 2019-03-20 09:50:53 +01:00
ijin08
9e57195b1d removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard 2019-03-20 09:48:19 +01:00
Johannes Schill
7dec4a9f2d Merge branch 'master' into bump-webpack
# Conflicts:
#	package.json
#	yarn.lock
2019-03-20 09:43:33 +01:00
Andrej Ocenas
a26dc64ebe Remove commented code 2019-03-20 09:20:30 +01:00
Peter Holmberg
81afd68752 Merge branch 'master' into fix/15691-refresh-issue-playlists 2019-03-20 09:17:57 +01:00
Torkel Ödegaard
abd8948478 Merge pull request #15864 from ryantxu/all-data-as-table
Use TableData for all data in react
2019-03-20 09:15:06 +01:00
Torkel Ödegaard
0a2d69c794 Merge pull request #16089 from grafana/no-implicit-any-fixes-p4
Fixed no implicit any for form dropdown & panel model
2019-03-20 07:01:14 +01:00
Torkel Ödegaard
b203868a9f Merge pull request #16034 from ryantxu/table-cell-measure
Don't measure cell widths in react table
2019-03-20 06:59:19 +01:00
ryan
2f8dd898b0 flot pairs 2019-03-19 22:22:38 -07:00
ryan
7e56514c5a add more functions and tests 2019-03-19 21:19:58 -07:00
ryan
37bb5ef790 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (101 commits)
  refactor: merged types and updated references
  Remove leftover from first iteration
  Snapshot update
  fix: ts issue on SelectOption test
  chore: Bump react and react-dom to 16.8.4
  Update latest.json
  Update templating.md
  Update CHANGELOG.md
  chore: cleaning up noimplicit anys in search_srv and tests progress: #14714
  Fix threshold editor color picker not working for custom colors
  Updated threshold editor test
  Re-render gauge / singlestat panels when changing options
  fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel
  teams: explains the external property of a team membership.
  fix: fixed snapshots and permission select not beeing able to click
  fix: new team link goes nowhere for viewers
  teams: refactor so that you can only delete teams if you are team admin
  permissions: removes global access to bus from MakeUserAdmin.
  teams: local access to bus, moving away from dep on global.
  teams: better names for api permissions.
  ...
2019-03-19 20:30:11 -07:00
Sai Ram Gupta
6929593eb6 Update org_user.go
Add check for, if current role is ROLE_VIEWER, return true if the role I'm checking for is ROLE_VIEWER. Fixes #16092
2019-03-19 11:31:55 -07:00