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
16,597 Commits 5,416 Branches 554 Tags
6d8a3ce1a3a00c7ccd6f9f02da344240edfac2b1
Commit Graph

6593 Commits

Author SHA1 Message Date
Daniel Lee
6d8a3ce1a3 stackdriver: adds missing nginject attribute 2018-10-03 14:42:41 +02:00
Johannes Schill
97802f30ae Fix issue with updating role permissions #13507 2018-10-03 13:37:00 +02:00
Torkel Ödegaard
fe4f2f71c3 Revert "Org users to react" 2018-10-03 09:40:37 +02:00
Torkel Ödegaard
38637f056f Merge pull request #13488 from grafana/org-users-to-react 
Org users to react
 2018-10-03 09:30:08 +02:00
Torkel Ödegaard
ed0c2296b6 added slow queries scenario to test data source, added new panel test dashboard with slow queries 2018-10-02 13:00:54 -07:00
Torkel Ödegaard
9e72588cec wip: began work on support for testdata tables & annotations support 2018-10-02 18:50:30 +02:00
David
321c09aec4 Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels 
Explore: jump to explore from panels with mixed datasources
 2018-10-02 15:42:43 +02:00
Peter Holmberg
908bf8e834 deleting obsolete things 2018-10-02 13:53:11 +02:00
Peter Holmberg
cc57995070 snap 2018-10-02 13:30:09 +02:00
Peter Holmberg
6d6416c04d fix after merge from master 2018-10-02 13:19:11 +02:00
Peter Holmberg
09b681326e Merge branch 'master' into org-users-to-react 2018-10-02 11:18:01 +02:00
Peter Holmberg
cc1e22925f snaps 2018-10-02 11:11:36 +02:00
Peter Holmberg
a188ceacbc invitees 2018-10-02 11:04:55 +02:00
Torkel Ödegaard
f37a60dcd5 Merge branch 'data-sources-list-to-react' 2018-10-02 09:33:58 +02:00
Torkel Ödegaard
8fd1d8a057 changed from RFC to PureComponent 2018-10-02 09:27:02 +02:00
Peter Holmberg
3c8820ab55 invites table 2018-10-01 18:01:26 +02:00
Peter Holmberg
13666c8462 tests 2018-10-01 14:17:28 +02:00
Peter Holmberg
a43ede70bc added default prop instead of specifying prop 2018-10-01 14:02:13 +02:00
Peter Holmberg
3211df7303 filter users in selector based on search 2018-10-01 13:45:00 +02:00
David Kaltschmidt
68dfc5699b Moved explore helpers to utils/explore 2018-10-01 12:56:26 +02:00
David Kaltschmidt
54c9beb146 Explore: jump to explore from panels with mixed datasources 
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
  explore and collects its targets
- passes those targets to the found datasource to be serialized for
  explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
 2018-10-01 12:03:57 +02:00
Peter Holmberg
94971abd9c functions and tests 2018-10-01 12:01:53 +02:00
David
7b543ca4b5 Merge pull request #13463 from grafana/davkal/explore-url-state 
Explore: Store UI state in URL
 2018-10-01 10:09:15 +02:00
Torkel Ödegaard
c0996e7a39 Merge pull request #13444 from grafana/13411-react-api-key 
13411 react api key
 2018-10-01 09:46:18 +02:00
Daniel Lee
9c2bca411c Merge pull request #13289 from grafana/stackdriver-plugin 
Stackdriver Datasource - Fixes #6733
 2018-09-28 19:36:01 +02:00
Daniel Lee
cf0189ab1a stackdriver: no tags for annotations (yet) 
fixes glitch where an empty tag shows up
 2018-09-28 19:17:34 +02:00
Daniel Lee
296fd35d47 stackdriver: add help section for annotations 2018-09-28 19:12:50 +02:00
Daniel Lee
a1f486bbfa stackdriver: revert an accidental commit for text template variable 
with dummy change in readme to be able to make a commit
 2018-09-28 18:19:57 +02:00
David
b2758b2ad0 Merge pull request #13408 from grafana/limit-number-of-series-in-explore 
Limit number of time series in explore
 2018-09-28 17:45:33 +02:00
David Kaltschmidt
12c43d6436 Added test for url state in Explore 2018-09-28 17:39:53 +02:00
David Kaltschmidt
c3e0d4205c Make Explore a pure component 2018-09-28 17:38:50 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +02:00
Daniel Lee
399e83f91b stackdriver: remove metric.category alias pattern 
After discussions with the Stackdriver team, they did not think this was
needed.
 2018-09-28 17:16:35 +02:00
Erik Sundell
a25389332c stackdriver: remove commented code 2018-09-28 17:11:06 +02:00
Erik Sundell
db8bbe3cad stackdriver: unit test group by and aggregation dropdown changes 2018-09-28 17:06:24 +02:00
Erik Sundell
3572692fd5 stackdriver: make it impossible to select no aggregation when a group by is selected 2018-09-28 16:55:39 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL 
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
 2018-09-28 16:44:07 +02:00
Erik Sundell
cdcb14f3e6 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-28 16:37:11 +02:00
Erik Sundell
fc1e214987 stackdriver: add relevant error message for when a user tries to create a template variable 2018-09-28 16:36:43 +02:00
Daniel Lee
aedd518186 Merge remote-tracking branch 'origin/stackdriver-plugin' into stackdriver-plugin 2018-09-28 16:34:28 +02:00
Daniel Lee
9b90b835b2 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-28 16:20:40 +02:00
Erik Sundell
31ddcdb37e stackdriver: make sure labels are loaded when service is changed in dropdown 2018-09-28 16:20:16 +02:00
Erik Sundell
4abd04a5cf stackdriver: use correct default value for alignment period 2018-09-28 15:23:13 +02:00
Erik Sundell
f384e577dd stackdriver: fix reducer names 2018-09-28 15:11:33 +02:00
Peter Holmberg
da856187d8 snaps 2018-09-28 14:57:56 +02:00
Peter Holmberg
21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Peter Holmberg
e50a87aec9 using constant 2018-09-28 12:58:01 +02:00
Peter Holmberg
7ae4076ddd added no datasources added 2018-09-28 11:29:18 +02:00
Erik Sundell
5bc6d857a7 stackdriver: broadcasting through $scope doesnt work anymore since query_filter_ctrl is now a sibling directive to query_aggregation_ctrl, so broadcasting is now done using $rootScope 2018-09-28 11:25:32 +02:00