IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,850 Commits 1,119 Branches 715 Tags
9dd38031e47b76312e06f3e87866329976744510
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee 10d30f0b73 dsproxy: move http client variable back 
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
 2018-06-14 13:39:46 +02:00
Daniel Lee 719ebdc24d dsproxy: allow multiple access tokens per datasource 
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
 2018-06-12 17:39:38 +02:00
Daniel Lee 610a90b79a Merge pull request #12231 from dehrax/12224-graph-tooltip 
Karma to Jest: graph-tooltip
 2018-06-12 16:32:14 +02:00
Daniel Lee fb41048dd7 docker: new block for elasticsearch6 2018-05-29 11:04:16 +02:00
Daniel Lee de295af231 Merge pull request #12003 from mageo/master 
Added Swiss franc currency
 2018-05-28 01:13:21 +02:00
Daniel Lee 6d6b509d27 Merge pull request #12020 from xginn8/patch-1 
update provisioning.md
 2018-05-21 18:14:33 +02:00
Daniel Lee de7a880d66 Revert "Conditionally select a field to return in ResponseParser for InfluxDB" 
This reverts commit a101177b55.

Ref #12009
 2018-05-21 15:47:29 +02:00
Daniel Lee 80f8fb1e02 Revert "Fix ResponseParser for InfluxDB to return only string values" 
This reverts commit 92e5968f91.

Ref #12009
 2018-05-21 15:46:23 +02:00
Daniel Lee 5de2c99c32 Merge pull request #11976 from steakunderscore/master 
Adds constant description for units
 2018-05-18 13:29:10 +02:00
Daniel Lee f15919555b explore: fixes #11953 2018-05-17 14:56:15 +02:00
Daniel Lee 75993971c6 docs: installation pages for 5.1.3 2018-05-16 21:48:26 +02:00
Daniel Lee 66c4a04dec changelog: add note for #11830 2018-05-16 17:46:32 +02:00
Daniel Lee b086981e15 Merge pull request #11954 from grafana/11830-firefox-legend 
legend: fixes Firefox/baron scroll bug
 2018-05-16 16:49:42 +02:00
Daniel Lee 574baa7151 Merge pull request #11719 from mtanda/annotation_on_non_editable_dashboard 
create annotation on non-editable dashboard
 2018-05-16 15:18:32 +02:00
Daniel Lee 3305ac1f36 Merge pull request #11946 from grafana/11937-panel-content 
scroll: temporary fix for double scrollbar issue
 2018-05-16 15:16:44 +02:00
Daniel Lee 50026fad2e legend: fixes Firefox/baron scroll bug 
Compensates for Firefox scrollbar calculation error in the baron framework.
Offsetwidth and clientwidth are used to find the width of the scrollbar. In
the legend these differ by 9px and cause the scroll div to grow by 9px for
every refresh. This fix compensates with a negative margin-right in that
case.

Fixes #11830
 2018-05-16 15:08:22 +02:00
Daniel Lee 567fec402e scroll: temporary fix for double scrollbar issue 
If #11939 is not merged in the patch release, then
this is a temporary fix for 5.1.3. It sets overflow to
hidden for larger screens and keeps the overflow set to
auto for mobiles and tablets.

Fixes #11937
 2018-05-16 00:19:15 +02:00
Daniel Lee 2c3b8bb035 Merge pull request #9910 from jeroenj/patch-1 
Adding a user in a specified organisation uses the admin API
 2018-05-08 23:09:25 +02:00
Daniel Lee 377b78102d Merge pull request #11888 from simPod/fix-node10 
Fix dependencies on Node v10
 2018-05-08 23:03:51 +02:00
Daniel Lee d518ed5330 changelog: add notes for ##11754, #11758, #11710 2018-05-03 15:46:21 +02:00
Daniel Lee 2c10f29b0f Merge pull request #11784 from grafana/11754_auth_migration 
increase length of auth_id column in user_auth table
 2018-05-03 15:30:38 +02:00
Daniel Lee 7db9cc3bf0 Merge pull request #11796 from alexanderzobnin/fix-11710 
scroll: fix scrolling on mobile Chrome
 2018-05-03 15:18:29 +02:00
