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,073 Commits 1,119 Branches 715 Tags
e7bcd8c3c3662cb7e6d94756fc71c059962e8c95
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Daniel Lee ebbbf170f1 Merge pull request #11463 from grafana/tabbed-close-btn-hover 
Fix for tabbed-view btn in light theme
 2018-04-03 10:31:14 +02:00
Daniel Lee 3fc2e53081 Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-03 09:52:31 +02:00
Daniel Lee 8b2441e098 mssql: typos in help sections 
Fixes #11455
 2018-04-03 09:51:29 +02:00
Daniel Lee de6cd7ed0b docker: add users and groups to ldap block 2018-03-30 10:09:36 +02:00
Daniel Lee 86776154cc docs: rpm install page - update to centos 7 2018-03-28 15:35:51 +02:00
Daniel Lee 485d0f1c95 docs: install pages for v5.0.4 2018-03-28 15:19:46 +02:00
Daniel Lee 33bd979494 changelog: another update for v5.0.4 2018-03-28 14:57:11 +02:00
Daniel Lee b1d3535cbb changelog: update for v5.0.4 2018-03-28 14:50:27 +02:00
Daniel Lee 4b6fd675e2 Merge pull request #11390 from bergquist/notifiers_default_value 
Default value for uploading images in alert notifiers
 2018-03-28 13:06:09 +02:00
Daniel Lee 208cbd1189 Merge pull request #11405 from bergquist/alert_link 
alert: fixes broken link back to grafana
 2018-03-28 13:00:32 +02:00
Daniel Lee 68833fa978 dashboard: allow alerts to be saved for new/provisioned dashboards 
This changes the logic for the alert validation in the extractor. Validation
is executed twice, once before attempting to save the alerts and once after
saving the dashboard while saving the alerts to the db. The first validation
will not require that the alert has a dashboard id which allows new dashboards
with alerts to be saved.

Fixes #11247
 2018-03-28 11:32:05 +02:00
Daniel Lee e84f746d1d Merge pull request #11348 from grafana/11306-sql-table-time 
Postgres, MySQL, MSSQL minor refactoring/unification
 2018-03-23 14:23:31 +01:00
Daniel Lee 7b141280e5 docs: tweaks 2018-03-23 13:31:02 +01:00
Daniel Lee 78d314a9c1 Merge pull request #11140 from grafana/11131_right_legend_responsive 
added media breakpoint to legend-right
 2018-03-23 12:49:35 +01:00
