IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,743 Commits 5,454 Branches 554 Tags 1.9 GiB
829af9425f
Commit Graph

6146 Commits

Author SHA1 Message Date
Patrick O'Carroll
e794951087 removed padding and moved carrot 2018-04-18 10:21:48 +02:00
Torkel Ödegaard
e81330abf0 fix: sign in link should have target self to trigger full page reload, fixes #11626 2018-04-17 21:01:52 +02:00
Torkel Ödegaard
1594ceeb6f
fix: Label font weight should be semi bold, fixes #11629 2018-04-17 19:40:44 +02:00
Daniel Lee
5b968329a0 graphite: adds tests for tags and tag_values functions 2018-04-17 18:58:47 +02:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards 2018-04-17 16:27:51 +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
Patrick O'Carroll
0120023aba added forceupdate to grid item so addpanel items rezie instantly, renamed function to copyPanel, fixed panel items height issue 2018-04-17 13:10:08 +02:00
Marcus Efraimsson
2fc1558daf
revert changes of add panel button to require save permission 
This resolves an issue where the add panel button was shown on the default home dashboard
 2018-04-17 11:03:46 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards 2018-04-17 10:50:04 +02:00
Torkel Ödegaard
85121e55c9
fix: Row state is now ignored when looking for dashboard changes (#11608) 
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208

* removed commented out log calls
 2018-04-17 09:41:07 +02:00
Marcus Efraimsson
9733172d3c
Merge pull request #11422 from grafana/dashboard-acl-ux2 
improved ux for permission list
 2018-04-17 09:39:39 +02:00
Marcus Efraimsson
d9799f7c13
Merge pull request #11572 from grafana/settings-icons-fix 
ux: sizing and positioning of dashboard settings menu icons
 2018-04-17 09:22:16 +02:00
Marcus Efraimsson
92768d5a2b
Merge branch 'master' into dashboard-acl-ux2 2018-04-17 09:19:36 +02:00
Marcus Efraimsson
a01e6fc9c7
add some more sort order asserts for permissions store tests 2018-04-17 09:19:17 +02:00
Marcus Efraimsson
3a5d1f4594
tsdb: update query and annotation editor help texts for postgres 
In addition to closing #11578
 2018-04-16 23:56:14 +02:00
Marcus Efraimsson
0e0976b0a2
Merge branch 'master' into 10427_addpanel_filter 2018-04-16 23:30:34 +02:00
Sven Klemm
4599329683 set default for sslmode to verify-full in postgres datasource editor (#11615) 2018-04-16 22:23:24 +02:00
Marcus Efraimsson
58e6b11809
add some more sort order asserts for permissions store tests 2018-04-16 21:51:53 +02:00
Marcus Efraimsson
bc8353ae14
Merge branch 'master' into dashboard-acl-ux2 2018-04-16 21:19:01 +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
Patrick O'Carroll
7ef6106197 migrated dropdown-typeahead to ts (#11499) 
* migrated dropdown-typeahead to ts

* removed console.logs

* added @ngInject
 2018-04-16 17:40:29 +02:00
Marcus Efraimsson
e932623cc0
Merge branch 'master' into settings-icons-fix 2018-04-16 17:16:54 +02:00
Marcus Efraimsson
9573bc43ce
dashboard: better size and alignment of settings icons 2018-04-16 17:16:35 +02:00
David
ed44face0e
Merge pull request #11605 from grafana/davkal/show-version-in-help 
Show Grafana version and build in Help menu
 2018-04-16 16:58:18 +02:00
David Kaltschmidt
5a29c17282 moved version in help menu to top 2018-04-16 16:25:28 +02:00
Marcus Efraimsson
90ed046ce3 docs: elasticsearch and influxdb docs for group by time interval option (#11609) 2018-04-16 16:03:50 +02:00
Patrick O'Carroll
5200196092 added fix for test 2018-04-16 14:49:47 +02:00
Patrick O'Carroll
ce3dcadfef addeds test for sort order 2018-04-16 14:30:50 +02:00
David Kaltschmidt
712212d6aa Show Grafana version and build in Help menu 
* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name
 2018-04-16 13:37:05 +02:00
Patrick O'Carroll
6b4ef7f598 wip: writing tests for permission sorting 2018-04-16 10:42:39 +02:00
Carl Bergquist
693ff1c000
Merge pull request #11579 from towolf/add-url-param-for-inactive-mode 
Add another URL param «inactive» which works like «kiosk» but with title
 2018-04-16 09:35:57 +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
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
Mario Trangoni
e5e6bc56c8 public: fix codespell issues 2018-04-13 20:31:29 +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
Marcus Efraimsson
4a26797cdd
Merge branch 'master' into readonly_dashboards 2018-04-13 17:03:00 +02:00
Marcus Efraimsson
060cd6ebef
Merge branch 'master' into settings-icons-fix 2018-04-13 14:49:08 +02:00
Patrick O'Carroll
c431875f28 permissions sorting fixed + icon same size as avatrs 2018-04-13 13:50:15 +02:00
Tobias Wolf
a43e7c7b3f Add another URL param «inactive» which works like «kiosk» but with title 
closes #11228
 2018-04-12 21:14:58 +02:00
Alexander Zobnin
f8543fced9 remove mistakenly added styles 2018-04-12 14:29:35 +03:00
Alexander Zobnin
31e5c1fa1f Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar 2018-04-12 14:23:47 +03:00
Alexander Zobnin
74c10515ad fix right side legend rendering in phantomjs 2018-04-12 14:22:19 +03: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
Patrick O'Carroll
229486015d added styling to fontawesome icons so they have same size as the other icons 2018-04-12 10:44:00 +02:00
Andrzej Ressel
bff174dba9 PR comments 2018-04-11 22:59:29 +02:00
Marcus Efraimsson
cdcaaa5d03
minor scrollbar fixes 
Hide page scrollbar when rendering using phantomjs.
Hide baron scrollbar when rendering using phantomjs.
 2018-04-11 20:12:32 +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
Marcus Efraimsson
a1b53674a9
dashboard: show baron scrollbar in dashboard panel when mouse is over 
This should make the scrolling user experience much better since it
will highlight and show that content actually can be scrolled when
hovering over a panel.
 2018-04-11 18:12:48 +02:00
Marcus Efraimsson
9549aadd26
fix so that page scrollbars can be scrolled by keyboard on page load 
The page scrollbars are custom, not rendered on the body element and
with css property overflow set for scroll to be enabled.
For being able to scroll the page using the keyboard when a
page loads, some custom code was needed.
This fix should both work when doing a full reload of a url and when
navigating to other pages/dashboards.
For those pages having an input field that are focused on load,
scrolling by keyboard (arrow up/down) will obviously not work.
 2018-04-11 17:49:40 +02:00
Marcus Efraimsson
2956011b60
fix so that dash list panel are rendered correctly 
This resolves issue with dash list panel getting scrollbars
    attached to incorrect elements. Now the panel content are
    rendered correctly and all content are displayed as
    expected.
 2018-04-11 17:44:51 +02:00
Marcus Efraimsson
8c04eb272d
panel: add baron scroller to correct element 
This resolves issue with alert list panel getting scrollbars
attached to incorrect element. Now the panel content are
rendered correctly and all content are displayed as
expected.
 2018-04-11 17:41:20 +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
Patrick O'Carroll
82aa6cf46b converted functions to arrow functions 2018-04-11 10:26:05 +02:00
Marcus Efraimsson
e73479ef33
folders: fix permissions in folder picker component 
Only enable creating new folders from folder picker if user has org roles
admin or editor.
Only render General option in folder picker if user has org roles admin
or editor.
 2018-04-11 00:26:16 +02:00
Patrick O'Carroll
5f67d4268d added @ngInject 2018-04-10 15:48:51 +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
Patrick O'Carroll
6719bdf9bd added @ngInject 2018-04-10 09:24:54 +02:00
Daniel Lee
c860f21052 playlist: add missing nginject attribute 2018-04-09 21:33:18 +02:00
Patrick O'Carroll
77b8ccd7f5 removed console.log 2018-04-09 17:01:58 +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
Alexander Zobnin
d9ba16f550 scrollbar: fix phantomjs rendering error 2018-04-09 14:21:20 +03:00
Sven Klemm
00524e6827 prevent angular from evaluating {{hostname}} in tooltip (#11514) 2018-04-09 12:51:17 +02:00
Marcus Efraimsson
95132165f8
data source: rename direct/proxy access mode in data source settings 
Changes access drop down options names:
- proxy -> Server (Default)
- direct -> Browser
Replace access drop down info icon/tooltip with expandable/collapsable
help section.
 2018-04-09 12:47:19 +02:00
Aleksei Magusev
92e5968f91 Fix ResponseParser for InfluxDB to return only string values 2018-04-09 11:52:12 +02:00
Aleksei Magusev
a101177b55 Conditionally select a field to return in ResponseParser for InfluxDB 
This patch also fixes "value[1] || value[0]" to not ignore zeros.
 2018-04-09 11:51:22 +02:00
Penghan Wang
fbed72c89c
Merge branch 'master' into feature/add_es_alerting 2018-04-09 14:00:28 +08:00
Andrzej Ressel
dc11f1da81 Make dashboard JSON editable 2018-04-08 20:00:18 +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
Alexander Zobnin
41e5d66e39 scrollbar: fix add panel height bug 2018-04-06 20:31:44 +03:00
Alexander Zobnin
d3d64337b4 scrollbar: styles cleanup 2018-04-06 20:00:03 +03: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
Patrick O'Carroll
c7cd754a94 migrating to ts 2018-04-06 15:02:32 +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
Patrick O'Carroll
6d6ecbd458 fixed sidemenu icon issue created by earlier pr 2018-04-06 10:54:06 +02:00
Patrick O'Carroll
b363e160d9 added icons for viewer and editor, fixed add permission team avatar 2018-04-06 09:43:59 +02:00
Jonas Hahnfeld
dfccabab75 singlestat: Fix optimization in setTableColumnToSensibleDefault 
tableColumnOptions is an associative array that has no property length.
Use tableData.columns as in the default case which works just fine.
 2018-04-05 20:59:11 +02:00
Jonas Hahnfeld
e3dbef755a influxdb: Check before assuming first column to be 'time' 
When running queries like 'SHOW [...] CARDINALITY' introduced with
InfluxDB 1.4 there is only a single column 'count'. However, the data
source always assumed 'time' which threw an error because the code
couldn't find a non-time column to display.

This change actually checks this assumption and thereby fixes displaying
the result in a Singlestat in Table mode (closes #11476).
 2018-04-05 20:53:22 +02:00
Marcus Efraimsson
f619dd579e provisioning: fix tests for save provisioned dashboard modal 2018-04-05 20:51:47 +02:00
Marcus Efraimsson
6bbeb723ca Merge branch 'master' into readonly_dashboards 2018-04-05 20:30:27 +02:00
Marcus Efraimsson
bcdb3ec84d provisioning: ux fixes when saving provisioned dashboards 
Wider modal.
Tried to improve provisioning description text.
Code editor for json.
Button that allows to save the json to a file.
 2018-04-05 20:28:04 +02:00
Marcus Efraimsson
4cc80efee6 graphite: use a query when testing data source 
Using a query (POST /render) request instead of GET /metrics/find to better
mimic an actual request for rendering a panel in a dashboard. The POST /render
request will add at least a custom http header which can be problematic when
using direct access mode since it will trigger a CORS prerequest check. By
doing this kind of query when testing the data source possible CORS issues
can be detected there instead of later when trying to use the data source
in a dashboard.
 2018-04-05 18:11:35 +02:00
Patrick O'Carroll
35bc4e4632 migrated metric_segment to ts 2018-04-05 17:10:32 +02:00
Alexander Zobnin
9f07ae72ee scrollbar: fix search scroller in mobile view 2018-04-05 16:47:20 +03:00
Alexander Zobnin
d6233714d2 Merge remote-tracking branch 'upstream/master' into fix-11053 2018-04-05 16:30:46 +03:00
Alexander Zobnin
fa43782299 scrollbar: fix graph legend height 2018-04-05 16:28:12 +03:00
Marcus Efraimsson
94d1a9fd83
Merge pull request #11430 from grafana/11332_esc_timepicker 
Enable closing timepicker using escape key
 2018-04-05 15:11:34 +02:00
Patrick O'Carroll
714d555e36 migrated dash_class to ts 2018-04-05 14:33:27 +02:00
Patrick O'Carroll
7083e8a0a9 migrated segment_srv to ts 2018-04-05 14:09:32 +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
Patrick O'Carroll
b321a21cb5 removed indent for manage dashboards 2018-04-05 11:00:15 +02:00
Alexander Zobnin
b4ef55f5d0 scrollbar: fix potential memory leaks in event handlers 2018-04-05 11:51:32 +03: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
Jarno Tuovinen
90aab44558 Use curly brackets around hyperlink help text #11478 (#11479) 2018-04-04 20:07:22 +02:00
Alexander Zobnin
b69316752a scrollbar: fix dashboard width updating for different modes 2018-04-04 19:51:12 +03:00
Alexander Zobnin
4df4249aea scrollbar: fix dashboard width bug 2018-04-04 19:22:07 +03:00
Alexander Zobnin
6b598f34cd scrollbar: fix 'legendScrollbar.destroy is not a function' error 2018-04-04 19:00:28 +03:00
Patrick O'Carroll
0273365df3 created closeDropdown function, renamed appevent, added second appevent for open timepicker 2018-04-04 16:20:01 +02:00
Patrick O'Carroll
84dce3282a migrated playlist-routes to ts 2018-04-04 15:26:23 +02:00
Patrick O'Carroll
13f6d3be87 migrated last all.js to ts 2018-04-04 14:16:39 +02:00
Alexander Zobnin
a265c77cf9 scrollbar: fix Firefox scroll position restore 2018-04-04 14:51:46 +03:00
Daniel Lee
70eb281840 variables: adds test for variable sorting 
ref #11280
 2018-04-03 22:34:16 +02:00
Chris Ross
4a93766143 Add case-insensitive sort for variables. 2018-04-03 22:24:21 +02:00
Daniel Lee
a6c7635528 graphite: fixes #11434 2018-04-03 19:39:50 +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
Patrick O'Carroll
658c6a8ff4 changed from margin to padding 2018-04-03 15:43:25 +02:00
Patrick O'Carroll
8b076d921f fixes for avatar on adding permission and size for gicon 2018-04-03 15:20:39 +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
Alexander Zobnin
3fcd262711 scrollbar: fix side menu on mobile devices 2018-04-03 14:48:48 +03: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
Patrick O'Carroll
feb222f633 changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable 2018-04-03 09:53:14 +02:00
Daniel Lee
8b2441e098 mssql: typos in help sections 
Fixes #11455
 2018-04-03 09:51:29 +02:00
Patrick O'Carroll
98e1404fed added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter 2018-04-03 09:39:46 +02:00
Alexander Zobnin
7b75b251b1 scrollbar: fix Firefox issue (white stripe on the right of scrollbar) 2018-04-02 21:15:10 +03:00
Alexander Zobnin
efaf267deb scrollbar: fix legend rendering issues 2018-04-02 20:47:09 +03:00
Alexander Zobnin
77d2ee9add Initially move to baron scrollbar 2018-04-02 14:59:49 +03:00
Alexey Velikiy
00f67ea7c7 rm panel.type constrain from threshold_mapper.ts (#11448) 2018-04-02 08:13:22 +02:00
Patrick O'Carroll
9ef5f2700d timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view 2018-03-29 15:02:00 +02:00
Patrick O'Carroll
7b9b34c6e1 migrated graph_tooltip to ts 2018-03-29 11:51:34 +02:00
Daniel Lee
32264c61c4 Merge branch 'master' into dashboard-acl-ux2 2018-03-29 11:32:24 +02:00
Patrick O'Carroll
65f7c5f08f started migration to ts 2018-03-29 10:40:45 +02:00
Julien Pivotto
1f1719c498 Fix #10555 #6888 Better escape for Prometheus variables 
Prior this commit, C:\bar was escaped C:\\\bar. Should be C:\\\\bar.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-29 09:49:15 +02:00
Patrick O'Carroll
8195c085fa bounnd the esc key to exit timepicker 2018-03-29 09:15:15 +02:00
Patrick O'Carroll
d40b7433ea removed padding for icons and added margin 2018-03-28 15:06:20 +02:00
Patrick O'Carroll
a3f15ced68 fixed graphpanel editmode and custom width for right side legend for IE11 2018-03-28 14:19:17 +02:00
bergquist
d29563ff8e alerting: bad default state for notifiers 
when we made image upload optional we didnt
show the default value properly in the UI. Which
caused confusing. This commit apply the default
values to existing notifiers in the edit pages
and reverts back to using uploadimage=true as the
default value.
 2018-03-28 12:52:39 +02:00
Marcus Efraimsson
f673ec16d1 table panel: additional fixes for value to text mapping 
Make the value to text mapping more similar to singlestat solution.
Adds more tests.
Also, allows string to be mapped to other string besides numeric values.
 2018-03-27 19:04:45 +02:00
aandrew
67f0382222 add value to text mapping 2018-03-27 19:00:22 +02:00
bergquist
7f5c2ebdd1 provisioning: better description for provisioned save modal 2018-03-27 15:19:20 +02:00
Patrick O'Carroll
d4be953d23 fixed alignment in search + fixed issue ie popup 2018-03-27 12:36:13 +02:00
Patrick O'Carroll
dbcba4a009 sidemenu fix for internet explorer 11, changed icon width/height to pixels and added height to logo 2018-03-27 10:41:47 +02:00
Carl Bergquist
cdf4664930
Merge pull request #11371 from towolf/add-duplicate-panel-hints 
Add hints for the 'pd' Duplicate Panel command from PR #11264
 2018-03-27 10:35:41 +02:00
Thomas Rohlik
bf4273b584
Add new currency - Czech koruna 
Currency used in Czech republic.
 2018-03-26 16:34:49 +02:00
bergquist
d6faa3d06f provisioning: improve UX when saving provisioned dashboards 2018-03-26 15:08:46 +02:00
Patrick O'Carroll
ff62036f15 styled login page for ie11 2018-03-26 14:14:57 +02:00
Penghan Wang
a21afbe9a6
Merge branch 'master' into feature/add_es_alerting 2018-03-26 19:51:03 +08:00
Tobias Wolf
03b2561af2 Missed the 'p d' hint in the popup-menu 2018-03-24 14:49:06 +01:00
Tobias Wolf
02f84e0c74 Add hints for the 'pd' Duplicate Panel command from PR #11264 2018-03-24 14:41:41 +01:00
Carl Bergquist
980e078222
Merge pull request #11326 from bergquist/more_traces 
dataproxy: adds dashboardid and panelid as tags
 2018-03-23 17:13:15 +01:00
wph95
8e7d23cdeb
wip 
Signed-off-by: wph95 <wph657856467@gmail.com>
 2018-03-23 23:50:16 +08: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
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
Marcus Efraimsson
f04a5d7329 Merge branch 'master' into 1271_share_zero 2018-03-22 18:31:37 +01:00
Marcus Efraimsson
c672e44d35 graph: minor fixes to y-axes alignment feature 2018-03-22 18:30:23 +01:00
Patrick O'Carroll
99626b8e07 added save icon to save buttons 2018-03-22 17:04:00 +01:00
Marcus Efraimsson
2e8aeffc13 Merge branch 'master' into 1271_share_zero 2018-03-22 16:59:36 +01:00
Patrick O'Carroll
823f903048 removed trash can icon from save buttons 2018-03-22 16:59:06 +01:00
Marcus Efraimsson
bd4ecaeac6 mssql: update query editor help 2018-03-22 15:46:40 +01:00
Marcus Efraimsson
f5654f88e2 mysql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Refactored mysql implementation to make it more similar to postgres
and mssql implementations.
Added $__timeEpoch macro function with same implementation as $__time.
Added possibility to use a time column named time in addition to
the currectly supported time_sec.
Additional tests and update of existing.
Added test dashboard.
 2018-03-22 15:40:46 +01:00
Marcus Efraimsson
66c03f84f5 postgres: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running postgres on UTC and dev environment on non-utc.
Added test dashboard.
 2018-03-22 15:32:33 +01:00
Marcus Efraimsson
b69ebee066 mssql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running MSSQL on UTC and dev environment on non-utc.
Update stored procedures test to handle more parameters.
Update test dashboard.
 2018-03-22 15:23:12 +01:00
Marcus Efraimsson
b0076d4f65 mssql: remove UTC conversion in macro functions 
Removes the macro function . Macro functions should not do UTC/timezone conversion - they should
work in the same way as postgres and mysql datasource implementations.
Grafana and Microsft SQL Server should be run on servers with UTC timezones.
 2018-03-22 14:55:44 +01:00
Patrick O'Carroll
4916826364 small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under 2018-03-22 14:39:13 +01:00
Patrick O'Carroll
f2f709989f fixed so legend right works like legend under on small screens 2018-03-22 09:41:05 +01:00
Marcus Efraimsson
42299eb328 Merge branch 'master' into 11306-sql-table-time 2018-03-21 12:08:48 +01:00
bergquist
f142548969 dataproxy: adds dashboardid and panelid as tags 
closes #11315
 2018-03-20 22:23:28 +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
Marcus Efraimsson
9df5476fe3
Merge pull request #11312 from grafana/func_editor_js_to_ts 
convert func_editor.js to typescript
 2018-03-20 20:51:58 +01:00
Marcus Efraimsson
de396b277e
Merge pull request #11309 from grafana/add_graphite_func_js_to_ts 
convert add_graphite_func.js to typescript
 2018-03-20 20:51:21 +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
Alexander Zobnin
a472d38fbf snapshot: fix legend rendering bug 2018-03-20 21:33:54 +03: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
ilgizar
0e159dada1 Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes. 2018-03-20 22:44:48 +05:00
ryan
f9acb4157b Expose option to disable snippets 2018-03-20 15:26:41 +01:00
Patrick O'Carroll
47215098a3 changed var to const, changed to string interpolation 2018-03-20 14:43:09 +01:00
ryan
54c4b6a11a Remove unused kibana images 2018-03-20 14:39:19 +01:00
Patrick O'Carroll
3bdd006291 changed var to const 2018-03-20 14:26:03 +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
Carl Bergquist
10a0460dc6
Merge pull request #11282 from alexanderzobnin/fix-11086 
Fix rendering link to panel in collapsed row
 2018-03-20 12:40:30 +01:00
Patrick O'Carroll
2a90370230 converted file to ts 2018-03-20 12:36:02 +01:00
Alexander Zobnin
05ac7d8fca dashboard: fix phantomjs panel rendering in collapsed row 2018-03-20 14:13:31 +03:00
ilgizar
e015047ed1 Fixed unit test. 2018-03-20 16:09:52 +05:00
ilgizar
341afe65ef Merge remote-tracking branch 'upstream/master' into 1271_share_zero 2018-03-20 15:54:56 +05:00
ilgizar
1588295375 Changed the way this feature was activated. And changed tolltip. 2018-03-20 15:38:48 +05:00
ilgizar
230f018c78 Added validation of input parameters. 2018-03-20 15:37:18 +05:00
Patrick O'Carroll
2a50bc35a3 converted file to ts 2018-03-20 11:07:31 +01:00
Marcus Efraimsson
8f6626e805 mssql: encrypt password in database 2018-03-19 17:32:51 +01:00
Marcus Efraimsson
6044b3aeeb Merge branch 'master' into mssql_datasource 2018-03-19 17:14:33 +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
Marcus Efraimsson
24c0f28f41 mssql: allow host without port and fallback to default port 1433 2018-03-19 13:24:31 +01:00
Marcus Efraimsson
62174c81c8 mssql: cleanup and minor changes 2018-03-19 13:06:46 +01:00
Marcus Efraimsson
8c2f3f761b mssql: update readme 2018-03-19 11:20:17 +01:00
Marcus Efraimsson
294ee5a610 Merge branch 'master' into mssql_datasource 2018-03-19 11:03:13 +01:00
Marcus Efraimsson
74a98d46eb mssql: remove logos for now 2018-03-19 11:02:55 +01:00