Daniel Lee fc718b8a9a table: fix for padding 
The table-panel-wrapper class got removed when clicking on the panel
menu which resulted in extra padding for the .panel-content div. This
fixes that by setting the table-specific css class lower down in the
html.
 2018-04-30 16:17:37 +02:00
Daniel Lee 7e2fb5e92e appveyor: uppercase the C drive in go path 
Fixes #11758
 2018-04-27 17:32:53 +02:00
Daniel Lee 44a61a6db3 changelog: update for v5.1.0 2018-04-26 18:18:54 +02:00
Daniel Lee 1dd4f03100 Merge pull request #11726 from grafana/11708_prom_variables 
prometheus: variable query should fallback correctly to a series query
 2018-04-26 10:29:09 +02:00
Daniel Lee 375816106e Merge pull request #11714 from grafana/11703_mysql_ts_datatypes 
sql tsdb: fix value columns conversion to float when using timeseries query
 2018-04-25 23:17:22 +02:00
Daniel Lee 4b73f67703 Merge pull request #11722 from grafana/ie11-panel-edit-height 
removed height 100% from panel-container to fix ie11 panel edit mode
 2018-04-25 16:26:41 +02:00
Daniel Lee 3000a2a43b Merge pull request #11652 from grafana/davkal/hmr 
Add weback-dev-server with hot/hmr support
 2018-04-25 15:52:53 +02:00
Daniel Lee 1dea5cb34b Merge pull request #11683 from marefr/11668_default_permissions 
Fix for default permissions on folder are not shown as inherited in it's dashboards
 2018-04-23 14:58:22 +02:00
Daniel Lee 6b5854936d Merge pull request #11502 from marefr/graphite_ds_test 
graphite: use a query when testing data source
 2018-04-22 11:31:51 +02:00
Daniel Lee b5a54c535b Merge pull request #11654 from svenklemm/postgres-docs-timefilter 
postgres: adjust timeFilter, timeFrom and timeTo macro examples
 2018-04-22 11:16:15 +02:00
Daniel Lee 3451f9a9db Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created 2018-04-20 17:14:06 +02:00
Daniel Lee 8f9d9ed35d docs: escape asterisk in Graphite docs 2018-04-20 15:27:20 +02:00
Daniel Lee f4f12c1e84 Merge remote-tracking branch 'upstream/master' into docs-5.1 2018-04-20 15:15:42 +02:00
Daniel Lee bde0136317 Merge pull request #11671 from grafana/docs-variable-interpolation-mssql 
Docs for mssql for #11642
 2018-04-20 15:09:20 +02:00
Daniel Lee 2b3c547589 Merge pull request #11642 from grafana/docs-variable-interpolation 
Docs variable interpolation
 2018-04-20 15:09:05 +02:00
Daniel Lee ba2e43f547 docs: disable quoting option for MSSQL 2018-04-20 13:36:07 +02:00
Daniel Lee 492f842c53 docs: fix example for graphite tag query 
Was missing a tilde in the tag_values example
 2018-04-20 13:32:17 +02:00
Daniel Lee 3a99148315 docs: spelling 2018-04-20 13:24:37 +02:00
Daniel Lee 71dcafebb8 docs: add missing backtick for mysql/postgres 2018-04-20 13:22:43 +02:00
Daniel Lee c10359dd5b docs: fixes for table in variable docs 2018-04-20 13:21:14 +02:00
Daniel Lee cdbd4e0fc0 graphite: convert ds test to jest 2018-04-20 11:09:52 +02:00
Daniel Lee c2064781a0 Merge pull request #11640 from grafana/11637-dropdown-styling 
removed padding and moved carrot
 2018-04-20 11:05:40 +02:00
Daniel Lee ab4f8c273d docs: describes variable formatting options 
csv option in postgres/mysql docs and the regex option in the
graphite docs
 2018-04-18 14:40:34 +02:00
Daniel Lee 120a86ecf9 docs: graphite template variables for tag queries 
ref #11388 and ref #9911 and ref #10366
 2018-04-18 14:40:34 +02:00
Daniel Lee 24ae9cef36 docs: describes new variable formatting syntax 
Fixes #11388
Ref #11141
 2018-04-18 14:40:34 +02:00