Daniel Lee 4f38d237cb legend: small refactoring 2018-03-23 11:08:24 +01:00
Daniel Lee 1c1d962bb1 docs: spelling 2018-03-23 09:04:50 +01:00
Daniel Lee ccfe9de014 docs: add intro paragraph to provisioning page 2018-03-23 08:55:11 +01:00
Daniel Lee 624dac16fa docs: add variable regex examples (#11327) 2018-03-21 13:23:50 +01:00
Daniel Lee c53fda4b5a Merge pull request #11264 from grafana/11102_duplicate_panel_shortcut 
Keyboard shortcut to duplicate panel
 2018-03-20 20:56:35 +01:00
Daniel Lee 685a371747 Merge pull request #11316 from ryantxu/ace-disable-snippets 
Expose option to disable snippets in ACE code-editor
 2018-03-20 20:53:34 +01:00
Daniel Lee 4dcf1b72b3 Merge pull request #11313 from ryantxu/remove-unused-images 
Remove unused kibana images
 2018-03-20 20:44:00 +01:00
Daniel Lee 70cd501373 Merge pull request #11320 from daniellee/update-xorm 
mysql: fixes panics when mysql connection times out (#11155)
 2018-03-20 20:16:18 +01:00
Daniel Lee 32d1477b79 Merge pull request #11319 from alexanderzobnin/fix-11318 
snapshot: fix legend rendering bug
 2018-03-20 20:02:25 +01:00
Daniel Lee 92388f7faf session: update defaults for ConnMaxLifetime 
to be the same as the 5.0.3 release defaults
 2018-03-20 19:31:01 +01:00
Daniel Lee 1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm 2018-03-20 19:21:58 +01:00
Daniel Lee 70630d742e snapshots: removes errors for empty values in ViewStore 
Occurs when opening a snapshot.
 2018-03-20 19:12:52 +01:00
Daniel Lee e5e9d3c2f3 mssql: adds test for time should be ms in table mode 2018-03-20 14:42:29 +01:00
Daniel Lee d34cd8730e mssql: convert tests to jest 2018-03-20 13:01:32 +01:00
Daniel Lee ae4c6e4648 mssql: fix precision for time column in table mode 
ref #11306
 2018-03-20 12:59:40 +01:00
Daniel Lee 4033283254 Merge pull request #11298 from grafana/mssql_datasource 
Microsoft SQL Server data source
 2018-03-20 00:03:26 +01:00
Daniel Lee caf60dda0e Merge pull request #10376 from grafana/openTSDB-file-to-ts 
migrated file to ts
 2018-03-19 14:32:32 +01:00
Daniel Lee 8b9c44be17 Merge pull request #10369 from grafana/elastic-file-to-ts 
migrated files to ts
 2018-03-19 13:59:30 +01:00
Daniel Lee 72f4341305 Merge pull request #11289 from DavidLambauer/patch-1 
Minor format changes
 2018-03-19 07:56:47 +01:00
Daniel Lee 4bf285c3d1 docs: update install docs for 5.0.3 2018-03-16 18:39:34 +01:00
Daniel Lee e7bbc6e624 changelog: 5.0.3 2018-03-16 17:42:23 +01:00
Daniel Lee 3ca1e06509 session: fork Macaron mysql session middleware 
This changes forks the mysql part of the Macaron session middleware.

In the forked mysql file:

- takes in a config setting for SetConnMaxLifetime (this solves wait_timeout
problem if it is set to a shorter interval than wait_timeout)
- removes the panic when an error is returned in the Exist function.
- retries the exist query once
- retries the GC query once
 2018-03-16 01:19:28 +01:00
Daniel Lee 9cdd7cb04c database: expose SetConnMaxLifetime as config setting 
For MySQL, setting this to be shorter than the wait_timeout MySQL setting
solves the issue with connection errors after the session has timed out for
the connection to the database via xorm.
 2018-03-16 01:09:00 +01:00
Daniel Lee 5a3ba68a9c database: fixes after xorm update 2018-03-16 00:09:29 +01:00
Daniel Lee 1c20126f87 database: update xorm to v0.6.4 and xorm core to v0.5.7 2018-03-16 00:02:50 +01:00
Daniel Lee 5f511deefc middleware: recover and retry on session start 
Partial fix for #11155 - the Macaron session middleware
panics if mysql returns an error. This fix recovers from
the panic and retries once
 2018-03-14 12:26:59 +01:00
Daniel Lee 3f2c086e6f teams: removes quota on route 
Got added by mistake a year ago.
 2018-03-13 10:56:35 +01:00
Daniel Lee 8563c12548 Merge pull request #11157 from chaintng/fix-query-condition 
fix query condition docs
 2018-03-08 10:40:35 +01:00
Daniel Lee d96fbb486f alerting: fixes validation error when saving alerts in dash 
If a panelId in the dashboard json is set to zero then the validation
silently fails. Instead of returning an error, it just ignores alerts and
saves the dashboard.
 2018-03-07 16:20:05 +01:00
Daniel Lee 4acc8f8ad7 Merge pull request #11119 from bergquist/no_row_setting_viewer 
hide row actions for viewers
 2018-03-07 14:25:39 +01:00
Daniel Lee 3a19cf52ef Merge pull request #11123 from grafana/mobile_menu_polish 
changed background for mobile menu background on light theme,
 2018-03-07 10:58:57 +01:00
Daniel Lee c657fe8875 Merge pull request #11092 from grafana/11091_anonymous_sign_in 
made drop-menu into link
 2018-03-07 10:54:48 +01:00
Daniel Lee 8e81dc1e79 scrolling: faster wheelspeed 
ref #11053
 2018-03-06 20:08:00 +01:00
Daniel Lee 4d434d9845 docs: add v5.1 to versions 2018-03-06 09:27:40 +01:00
Daniel Lee 1a16e588f7 changelog: notes for #11055 and #9487 2018-03-05 19:44:09 +01:00
Daniel Lee 9c8733ac85 Merge pull request #11093 from svenklemm/postgres-connection 
postgres: use net/url to generate postgres connection url
 2018-03-05 19:27:02 +01:00
Daniel Lee 7ce63169a0 Merge pull request #10138 from svenklemm/macroengine-interpolate 
postgres+mysql: add optional fill parameter to $__timeGroup macro to fill in missing values in series
 2018-03-04 21:38:30 +01:00
Daniel Lee 655d2fb405 docs: update current version to 5.0 2018-03-01 10:11:52 +01:00
Daniel Lee cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +01:00