IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 05:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
21,400 Commits 5,113 Branches 538 Tags 1.9 GiB
a6c2a8c3cc
Commit Graph

9180 Commits

Author SHA1 Message Date
Torkel Ödegaard
a6c2a8c3cc Merge branch 'master' into table-reducer 2019-03-22 15:55:21 +01:00
Torkel Ödegaard
beba9676f6 Minor refactoring of stats picker / shared singlestat code 2019-03-22 15:25:33 +01:00
Hugo Häggmark
eedbc485dd
Makes it possible to navigate back/forward with browser buttons in Explore (#16150) 
Make it possible to navigate back/forward with browser buttons in Explore
 2019-03-22 15:24:30 +01:00
Torkel Ödegaard
bfc54b6424
Merge pull request #16134 from grafana/auto-decimals-graph-panels 
Auto decimals react singlestat panels
 2019-03-22 14:57:15 +01:00
Torkel Ödegaard
7cae6d5271
Merge pull request #16149 from grafana/graphite-variable-quoting 
Graphite: fixed variable quoting when variable value is nummeric
 2019-03-22 13:39:48 +01:00
Torkel Ödegaard
e0ecbc4c68 Merge branch 'table-reducer' of https://github.com/ryantxu/grafana into ryantxu-table-reducer 2019-03-22 13:36:49 +01:00
Peter Holmberg
5a5aed10a1 adding check for decimals 2019-03-22 13:35:40 +01:00
Torkel Ödegaard
732ea8eea5 Graphite: fixed variable quoting when variable value is nummeric, fixes #2078 2019-03-22 12:57:07 +01:00
Torkel Ödegaard
d5a56b0bed Minor refactoring of #16127 2019-03-22 12:51:12 +01:00
Torkel Ödegaard
c7c0ba5a5a Merge branch 'prometheus_annotation_deduplication' of https://github.com/mtanda/grafana into mtanda-prometheus_annotation_deduplication 2019-03-22 12:45:46 +01:00
Torkel Ödegaard
31dc3cfcf4
Merge pull request #16111 from grafana/graphite-series-by-tag-issue 
Graphite: Fixed issue with using series ref and series by tag
 2019-03-22 12:24:40 +01:00
Torkel Ödegaard
50a10706b0 Graphite: Fixed issue with using series ref and series by tag, fixes #15237 2019-03-22 11:42:09 +01:00
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
3f44445dd6 drop one level of nesting 2019-03-21 21:58:10 -07:00
ryan
7498de044c cleanup and guess all columns 2019-03-21 21:52:58 -07:00
ryan
50ebc768c8 Merge remote-tracking branch 'grafana/master' into show-all-columns 
* grafana/master: (56 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
  more fixes to snapshot
  more fixes to snapshot
  removed empty space in snapshot
  fixed snapshot for test
  removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard
  Tooltip: show percent instead of value
  Right tooltip position
  Add "No data points" message
  Improve tooltip look
  ...
 2019-03-21 07:59:58 -07:00
Peter Holmberg
528f085c96 updating usages in singlestat 2019-03-21 14:03:53 +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
Mitsuhiro Tanda
38457fabc1 fix, assign by event.time 2019-03-21 16:39:37 +09: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
Mitsuhiro Tanda
e868475c5b simplify 2019-03-21 15:48:22 +09:00
Mitsuhiro Tanda
e1a2b258af deduplicate same value annotation 2019-03-21 10:26:46 +09: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
ryan
0558b17b9e show all colums in graph 2019-03-20 11:27:56 -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
ryan
0cfa929d4c incorporate torkels feedback 2019-03-20 10:32:34 -07: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
ryan
a9cc8a8992 update table data model 2019-03-20 09:45:19 -07:00
ryan
c4a503dbc5 show all columns in singlestats 2019-03-20 09:07:11 -07:00
Torkel Ödegaard
78d93315a9 fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488 2019-03-20 15:35:34 +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
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
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
7dec4a9f2d Merge branch 'master' into bump-webpack 
# Conflicts:
#	package.json
#	yarn.lock
 2019-03-20 09:43:33 +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
f69f0c2c31
Merge pull request #16079 from grafana/fix/threshold-custom-color 
Fix threshold editor color picker not working for custom colors
 2019-03-19 18:39:17 +01:00
Torkel Ödegaard
4f134ea4b8
Merge pull request #16080 from grafana/hugoh/no-implicit-any 
Cleaning up no implicit anys in search_srv and tests
 2019-03-19 18:26:28 +01:00
Torkel Ödegaard
42c87141a5 Minor progress on fixing no-implicit any issues 2019-03-19 18:24:47 +01:00
Hugo Häggmark
d845aacbdc refactor: merged types and updated references 2019-03-19 17:44:58 +01:00
ryan
08d6540cbb merge master 2019-03-19 09:26:15 -07:00
Dominik Prokop
9205b82f19 Remove leftover from first iteration 2019-03-19 16:38:14 +01:00
Peter Holmberg
5adb923ace Only keep certain query params when going to next playlist 2019-03-19 16:34:33 +01:00
Leonard Gram
f2b06a89f2
Merge pull request #15977 from grafana/admin-on-create-poc 
Editors becomes admin when creating dashboards, folders & teams
 2019-03-19 15:02:52 +01:00
Torkel Ödegaard
531176b559
Merge pull request #16077 from grafana/gauge-change-options-render 
Re-render gauge / singlestat panels when changing options
 2019-03-19 15:01:26 +01:00