Daniel Lee 5b968329a0 graphite: adds tests for tags and tag_values functions 2018-04-17 18:58:47 +02:00
Daniel Lee d9b5ef8f7b changelog: adds note for #11553 2018-04-17 16:35:55 +02:00
Daniel Lee 26bb22bffa Merge pull request #11554 from grafana/11553_viewer_general_access 
User with org viewer role permission fixes
 2018-04-17 13:50:45 +02:00
Daniel Lee 4a842f96ac changelog: adds note for #11173 2018-04-17 13:44:42 +02:00
Daniel Lee b3acbb9995 Merge pull request #11526 from grafana/11173_folder_admin 
A folder admin should be able to add permissions for folder/its dashboards
 2018-04-17 13:42:38 +02:00
Daniel Lee e7bcd8c3c3 variable: fix binding bug after ts conversion 2018-04-16 19:59:47 +02:00
Daniel Lee 7d165068df fix merge conflict 2018-04-16 19:19:48 +02:00
Daniel Lee aa999aa6a9 changelog: adds note for #11556 2018-04-16 17:22:19 +02:00
Daniel Lee 82a1deaf5e changelog: adds note for #11133 2018-04-16 17:20:26 +02:00
Daniel Lee 34455c0598 Merge pull request #11583 from grafana/11556-org-switch-order 
ordered user orgs alphabeticaly
 2018-04-16 17:09:36 +02:00
Daniel Lee bb7a6a0153 Merge pull request #11595 from kichristensen/DeleteEmptyPlaylist 
Support deleting empty playlist
 2018-04-16 17:06:59 +02:00
Daniel Lee 9337972a0f sqlds: fix text in comments for tests 2018-04-16 12:55:27 +02:00
Daniel Lee ee303c03e9 Merge pull request #11550 from grafana/sql_ts_precision 
sql tsdb: fix precision and data type support for time columns
 2018-04-16 11:04:46 +02:00
Daniel Lee 67daa9b058 Merge pull request #11588 from mjtrangoni/fix-codespell-issues 
Fix codespell issues
 2018-04-16 09:12:49 +02:00
Daniel Lee 52bd51f2d0 changelog: adds note for #11530 2018-04-14 17:59:33 +02:00
Daniel Lee d70cacc364 Merge pull request #11532 from ryantxu/sql-uint64 
PostgreSQL should not cast all times to uint64
 2018-04-14 17:56:39 +02:00
Daniel Lee 5702014917 Merge pull request #11590 from vitaliyf/patch-1 
Documentation spelling fix
 2018-04-14 16:57:28 +02:00
Daniel Lee af91238d14 Merge pull request #11547 from grafana/value-select-dropdown-to-ts 
Value select dropdown to ts
 2018-04-14 16:53:08 +02:00
Daniel Lee 9413ce5ef6 Merge pull request #8096 from ryantxu/influx-db-query2 
let the influxdb API set a database
 2018-04-13 18:22:12 +02:00
Daniel Lee b481e1515d Merge pull request #11456 from alexanderzobnin/fix-11053 
Migrating to baron scrollbar WIP
 2018-04-12 14:56:04 +02:00
Daniel Lee d4398479f5 scrollbar: fix so no overflow for legend under graph 
Adds 1px of padding to the graph legend scroll div so that a non-table
legend does not get an unnecessary scroll bar.
 2018-04-12 11:26:27 +02:00
Daniel Lee 76c87d1a74 scrollbar: fixes continuation scrolling for iOS 
The -webkit-overflow-scrolling is an iOS only property:

https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling

that turns on momementum/continuation scrolling for iOS devices. This means
that when swiping, the scroll continues for a half second rather than instantly
stopping the scroll when the user lifts their finger from the screen.
 2018-04-12 10:53:27 +02:00
Daniel Lee db83255460 scrollbar: remove unused div 
Fixes the height of the settings menu
 2018-04-11 19:19:33 +02:00
Daniel Lee e74be16900 Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar 2018-04-11 18:33:00 +02:00
Daniel Lee 83f7ac18db Merge remote-tracking branch 'upstream/master' into 11053-remove-native-scrollbar 2018-04-11 14:32:19 +02:00
Daniel Lee 25ec7b5b02 scrollbar: use native scroll for page 2018-04-11 14:30:39 +02:00
Daniel Lee 9e1a1ed572 Merge pull request #11501 from grafana/metric-segment-to-ts 
migrated metric_segment to ts
 2018-04-10 12:41:58 +02:00
