IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,912 Commits 5,454 Branches 554 Tags 1.9 GiB
8ecf2d127c
Commit Graph

12912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick O'Carroll
8ecf2d127c fixed width of images and removed gifs and fixed text a bit in search 2018-01-30 17:12:12 +01:00
Patrick O'Carroll
411c81fee8 new gifs for search 2018-01-30 15:34:09 +01:00
Patrick O'Carroll
c29e75e9bc changed img for shortcuts 2018-01-30 10:51:50 +01:00
Patrick O'Carroll
ec3ba86a02 replaced img in export_import and sharing 2018-01-30 09:20:55 +01:00
Patrick O'Carroll
3fa2f8a411 changed img-link for timerange imgs and some text 2018-01-29 15:45:28 +01:00
Patrick O'Carroll
4294009b0b changed some img-links, updated text for annotated img, more work on whats new in v5.0 2018-01-26 10:58:31 +01:00
Patrick O'Carroll
45cd3730a7 added whats new v5, changed link in notifications, removed row from getting started 2018-01-25 11:24:49 +01:00
Daniel Lee
047d023022 docs: first draft of dashboard folders docs 2018-01-24 10:43:03 +01:00
bergquist
ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist
ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist
5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
Torkel Ödegaard
dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Torkel Ödegaard
3662b03d8f Merge branch 'master' of github.com:grafana/grafana 2018-01-23 13:04:09 +01:00
Torkel Ödegaard
dbfaf5dac8 refactor: minor refactoring of PR #10560 2018-01-23 13:03:44 +01:00
hannes
d82af23f1c cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances. (#10566) 2018-01-23 12:57:05 +01:00
Torkel Ödegaard
a24aa3ae28 Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana 2018-01-23 12:44:27 +01:00
Marcus Efraimsson
1ce6a420cb docker: use mysql and postgres from latest fake-data-gen 2018-01-23 10:51:48 +01:00
Carl Bergquist
e24d9a6224
Merge pull request #10584 from bkaganyildiz/update-opsgenie-notifier 
Update OpsGenie Notifier to support different api domains.
 2018-01-23 08:57:13 +01:00
bkaganyildiz
97d969bd5c Update OpsGenie Notifier to support different api domains. 2018-01-22 22:27:35 +03:00
Patrick O'Carroll
c611ffa4bc 10583 panel resize icon fix (#10585) 
* removed svg, added ::after

* removed unnecessary code
 2018-01-22 16:49:45 +01:00
Marcus Efraimsson
f8a03fa3e3
Merge pull request #10587 from grafana/10580_search_bug 
dashboards: Fix issue with first click when expanding folder in search
 2018-01-22 16:44:31 +01:00
Marcus Efraimsson
b5a6a9ab3b dashboards: Fix issue with first click when expanding folder in search 
Fixes #10580
 2018-01-22 16:12:52 +01:00
bergquist
5546828b9f cfg: adds info about local img uploader to docs 2018-01-22 11:11:30 +01:00
bergquist
704a198ffa docs: adds info about local img uploader 2018-01-22 11:09:16 +01:00
bergquist
b98dd680e9 changelog: adds note about closing #6922 2018-01-22 11:04:56 +01:00
Carl Bergquist
184e7046df
Merge pull request #10059 from FunkyM/local-image-store 
Add support for internal image store
 2018-01-22 11:03:00 +01:00
bergquist
6780e00c7d changelog: note about closing #9664 2018-01-22 10:47:23 +01:00
Carl Bergquist
89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by 
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
 2018-01-22 10:42:20 +01:00
bergquist
9678be15d9 changelog: adds note about closing #9770 2018-01-22 08:16:31 +01:00
Carl Bergquist
27d103adae
Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked 
Disable instead of hide mode options when line/points is unchecked
 2018-01-22 08:11:19 +01:00
Carl Bergquist
397da7a444
Merge pull request #10572 from Jonnymcc/add-lumens-unit 
Add lumens unit
 2018-01-22 07:35:26 +01:00
Jonathan McCall
f516c82ddc Disable instead of hide mode options when line/points is unchecked 2018-01-20 19:23:26 -05:00
Jonathan McCall
88e1ec3382 Add lumens unit 2018-01-19 19:12:30 -05:00
Dan Cech
562aa58029
add docs for configuring OAuth with Auth0 and Azure AD 2018-01-19 14:00:17 -05:00
Carl Bergquist
1de00ded1e
Merge pull request #10556 from Ultimation/patch-1 
Recommend a limit on database query for influxdb annotations
 2018-01-19 13:49:29 +01:00
bergquist
278337e45a install dep instead of govendor on setup 2018-01-19 10:27:02 +01:00
Carl Bergquist
987a546e74
Merge pull request #10563 from grafana/golang_dep 
Migrated from govendor to dep
 2018-01-19 10:22:54 +01:00
bergquist
7ed643f302 remove unused code from vendor 2018-01-19 09:54:22 +01:00
bergquist
e023f79c5a migrate from govendor to dep 2018-01-19 09:48:15 +01:00
Torkel Ödegaard
4f59d229fe fix: cloudwatch corrected error handling so original error is not thrown away 2018-01-19 09:24:44 +01:00
Dan Cech
a09044a45a
go fmt 2018-01-18 19:17:05 -05:00
Dan Cech
04e17c145f
support for decoding JWT id tokens 2018-01-18 18:25:58 -05:00
Torkel Ödegaard
4720b86f5c Merge remote-tracking branch 'origin/mattttt-style-tweaks' 2018-01-18 19:18:34 +01:00
Dan Cech
5bb22b836d Generic Oauth Support for ADFS (#9242) 
* check upn field if email address isn't present, support for adfs

* correctly set login to the user's email address if not specified by the oauth server

* break up GenericOAuth.UserInfo into helper functions
 2018-01-18 17:24:04 +01:00
Andrew Cottrell
8368bfeab4
Recommend a limit on database query 
Users not putting a limit on can end up causing bad performance. A recommended limit in the placehold is a quick little help.
 2018-01-18 14:31:42 +00:00
Matt
0dffb6dbb1 Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside 2018-01-18 14:40:08 +01:00
Daniel Lee
1a019052d5 mysql: convert numbers to text for annotation tooltip 2018-01-18 11:50:16 +01:00
Daniel Lee
6d13645206 mysql: update to use ColumnTypes interface in new version 
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
 2018-01-18 11:50:16 +01:00
Daniel Lee
7bc7af6c39 mysql: update mysql driver to latest master 
The latest master implements the ColumnType interface.

See https://github.com/go-sql-driver/mysql/issues/495

This removes the custom code in the vendor folder that
did a ColumnType mapping.
 2018-01-18 11:50:16 +01:00