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
14,555 Commits 5,454 Branches 554 Tags 1.9 GiB
b8c4aa3936
Commit Graph

6078 Commits

Author SHA1 Message Date
Marcus Efraimsson
ddeba41638
fix so that google analytics script are cached 2018-04-26 15:49:22 +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
Marcus Efraimsson
fff5d7154e
Merge pull request #11721 from grafana/11677-missaligned-menu-carot 
fix misalignment of unit and other drop downs in firefox
 2018-04-25 17:24:54 +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
Marcus Efraimsson
f112e38266
prometheus: convert metric find query tests to jest 2018-04-25 15:37:58 +02:00
Marcus Efraimsson
6687409efb
prometheus: fix variable query to fallback correctly to series query 
Using a query of for example up or up{job=job1}
 2018-04-25 15:37:58 +02:00
Patrick O'Carroll
6836268f3e removed height 100% from panel-container to fix ie11 panel edit mode 2018-04-25 12:44:39 +02:00
Patrick O'Carroll
99aa9a46bc replaced border hack carot with fontawesome carot fixes #11677 2018-04-25 12:16:43 +02:00
David
c99d6bd505
Merge pull request #11678 from grafana/davkal/11673-silent-response 
Add silent option to backend requests
 2018-04-25 09:46:41 +02:00
Carl Bergquist
f2b5b6f299
Merge pull request #11694 from flopp999/patch-5 
Added requests/sec(throughput)
 2018-04-24 21:30:34 +02:00
Marcus Efraimsson
7626775491
Merge pull request #11695 from grafana/11508_variables_preview_values 
allow to show more preview values for variables
 2018-04-24 20:05:47 +02:00
Patrick O'Carroll
a40314022b added pointer to show more, reset values on new query 2018-04-24 17:40:03 +02:00
David Kaltschmidt
707700ac7d force GET for metadataRequests, w/ test 2018-04-24 16:26:46 +02:00
David Kaltschmidt
006286ac05 Renamed helperRequest and removed positional args 
From review feedback:

* s/helper/metadata
* combined positional args to _request into options dict
* metadataRequest reuses _request()
* moved consumption of this.httpMethod into _request, can be overwritten
 in options due to spread-after
 2018-04-24 12:27:37 +02:00
David Kaltschmidt
0695e431ea Move function calls w/ side-effects to componentDidMount 
* loadStore() modified the url which triggered a new render path, this
gets noticed by react. Moved to componentDidMount.
 2018-04-24 12:07:24 +02:00
Patrick O'Carroll
38a4a2dc60 changed test name and dashboardMock code 2018-04-24 11:22:58 +02:00
Patrick O'Carroll
1446f54447 fixed test 2018-04-24 09:45:53 +02:00
Patrick O'Carroll
45e6d9fcc4 removed import config 2018-04-23 17:45:51 +02:00
Patrick O'Carroll
3eaaa5d32d fixed so user who can edit dashboard can edit row, fixes #11466 2018-04-23 17:44:29 +02:00
flopp999
28ce71253f
changed rps to reqps 2018-04-23 14:06:25 +02:00
Patrick O'Carroll
c2cc77fa08 added button to show more preview values for variables, button runs a function that increases options limit, fixes #11508 2018-04-23 13:00:24 +02:00
flopp999
1cc4c0c1f0
Added requests/sec(throughput) 
#9630
 2018-04-23 12:05:26 +02:00
Marcus Efraimsson
079346917f
use inherited property from api when rendering permissions 2018-04-23 09:23:31 +02:00
Andrzej Ressel
9d5ccaef54
Merge branch 'master' into feature/save_json 2018-04-22 21:24:52 +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
David Kaltschmidt
53817b7429 Add silent option to backend requests 
* When set to `true`, the `silent` option for backend_srv requests
 suppresses all event emitters that are triggered when the response is
received.
* Added `helperRequest()` to the Prometheus datasource to support
 requests that are not triggered by the user, e.g., for tab completion.
`helperRequest()` sets the `silent` option.
* Migrated all non-timeseries queries of the Prometheus datasource to
 use `helperRequest()`.

Fixes #11673
 2018-04-20 15:28:04 +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
David Kaltschmidt
cc5d7002b0 Add weback-dev-server with hot/hmr support 
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
 2018-04-19 11:42:53 +02:00
Carl Bergquist
2dfa576c76
Merge pull request #11504 from hahnjo/11476-influxdb-show-cardinality 
influxdb: Check before assuming first column to be 'time'
 2018-04-19 11:18:01 +02:00
Marcus Efraimsson
606257a1da
move jest test file to specs 2018-04-18 14:00:15 +02:00
Marcus Efraimsson
ce97f89de6
make add panel panel scrollbar adjust when panel/dashboard grid are resized 2018-04-18 13:59:26 +02:00
Marcus Efraimsson
82054e1a3e
Merge branch 'master' into 10427_addpanel_filter 2018-04-18 11:36:13 +02:00
Patrick O'Carroll
23f644c2f5 changed copied message and added forced render for width change 2018-04-18 10:34:43 +02:00
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