IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
21,352 Commits 5,285 Branches 544 Tags 1.9 GiB
8ac5c91004
Commit Graph

21352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
ryan
e7a6041d22 Merge remote-tracking branch 'grafana/master' into show-all-columns 
* grafana/master:
  flot pairs
 2019-03-20 11:16:03 -07: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
Magnus Berglund
e6623de6b2 Rewrote creation of images tag 2019-03-20 18:59:13 +01:00
Torkel Ödegaard
93677f16d3
Merge pull request #16095 from ryantxu/flot-pairs 
calculate flot pairs
 2019-03-20 18:52:10 +01:00
Magnus Berglund
0511095303 Added missing commas 2019-03-20 18:42:48 +01:00
ryan
0cfa929d4c incorporate torkels feedback 2019-03-20 10:32:34 -07:00
Magnus Berglund
0de77598d7 Don't include non-existing image in MS Teams alert 
If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.

Closes #16082
 2019-03-20 18:23:36 +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
5947c1f76d cast to column 2019-03-20 09:56:53 -07: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
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