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
24,403 Commits 5,454 Branches 554 Tags 1.9 GiB
d7d94d13a0
Commit Graph

252 Commits

Author SHA1 Message Date
Andrej Ocenas
6eb8b29d70 Chore: Add more explicit typing (#16594) 2019-04-15 13:14:52 +02:00
Andrej Ocenas
66f6e16916
Security: Store datasource passwords encrypted in secureJsonData (#16175) 
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
 2019-04-15 11:11:17 +02:00
Ryan McKinley
3c21a121eb Plugins: Unifying alpha state & options for all plugins (#16530) 
* app pages

* app pages

* workign example

* started alpha support

* remove app stuff

* show warning on alpha/beta panels

* put app back on plugin file

* fix go

* add enum for PluginType and PluginIncludeType

* Refactoring and moving settings to plugins section

fixes #16529
 2019-04-12 13:46:42 +02:00
Patrick O'Carroll
128fb8fa7e Theme: Reworking button styling (#16362) 
* added new variables for height in theme, added height to gui button large, replaced add gicon with regular gicon, replaced + with gicon, changed button display to flex

* set fixed height to large button, removed xlarge button and replaced with large button

* removed button-mini and replaced with button-small, set fixed height to default button and button-small

* fixed padding for default and large button, fixed height for navbar button, fixed snapshots

* fixed padding and margin on navbar buttons

* gave special height to login btn-primary

* readded btn-mini class with same styling as btn-small and a deprecated notice

* fixed add panel widget buttons
 2019-04-08 09:48:15 +02:00
Torkel Ödegaard
47e51cb6b3
Refactor: Plugin exports & data source / panel types (#16364) 
* wip: began work off removing meta and pluginExports from DataSourceApi interface

* WIP: changing how plugins are exports and loaded

* Down the refactoring rabit hole that keeps expanding

* TestData now returns DataSourcePlugin

* Refactoring: fixed app config page loading, type renamings and more typings

* Refactor: Correct casing on DatasourceStatus => DataSourceStatus
 2019-04-04 18:30:15 +02:00
Dominik Prokop
9fd824960f
Feature: added actionable message in Explore when no datasource configured (#16252) 2019-03-28 17:17:01 +01:00
Daniel Lee
fda7e686f3
Merge pull request #15205 from seanlaff/12556-oauth-pass-thru 
Add oauth pass-thru option for datasources
 2019-03-25 21:52:20 +01:00
Peter Holmberg
4898502e4e
refactor(grafana/ui): Replace <input />with Input component from grafana/ui (#16085) 
* replace with Input component from grafana/ui

* removing placeholder classname

* change import

* fix import
 2019-03-25 15:53:05 +01:00
Hugo Häggmark
eedbc485dd
Makes it possible to navigate back/forward with browser buttons in Explore (#16150) 
Make it possible to navigate back/forward with browser buttons in Explore
 2019-03-22 15:24:30 +01:00
Sean Lafferty
dba2df19e8 Make all http auth setting labels the same width 2019-03-20 14:19:29 -04:00
Sean Lafferty
8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
Sean Lafferty
f79dc0a89b Remove auth_module settings from oauthPassThru ui 2019-03-13 13:34:10 -04:00
Torkel Ödegaard
d7dc6ad3f4 Fixed type issues introduced by adding angular types 2019-03-12 15:27:02 +01:00
Andrej Ocenas
a59e0f1b55 Map dataSourceTypeSearchQuery state from redux to search input. 2019-03-06 22:30:40 +01:00
Johannes Schill
e7297fef06 fix: Add class for input fields with help icon to avoid icon hiding the text #15771 2019-03-06 14:45:13 +01:00
Hugo Häggmark
09b036dc93 fix: update datasource in componentDidUpdate 
Closes #15751
 2019-03-05 13:08:31 +01:00
Dominik Prokop
cee5f030dc
Fixed url of back button in datasource edit page, when root_url configured (#15759) 
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
 2019-03-05 07:35:45 +01:00
Dominik Prokop
88a46e6dd4 Bump Prettier version (#15532) 
* Fix prettier version to 1.16.4
 2019-02-19 15:41:35 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark
4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Torkel Ödegaard
38a74c6444
Merge pull request #15383 from bergquist/test_provisoned_ds 
enable testing provsioned datasources
 2019-02-12 09:48:36 +01:00
Hugo Häggmark
5388541fd7 Fixes bug #12972 with a new type of input that escapes and unescapes special regexp characters 2019-02-12 08:48:54 +01:00
bergquist
3b9105e1be enable testing provsioned datasources 
closes #12164
 2019-02-12 08:45:21 +01:00
Patrick O'Carroll
c34021344a
Merge branch 'master' into ui-new-red-green-blue 2019-02-11 09:17:19 +01:00
Marcus Efraimsson
75f89ecf1f
Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource 
MySQL SSL CA in datasource connector
 2019-02-11 09:00:18 +01:00
ijin08
0642c52693 created new color variables, changed primary to blue, changed success-btns to primary-btns. 2019-02-05 12:05:02 +01:00
Sean Lafferty
5a59cdf0ef Add oauth pass-thru option for datasources 2019-02-01 19:40:57 -05:00
Peter Holmberg
4b03e7c31f setting margin on label 2019-02-01 15:03:19 +01:00
Hugo Häggmark
6a84a85a80 Added reducerTester, reducer tests and tests 2019-01-31 07:37:36 +01:00
Hugo Häggmark
2f47b225a0 Removed ActionTypes and fixed a noPayloadActionCreatorFactory 2019-01-31 06:38:40 +01:00
Hugo Häggmark
d3815beb1c Refactored Datasources as POC 2019-01-30 20:07:14 +01:00
Johannes Schill
186ed1a333 chore: Fix typings and add Page-component to FolderPermissions #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
e448a140f5 chore: Fix typings and add Page-component to DataSourceDashboards #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
7df00747d3 chore: Fix typings and add Page-component to NewDataSourcePage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
98fa17f0e4 chore: Fix typings and add Page-component to DataSourceSettingsPage #14762 2019-01-28 23:19:19 +01:00
Marcus Efraimsson
7df5e3cebf
extract tls auth settings directive from datasource http settings directive 2019-01-28 19:37:19 +01:00
Dominik Prokop
1d3122632f Move Switch component to grafana-ui 2019-01-24 15:35:50 +01:00
Torkel Ödegaard
205e2acdd8 Added data source type to explore state 2019-01-17 19:17:29 +01:00
Torkel Ödegaard
a6f6ed4191 updated snapshot 2019-01-17 19:04:53 +01:00
Torkel Ödegaard
ecab597e5e renaming DataSource type to DataSourceSettings and moved to grafana ui 2019-01-17 18:51:07 +01:00
Torkel Ödegaard
4fc9d794ca Moved plugin types to @grafana/ui 2019-01-17 17:37:34 +01:00
Torkel Ödegaard
bfadcd2968
Merge branch 'master' into page-layout-component 2019-01-17 14:48:54 +01:00
Johannes Schill
1dfabf498a chore: Replace the deprecated SFC with FC 2019-01-17 09:27:43 +01:00
Johannes Schill
00646b80c6 chore: Reduce code duplication by letting the page component adding the header and taking care of the page title 2019-01-17 09:01:17 +01:00
Peter Holmberg
736db86d6e removing Label and going with FormLabel 2019-01-16 18:02:27 +00:00
Johannes Schill
234713466e test: Update snapshots and mocks 2019-01-16 16:29:07 +01:00
Johannes Schill
feeb3ea56d feat: Generate page titles from navModel 2019-01-16 16:03:15 +01:00
Johannes Schill
25304629bd test: Updated snapshots 2019-01-16 16:03:15 +01:00
Johannes Schill
b2961a4b4a fix: Configuration: Users should also use the Page component 2019-01-16 16:03:15 +01:00
Johannes Schill
8237c22e24 fix: Add CustomScroller on DataSources page 2019-01-16 16:03:15 +01:00
Johannes Schill
9e0e91a90a test: Snapshot update 2019-01-16 16:01:42 +01:00
Torkel Ödegaard
7f4a479451 POC of page layout component 2019-01-16 16:01:42 +01:00
Hugo Häggmark
639dc6c3c3 Moved Label to grafana/ui/components 2019-01-16 12:29:04 +01:00
Peter Holmberg
83fbf52aac fixing imports, minor fix on mapping row 2019-01-15 17:33:42 +00:00
Peter Holmberg
219da09f0e Merge branch 'master' into 14812/formgroup-component 2019-01-15 17:19:13 +00:00
Peter Holmberg
ac62e4a992 FormGroup component and implements 2019-01-14 22:09:06 +00:00
Torkel Ödegaard
6b4dcb38ea Restored http settings directive that was hidden in an unused angular controller page 2019-01-14 21:21:58 +01:00
Simon Podlipsky
c39dc1fb15 Some cleanup 2019-01-05 15:25:07 +01:00
Torkel Ödegaard
0ca0670e00 Changed datasource list page default layout mode 2019-01-04 09:58:24 +01:00
Torkel Ödegaard
98d26354c1 Added a form component to @grafana/ui 2018-12-25 11:42:23 +01:00
Peter Holmberg
bf7ba9a4d1 updating snaps 2018-12-18 14:54:50 +01:00
Peter Holmberg
a44a07593f panel help working 2018-12-18 14:40:54 +01:00
Torkel Ödegaard
b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +01:00
Torkel Ödegaard
0823712c9a refactored panel-option-section into react component 2018-12-14 09:44:48 +01:00
Torkel Ödegaard
9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Peter Holmberg
29bcdef104 Check with lowercase 2018-12-12 08:47:08 +01:00
Peter Holmberg
690e701f6d fix snapshots 2018-12-05 12:50:14 +01:00
Peter Holmberg
72b7497d66 Added isDefault switch on settings 2018-12-05 11:47:02 +01:00
Torkel Ödegaard
9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard
9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Peter Holmberg
7799ad8108 added loading state 2018-11-08 09:34:14 +01:00
Torkel Ödegaard
29e18fddd0 refactored how testing state was handled, using redux for this felt way to require way to much code 2018-11-07 14:28:44 -08:00
Peter Holmberg
682697e2cd clear test box if success 2018-11-07 16:14:55 +01:00
Peter Holmberg
b7d494551c Added testing state in reducer 2018-11-07 15:38:53 +01:00
Peter Holmberg
6dc3e0399d added actions 2018-11-05 16:33:43 +01:00
Peter Holmberg
52232f98b9 Exposing digest from angular component 2018-11-05 13:39:57 +01:00
Peter Holmberg
f95b80b7e1 remove this 2018-11-01 14:01:06 +01:00
Peter Holmberg
f15ed848f9 Merge branch 'master' into data-source-settings-to-react 2018-11-01 13:52:53 +01:00
Peter Holmberg
2837fd515f tests 2018-11-01 13:45:52 +01:00
Peter Holmberg
7fc4b1934b updating state and save 2018-11-01 11:19:40 +01:00
Torkel Ödegaard
7885453bcd listen for changes in angular land and propagate that back to react 2018-10-31 09:19:08 -07:00
Peter Holmberg
2342f60a31 added actions 2018-10-31 14:28:16 +01:00
Peter Holmberg
1656f03acd cleaned up render 2018-10-31 13:29:02 +01:00
Peter Holmberg
5140325a0d renders angular component 2018-10-31 13:23:05 +01:00
Peter Holmberg
a7bd944098 updated view to use angular loader 2018-10-30 16:40:08 +01:00
Peter Holmberg
596a83407e fixed routes and page 2018-10-24 16:17:25 +02:00
Peter Holmberg
c92813f313 Merge branch 'master' into data-source-settings-to-react 2018-10-22 14:49:41 +02:00
Peter Holmberg
84bbfe11ca tests 2018-10-17 16:14:45 +02:00
Peter Holmberg
c2c3e15022 hooked up actions 2018-10-17 15:56:34 +02:00
Peter Holmberg
f25a843a2c created view 2018-10-17 14:36:18 +02:00
Peter Holmberg
b7b0ce0107 remove addpermissions component 2018-10-17 11:07:17 +02:00
Peter Holmberg
dd2fb7961f removed snaps 2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288 Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise 2018-10-17 10:00:18 +02:00
Peter Holmberg
66311a065c removing datasource permissions states from grafana 2018-10-16 15:36:33 +02:00
Peter Holmberg
ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277 Merge branch 'master' into permissions-code-to-enterprise 2018-10-16 11:09:58 +02:00
Peter Holmberg
8ef705f2b5 pausing for now 2018-10-16 09:59:03 +02:00
Peter Holmberg
7c3d101253 rendering settings 2018-10-15 16:45:39 +02:00