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,656 Commits 5,454 Branches 554 Tags 1.9 GiB
9b9e3962c5
Commit Graph

6115 Commits

Author SHA1 Message Date
Dan Cech
93a8d8a25b allow analytics.js to be cached, enable anonymizeIP setting (#11656) 2018-05-08 10:48:27 +02:00
Torkel Ödegaard
f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)" 
This reverts commit 34133671b9.
 2018-05-08 09:45:08 +02:00
Torkel Ödegaard
4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Torkel Ödegaard
b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll
8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley
34133671b9 Add baron scrollbar to a node managed by gafana (#11850) 
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
 2018-05-08 06:39:12 +02:00
David
1236b7b918
Merge pull request #11770 from grafana/davkal/explore-panel-link 
Explore: Add entry to panel menu to jump to Explore
 2018-05-07 16:31:19 +02:00
Florian Plattner
5d54bc00e1 Fix/improved csv output (#11740) 
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
 2018-05-07 10:22:54 +02:00
Torkel Ödegaard
fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Marcus Efraimsson
d0753949bc
Merge pull request #11794 from grafana/11616-timepicker-buttons 
fix dark/light theme date selector styling in timepicker control
 2018-05-04 14:55:56 +02:00
Patrick O'Carroll
515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll
c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson
6eba9c2438
Merge pull request #11802 from svenklemm/variable-interpolation 
dont shadow format passed in as function parameter in replace function in templatesrv
 2018-05-03 19:09:40 +02:00
Sven Klemm
a806f542c6 test if default variable interpolation is effective when no specific 
format is specified
 2018-05-03 18:42:58 +02:00
Marcus Efraimsson
da8f6c150b
Merge pull request #11751 from mtanda/11690 
fix to match table column name and order
 2018-05-03 18:33:46 +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
Alexander Zobnin
83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Sven Klemm
764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Alexander Zobnin
64283408ee scroll: fix scrolling on mobile Chrome (#11710) 2018-05-02 12:43:25 +03:00
Marcus Efraimsson
f17100e98e
Merge pull request #11786 from marefr/11625_save_as 
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
 2018-05-02 11:15:22 +02:00
Marcus Efraimsson
1f21b3e23b
remove jest it.only to not skip important tests 2018-05-02 10:54:00 +02:00
Patrick O'Carroll
3dd073f98d fixed so all buttons are styled not just small ones, fixes #11616 2018-05-02 09:56:53 +02:00
Mitsuhiro Tanda
253b2cc081 add test for prometheus table column title 2018-05-01 05:00:56 +09:00
David Kaltschmidt
8a53ec610b Fix url encoding, expand template vars, fix TS hacks 
* moved datasource related functions to panel sub-class
* expand panel template vars for url
* added keybindings for x -> Explore
* url encoding for explore state
 2018-04-30 17:44:30 +02:00
David Kaltschmidt
05b0bfafe4 Explore: Add entry to panel menu to jump to Explore 
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
 2018-04-30 17:44:28 +02:00
Marcus Efraimsson
b0349bc795
Merge pull request #11575 from alexanderzobnin/fix-11498 
Histogram: fix invisible highest value bucket
 2018-04-30 16:32:21 +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
Alexander Zobnin
b16626c3b5
graph histogram: fix invisible highest value bucket 2018-04-30 16:12:31 +02:00
Marcus Efraimsson
5c57c7cff5
dashboard: show save as button if can edit and has edit permission to folders 2018-04-30 15:38:46 +02:00
Marcus Efraimsson
4f7791b9fa
fix dropdown typeahead issue 
New explore feature overriding css for dropdown typeahead component.
 2018-04-30 11:50:50 +02:00
David
cc74f6c6a0
Merge pull request #11761 from grafana/davkal/explore-multi-row 
Explore: add support for multiple queries
 2018-04-27 17:31:25 +02:00
David
d8abfe6a7d
Merge pull request #11742 from grafana/davkal/explore 
Explore UI skeleton
 2018-04-27 15:46:40 +02:00
David Kaltschmidt
949e3d29e8 Explore: add support for multiple queries 
* adds +/- buttons to query rows in the Explore section
* on Run Query all query expressions are submitted
* `generateQueryKey` and `ensureQueries` are helpers to ensure each
 query field has a unique key for react.
 2018-04-27 15:42:35 +02:00
Marcus Efraimsson
138c8c348e
revert renaming of unit key ppm 
#11211 removed the unit key ppm in favor of conppm. A change which is not forward compatible.
This commit revert the unit key back to ppm.
Also adds some better error description if trying to use a unit which don't exists.
Fixes #11743
 2018-04-27 13:41:20 +02:00
Mitsuhiro Tanda
c2b720835b fix to match table column name and order 2018-04-27 19:34:10 +09:00
David Kaltschmidt
d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt
f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
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