IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-13 06:34:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,407 Commits 1,265 Branches 722 Tags
0d62d1b47fa6d77bae3d6f351e992b525b4b2bb4
Commit Graph
21407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 0d62d1b47f Merge pull request #16172 from ryantxu/rename-stat-to-show 
rename stat to show in UI
 2019-03-23 17:56:04 +01:00
Torkel Ödegaard fa81ba8ffc Merge pull request #16165 from ryantxu/rename-float-test 
renamed floatPairs.test.ts
 2019-03-23 07:24:21 +01:00
ryan 56e1528c0e rename stat to show in UI 2019-03-22 15:23:51 -07:00
ryan 47b3fc5e63 renamed float to flot 2019-03-22 12:48:16 -07:00
Torkel Ödegaard 0f0f76b602 Merge pull request #15938 from ryantxu/table-reducer 
Calculate stats on TableData
 2019-03-22 20:44:05 +01:00
ryan f9fb1210e9 prevOptions should be optional 2019-03-22 10:55:31 -07:00
ryan d8595e9f4e moved migration hook to its own function 2019-03-22 10:22:25 -07:00
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 dba64a4e88 Moved DisplayValueOptions type back, #16134 2019-03-22 14:33:17 +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 0ece3abbd0 Merge pull request #16152 from grafana/mtanda-prometheus_annotation_deduplication 
Prometheus: Dedup annotations events with same timestamp
 2019-03-22 13:38:47 +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
Peter Holmberg 94d129e479 add one more test 2019-03-22 13:07:39 +01:00
Torkel Ödegaard 10d46bb61c Merge pull request #16144 from markelog/license-2 
Link license corrections
 2019-03-22 13:00:22 +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 a0d2e5861d Merge pull request #16136 from grafana/rem-removal-2 
Replaced rems with pixels or variables (part 2)
 2019-03-22 12:30:06 +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 229d73b609 Update provisioning.md 2019-03-22 11:49:27 +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
Peter Holmberg 08a4c9f6fa move typings to types, 2019-03-22 10:42:17 +01:00
Oleg Gaidarenko 8ac5c91004 Link license corrections 
Follow-up for 7316bdc99f
 2019-03-22 09:52:09 +01:00
Torkel Ödegaard 46a75099d8 Merge pull request #16116 from SGI495/master 
Don't include non-existing image in MS Teams alert
 2019-03-22 09:34:56 +01:00
Dominik Prokop d3a321cac1 Merge pull request #16138 from grafana/tooling/storybook-sass-theme 
Enable sass theme change in Storybook
 2019-03-22 09:27:50 +01:00
Torkel Ödegaard 268dca5b3d Merge pull request #16112 from ryantxu/show-all-columns 
show all numeric columns in singlestats/graph2
 2019-03-22 09:19:18 +01:00
Torkel Ödegaard ded73c9733 Merge pull request #16140 from markelog/license 
Small license correction
 2019-03-22 08:33:31 +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 8e6279cbca removed option to not check strings 2019-03-21 22:25:02 -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
Oleg Gaidarenko 7316bdc99f Small license correction 
It seems the license should be applied little bit differently -
https://github.com/search?l=&o=desc&q=license%3Aapache-2.0&s=stars&type=Repositories.

Also see https://apache.org/licenses/LICENSE-2.0#apply
 2019-03-21 16:36:24 +01:00
Dominik Prokop 35f6039da7 Enable sass theme change in Storybook 2019-03-21 16:06:55 +01: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
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
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 85bfb1dba8 replaced rems with pixels or variables 2019-03-21 15:44:14 +01:00
Peter Holmberg 6e05b9f41c adding test 2019-03-21 14:05:45 +01:00
Peter Holmberg 528f085c96 updating usages in singlestat 2019-03-21 14:03:53 +01:00
Peter Holmberg 205a5baa56 Sorting imports 2019-03-21 13:49:12 +01:00
Peter Holmberg c0ab877966 adding function 2019-03-21 13:45:50 +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