Daniel Lee 63dab4ffe4 Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-10 10:33:47 +02:00
Daniel Lee c860f21052 playlist: add missing nginject attribute 2018-04-09 21:33:18 +02:00
Daniel Lee d39dac10a6 docs: update after #11531 2018-04-09 15:19:41 +02:00
Daniel Lee 23ed5dfc8a Merge pull request #11531 from grafana/11391_access 
Rename direct/proxy access mode to browser/server
 2018-04-09 14:48:29 +02:00
Daniel Lee ce787b88bf css: quick fix after IE11 changes 
Temporary fix so that the add panel panel works properly. This will
break a3f15ced68.
 2018-04-06 21:29:42 +02:00
Daniel Lee 817b8d3946 Merge pull request #11511 from grafana/side-menu-icon-fix 
fixed sidemenu icon issue created by earlier pr
 2018-04-06 17:53:50 +02:00
Daniel Lee 3fd9c787cf Merge pull request #11497 from grafana/dash-class-to-ts 
migrated dash_class to ts
 2018-04-06 17:48:18 +02:00
Daniel Lee 51148709bb Merge pull request #11496 from grafana/segment-srv-to-ts 
migrated segment_srv to ts
 2018-04-06 11:18:51 +02:00
Daniel Lee 4ac290215e Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-05 22:30:13 +02:00
Daniel Lee fcfc33ee57 changelog: adds note for #11165 2018-04-05 15:02:54 +02:00
Daniel Lee 32b833e488 Merge pull request #11271 from grafana/11073_dashboard_folder_indent 
added indent to dashboards inside folder in search dropdown…
 2018-04-05 11:12:17 +02:00
Daniel Lee 088720cf2b Merge pull request #11417 from grafana/ie11_alerting_style_fix 
removed padding for icons and added margin
 2018-04-04 23:24:41 +02:00
Daniel Lee 2d1f2f3636 Merge pull request #11480 from grafana/graph_tooltip_to_ts 
Graph tooltip to ts
 2018-04-04 23:03:31 +02:00
Daniel Lee 28849bbd57 Merge pull request #11481 from grafana/all-js-to-ts 
migrated last all.js to ts
 2018-04-04 22:09:10 +02:00
Daniel Lee dc4cb0d565 Merge pull request #11483 from grafana/playlist-routes-to-ts 
migrated playlist-routes to ts
 2018-04-04 22:02:02 +02:00
Daniel Lee eef3120aed Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-04 18:32:18 +02:00
Daniel Lee eea2369987 Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-04 14:25:54 +02:00
Daniel Lee 4b1c1acab4 changelog: adds note for #11128 2018-04-03 22:40:48 +02:00
Daniel Lee 70eb281840 variables: adds test for variable sorting 
ref #11280
 2018-04-03 22:34:16 +02:00
Daniel Lee a6c7635528 graphite: fixes #11434 2018-04-03 19:39:50 +02:00
Daniel Lee 533f3a9e8c settings: fixes test 
For some reason, the url parse does not fail anymore for curly
braces. Add a colon in the first segment to make sure the url
parse fails.
 2018-04-03 19:09:49 +02:00
Daniel Lee 1f3602c7dd Merge pull request #11428 from bergquist/11281_fix 
Avoid panic when GF_DATABASE_URL contains illegal chars
 2018-04-03 16:59:25 +02:00
Daniel Lee a6a08038d4 Merge pull request #11416 from grafana/ie11_graphpanel_edit 
Graphpanel Edit fix for IE11
 2018-04-03 15:44:54 +02:00
Daniel Lee 1a6c632264 Merge pull request #11396 from grafana/ie11_search_and_popup 
fixed alignment in search + fixed issue ie popup
 2018-04-03 15:06:08 +02:00
Daniel Lee cdc0b04840 Merge pull request #11393 from grafana/ie_sidemenu 
sidemenu fix for internet explorer 11,
 2018-04-03 15:00:25 +02:00
Daniel Lee 6bc5896b3a Merge pull request #11381 from grafana/ie11_login 
styled login page for ie11
 2018-04-03 14:35:12 +02:00