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
15,008 Commits 5,416 Branches 554 Tags
54420363d3640570dafdcba24afda5b6fdc04c1d
Commit Graph

6250 Commits

Author SHA1 Message Date
Marcus Efraimsson
54420363d3 fix footer css issue 2018-06-28 14:02:42 +02:00
Marcus Efraimsson
9f02927761 login: fix layout issues 2018-06-26 15:19:57 +02:00
Marcus Efraimsson
ceba0490f8 Merge pull request #12395 from grafana/11968_variable_key_value 
Set correct text in drop down when variable is present in url
 2018-06-26 10:29:21 +02:00
Marcus Efraimsson
98a7f258af Merge pull request #12392 from dehrax/12248-fix 
Fix selecting current dashboard from search does not reload dashboard
 2018-06-25 15:21:24 +02:00
Marcus Efraimsson
5280084480 set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
Tobias Skarhed
762ee203fa Fix 12248 2018-06-25 13:46:33 +02:00
rozetko
97db9ece98 Set $rootScope in DatasourceSrv 2018-06-22 16:17:02 +03:00
Daniel Lee
b2187b70a7 Merge pull request #11990 from mtanda/issue_11925 
fix "Cloudwatch panel does not allow arbitrary variable values in query"
 2018-06-21 18:00:49 +02:00
Daniel Lee
75e378b689 Merge pull request #12367 from dehrax/12224-history-ctrl 
Karma to Jest: history_ctrl
 2018-06-21 14:52:01 +02:00
Carl Bergquist
828fb39ee2 Merge pull request #11643 from mrsiano/generic_oauth 
Pass configured/auth headers to a Datasource.
 2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c Pass configured/auth headers to a Datasource. 
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
 2018-06-21 14:58:05 +03:00
Daniel Lee
6871f4c14e Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb 
Conditionally select a field to return in ResponseParser for InfluxDB
 2018-06-21 12:25:15 +02:00
Tobias Skarhed
4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson
051ddb245d Merge pull request #12346 from grafana/12256_export 
Make sure to process panels in collapsed rows when exporting dashboard
 2018-06-20 13:17:32 +02:00
Marcus Efraimsson
296a841685 Merge pull request #12123 from alexanderzobnin/fix-11792 
graph: fix legend decimals precision calculation
 2018-06-20 13:08:17 +02:00
Marcus Efraimsson
4ef4a4d3a7 dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Marcus Efraimsson
41ac8d4cd5 fix regressions after save modal changes of not storing time and variables per default 
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
 2018-06-20 09:52:29 +02:00
Tobias Skarhed
3a9a36d6cf Karma to Jest: history_srv (#12341) 
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
 2018-06-19 08:05:49 -07:00
Marcus Efraimsson
a2e08dc4e8 make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303) 
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
 2018-06-18 09:47:23 -07:00
Tobias Skarhed
5bf72fc9f4 Karma to Jest: team_details_ctrl (#12321) 2018-06-18 07:54:56 -07:00
Marcus Efraimsson
9271e48513 Merge pull request #12317 from grafana/12278_snapshot_annotations 
Copy correct annotation props when creating a snapshot
 2018-06-18 11:24:04 +02:00
Marcus Efraimsson
a738347957 snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
Marcus Efraimsson
6d48d0a80c set current org when adding/removing user to org 
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
 2018-06-18 09:30:01 +02:00
Marcus Efraimsson
f0254c201a Merge pull request #12215 from ryantxu/use-ng-if-for-time 
use ng-if for the panel timeInfo
 2018-06-15 12:16:48 +02:00
flopp999
2d1f59a9cc Added Litre/min and milliLitre/min in Flow (#12282) 
units: Litre/min and milliLitre/min in Flow
 2018-06-15 10:54:38 +02:00
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Marcus Efraimsson
56628996b7 Merge pull request #12280 from dehrax/12224-elastic-response 
karma to jest: 6 test files
 2018-06-14 17:24:36 +02:00
Marcus Efraimsson
9dd38031e4 Merge pull request #11233 from flopp999/patch-2 
units: W/m2(energy), l/h(flow) and kPa(pressure)
 2018-06-14 15:36:38 +02:00
Tobias Skarhed
dbbd6b9b66 Remove import 2018-06-14 15:27:11 +02:00
Marcus Efraimsson
1626a66bab Merge pull request #12275 from dehrax/12224-exporter 
karma to jest: exporter, playlist_edit_ctrl
 2018-06-14 15:10:06 +02:00
Marcus Efraimsson
25e1d723c6 Merge pull request #12276 from grafana/davkal/expose-react-slate 
Expose react and slate to external plugins
 2018-06-14 14:41:30 +02:00
Tobias Skarhed
23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
David Kaltschmidt
5ec7d60e5f Removed papaparse from external plugin exports 2018-06-14 13:22:16 +01:00
Tobias Skarhed
ef0586acab Karma to Jest: query_builder 2018-06-14 14:20:42 +02:00
Marcus Efraimsson
99c188f626 Merge pull request #12273 from grafana/12247-link-icon 
fix panel link icon positioning
 2018-06-14 13:54:08 +02:00
Tobias Skarhed
283b39c397 Karma to Jest: threshold_mapper 2018-06-14 13:38:03 +02:00
David Kaltschmidt
eb686c06f2 Expose react and slate to external plugins 
Experimental support for react in external plugins

- react
- slate (editor)
- papaparse (csv parsing)
- prismjs (syntax highlighting)

This is needed for new external datasource plugins like Flux
 2018-06-14 12:32:57 +01:00
Tobias Skarhed
155ff06cbe Karma to Jest: threshold_manager 2018-06-14 13:22:17 +02:00
Tobias Skarhed
2465f53324 Karma to Jest: query_def, index_pattern 2018-06-14 12:18:11 +02:00
Tobias Skarhed
a911d36dea Remove import 2018-06-14 12:00:54 +02:00
Tobias Skarhed
04029a94cd Karma to Jest: elastic_response 2018-06-14 11:56:03 +02:00
Marcus Efraimsson
71b0326769 Merge pull request #12237 from dehrax/12224-version-panel 
Convert tests from Karma to Jest
 2018-06-14 10:13:46 +02:00
Patrick O'Carroll
9802d86783 Merge pull request #12189 from ryantxu/focus-panel-search 
autoFocus the add-panel search filter, and add on enter
 2018-06-14 09:54:41 +02:00
Tobias Skarhed
a3552a60e1 Improve test readability 2018-06-14 09:46:36 +02:00
Patrick O'Carroll
a0aa0b55e7 moved link icon in panel header 2018-06-14 09:24:51 +02:00
Tobias Skarhed
4dd9b8f324 Karma to Jest: playlist_edit_ctrl 2018-06-13 16:29:50 +02:00
Tobias Skarhed
94b8cbdc6a Karma to Jest: exporter 2018-06-13 15:15:36 +02:00
Marcus Efraimsson
2288e01752 Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00