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
46,624 Commits 5,416 Branches 554 Tags
0122f7ccadaccde41d41668a97d873dba3ca0591
Commit Graph

207 Commits

Author SHA1 Message Date
Gareth Dawson
c25ea17d10 SQL: Fix config page backwards compatibility (#76951) 
fix
 2023-10-25 11:38:16 +01:00
Gareth Dawson
f6a0f6912f SQL: Update configuration pages (#75525) 
* update psql config page to follow guidelines

* make small changes to mysql config page

* update shared tls config to match guidelines

* revert back to text area

* remove type assertion

* prettier

* remove unused imports

* update required fields

* add secure sox proxy to additional settings

* make additional settings collapsible

* make user permissions collapsable

* make db name and password optional

* mysql: move from alert to collapse
 2023-10-23 11:29:28 +01:00
Gábor Farkas
dc8b07d46f postgres/mysql: improved imports in unit tests (#75980) 
* postgres/mysql: improved imports in unit tests

* simpler mock approach
 2023-10-11 10:38:38 +02:00
Gábor Farkas
eea95c2ddf postgres/mysql: removed from-grafana-core import (#75826) 2023-10-05 07:46:24 +02:00
Gábor Farkas
cbfd1d53ee mysql: config: fixed import and removed unused code (#75883) 
* mysql: removed obsolete import

* removed unnecessary check
 2023-10-05 07:46:05 +02:00
Gábor Farkas
523d1b46d4 sql: numeric inputs: use it's own simple implementation (#74904) 
* sql: numeric inputs: use it's own simple implementation

* simpler approach

* Update connection limit styles (#75226)

* lint fixes

* replace ConfigSection with ConfigSubSection

---------

Co-authored-by: Gareth Dawson <email@garethdawson.xyz>
Co-authored-by: Gareth Dawson <gwdawson.work@gmail.com>
 2023-10-03 13:54:51 +02:00
Gábor Farkas
8dafc28988 sql: remove grafana-core import (#75558) 
* sql: remove initialCustomVariableModelState

* added fix for mysql too

* linter fixes
 2023-09-29 13:43:28 +02:00
Gareth Dawson
a2e1a7e2f7 MySQL: Update configuration page styling (#74902) 
* config page update

* move SecureSocksProxySettings out of tls/ssl
 2023-09-18 15:02:55 +01:00
Gábor Farkas
1f6f866a36 sql: do not use the getTimeSrv call (#74800) 
* sql: eliminate the getTimeSrv call

* adjusted tests
 2023-09-18 10:39:05 +02:00
faust
e1d239a86e Docs: make it clear that MariaDB is also supported as datasource (#71832) 
* Make it clear that MariaDB is also supported as datasource

MariaDB is now the default relational DB on lots of Linux distribution,
it's important to make it clear that it is perfectly supported.

* Fix 404 and make MySQL docs URL more robust

And lint with prettier.

* Review from lwandz13
 2023-08-08 07:31:20 -06:00
Ashley Harrison
9852b24d61 Chore: Upgrade prettier to v3 (#71764) 
* Update dependency prettier to v3 (#71586)

* Update dependency prettier to v3

* run prettier

* ignore prettier update in legacy select scss

* update command line arg

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>

* unplug prettier

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 15:58:22 +01:00
Ashley Harrison
5ca382c88a Revert "Update dependency prettier to v3 (#71586)" (#71755) 
This reverts commit 2e8cd1c021.
 2023-07-17 14:46:15 +01:00
renovate[bot]
2e8cd1c021 Update dependency prettier to v3 (#71586) 
* Update dependency prettier to v3

* run prettier

* ignore prettier update in legacy select scss

* update command line arg

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2023-07-17 09:19:27 +01:00
Jev Forsberg
c0a1fc2cbd SQL Datasources: Reinstate SQL data source behavior around database selection when default configured databases already exist (#65659) 
* badlm0mma/sql_datasource_update/ initial notes

* baldm0mma/sql_datasource_update/ solution

* baldm0mma/sql_datasource_update/ clean datasetSelector

* baldm0mma/sql_datasource_update/ clean up queryEditor.tsx

* baldm0mma/sql_datasource_update/ clewan up queryHeader.tsx

* baldm0mma/sql_datasource_update/ clean up tableSelector.tsx

* baldm0mma/sql_datasource_update/ clean up mysqlDatasource.ts

* baldm0mma/sql_datasource_update/ clean up configurationEditor.tsx

* baldm0mma/sql_datasource_update/ rem conlog from queryEditor.tsx

* baldm0mma/sql_datasource_update/ rem conlog from queryEditor.tsx

* baldm0mma/sql_datasource_update/ remove conlog in tableSelector.tsx

* baldm0mma/sql_datasource_update/ rem conlog in sqlDatasource.ts

* baldm0mma/sql_datasource_update/ update deafult database value in sqlDatasource.ts

* baldm0mma/sql_datasource_update/ update logic to accomidate no preconfig

* baldm0mma/sql_datasource_update/ update props

* baldm0mma/sql_datasource_update/ update prop names

* baldm0mma/sql_datasource_update/ update prop names in tableSelector

* baldm0mma/sql_datasource_update/ update annos in datasetSelector

* baldm0mma/sql_datasource_update/ update naming

* baldm0mma/sql_datasource_update/ update to standard langauae

* baldm0mma/sql_datasource_update/ update prop names

* baldm0mma/sql_datasource_update/ update annos in datasetSelector

* baldm0mma/sql_datasource_update/ remove unused import in tableSelector.tsx

* baldm0mma/sql_datasource_update/ remove addDefaultdataset

* baldm0mma/sql_datasource_update/ reset query when needed

* baldm0mma/sql_datasource_update/ update asymc return val

* baldm0mma/sql_datasource_update/ remove psql query editor

* baldm0mma/sql_datasource_update/ remove con logs in defaults.ts

* baldm0mma/sql_datasource_update/ revert postgres changes

* baldm0mma/sql_datasource_update/ update postgres naming

* baldm0mma/sql_datasource_update/ add altert

* baldm0mma/sql_datasource_update/ update annos and add alerts and alert logic

* baldm0mma/sql_datasource_update/ update postgres nomenclature

* baldm0mma/sql_datasource_update/ update annos and remove con logs

* baldm0mma/sql_datasource_update/ update nomenclature

* baldm0mma/sql_datasource_update/ drone fix

* baldm0mma/sql_datasource_update/ export and format

* baldm0mma/sql_datasource_update/ update docs for mysql datasource with dataset dropdown disable info

* baldm0mma/sql_datasource_update/ update mssql docs

* baldm0mma/sql_datasource_update/ update postgres docs and alert logic

* baldm0mma/sql_datasource_update/ add tests

* baldm0mma/sql_datasource_update/ update docs

* baldm0mma/sql_datasource_update/ update test names

* baldm0mma/sql_datasource_update/ update alert language

* baldm0mma/sql_datasource_update/ correct spelling

* baldm0mma/sql_datasource_update/ update postgres query builder image

* baldm0mma/sql_datasource_update/ update annos

* baldm0mma/sql_datasource_update/ update tests

* baldm0mma/sql_datasource_update/ docs updated

* baldm0mma/sql_datsource_update/ refactor determinePlaceholder

* Update public/app/features/plugins/sql/components/QueryEditor.tsx

spelling

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update public/app/features/plugins/sql/components/QueryEditor.tsx

spelling

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* baldm0mma/sql_datasource_update/ remove superfluous cleanup data from tests

* baldm0mma/sql_datasource_update/ update spelling

* Update public/app/features/plugins/sql/components/SqlComponents.test.tsx

spelling

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* baldm0mma/sql_datasource_update/ add logic to prevent db call for tables if dataset it nullish

* baldm0mma/sql_datasource_update/ update alert tests

* baldm0mma/sql_datasource_update/ update button text

* baldm0mma/sql_datasource_update/ update tests to preferred standard

* baldm0mma/sql_datasource_update/add feature flag

* baldm0mma/sql_datasource_update/ update mssql docs

* baldm0mma/sql_datasource_update/ add feature flag to registry

* baldm0mma/sql_datasource_update/ adjust table and dataset dropdown logic

* baldm0mma/sql_datasource_update/ update testing to deal with feature flag

* baldm0mma/sql_datasource_update/ update wioth cascadeDisable

* baldm0mma/sql_datasource_update/ update naming

* baldm0mma/sql_datasource_update/ update tests to reflect enabled feature flag

* baldm0mma/sql_datasource_update/ update annotations

* baldm0mma/sql_datasource_update/ update annos in queryEd

* baldm0mma/sql_datasource_update/ update test names

* baldm0mma/sql_datasource_update/ update anno issues

* baldm0mma/slq_datasource_update/ add query to sqlDatasource with error

* baldm0mma/sql_datasource_update/ update docs language

* baldm0mma/sql_datasource_update/ remove notes to self

* baldm0mma/sql_datasource_update/ add QueryEditorFeatureFlag.utils.ts

* baldm0mma/sql_datasource_update/ update database into json

* baldm0mma/sql_datasource_update/ found file

* Update docs/sources/datasources/mssql/query-editor/index.md

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>

* baldm0mma/sql_datasource_update/ update feature flag and toggles

* baldm0mma/sql_datasource_update/ add hasConfigIssue, update annos, rethink disable logic

* baldm0mma/sql_datasource_update/ update warning language

* baldm0mma/sql_datasource_update/ update button content

* baldm0mma/sql_datasource_update/ update jsonData logic in frontendsettings.go

* baldm0mma/sql_datasource_update/ update jsonData logic

* baldm0mma/sql_datasource_update/ update annos in frontendsettings.go

* baldm0mma/sql_datasource_update/ update sql editor docs

* baldm0mma/sql_datasource_update/ update mysql docs

* baldm0mma/sql_datasource_update/ update postgres docs

* baldm0mma/sql_datasource_update/ remove unused code in datasetSelector.tsx

* baldm0mma/sql_datasource_update/ update syntax conventions

* baldm0mma/sql_datasource_update/ add logs

* baldm0mma/sql_datasource_update/ remove unused code

* baldm0mma/sql_datasource_update/ remove conlogs

* baldm0mma/sql_datasource_update/ update tests

* baldm0mma/sql_datasource_update/ add second error to query

* baldm0mma/sql_datasource_update/ run make gen-cue

* baldm0mma/sql_database_update/ lint registry

* baldm0mma/sql_datasource_update/ update registry

* baldm0mma/sql_datasource_update/ upate datasource logic

* baldm0mma/sql_datasource_update/ add logs

* baldm0mma/sql_datasource_update/ add comms to self

* baldm0mma/sql_datasource_update/ comment out false pos tests, and add investigatory comments

* baldm0mma/sql_database_update/ update query error to only test for config change if query was made in "builder" mode

* baldm0mma/sql_datasource_update/ update annos in frontendsettings.go

* baldm0mma/sql_datasource_update/ update error logic to datasource

* baldm0mma/sql_datasource_update/ remove alerts from query editor

* baldm0mma/sql_datasource_update/ remove unused imports

* baldm0mma/sql_datasource_update/ update tests

* baldm0mma/sql_datasource_update/ remove comments

* baldm0mma/sql_datasource_update/ remove logs in queryGroup.tsx

* baldm0mma/sql_datasource_update/ remove outdated annotation in datasetSelector.tsx

* baldm0mma/sql_datasource_update/ remove superfluous test and update test description

* baldm0mma/sql_datasource_update/ remove feature flag

* baldm0mma/sql_datasource_update/ add back feature flag

* baldm0mma/sql_datasource_update/ update to enums

* baldm0mma/sql_datasource_update/ update panel caps

* baldm0mma/sql_datasource_update/ update dataset selector to default update the database correctly

* baldm0mma/sql_datasource_update/ move onChange into conditional

* baldm0mma/sql_datasource_update/ add logic for previous datasets choice

* baldm0mma/sql_datasource_update/ add back previous logic for assigning default datasets

* baldm0mma/sql_datasource_update/ update useEffect dep array

* baldm0mma/sql_datasource_update/ remove feature toggle

* baldm0mma/sql_datasource_update/ add feature toggle

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
 2023-06-06 10:28:52 -06:00
enginecan
6758fd4888 MySQL: Add option to allow cleartext passwords (#63232) 
* Add "Allow Cleartext Passwords" checkbox to MySQL connection settings

* Fix lint issues

* Add docs

* Add line break and bold text

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2023-05-26 12:33:55 +02:00
Ryan McKinley
86302bc1ec DataFrame: Deprecate MutableDataFrame (#67569) 2023-05-01 19:41:40 -07:00
Zoltán Bedi
a5e3157540 Docs: Fix help docs for SQL datasources (#66749) 
Fix example queries for SQL datasources
 2023-04-25 14:05:49 +02:00
Stephanie Hingtgen
255d8f3326 Plugins: Remove secure socks proxy feature toggle (#66611) 2023-04-18 11:11:23 -06:00
Kyle Cunningham
92d92187d9 SQL Datasources: Update Max Connection and Max Idle Connection Defaults to 100 and add auto mode (#65834) 
* Update connection configuration for SQL datasources

* Working auto state for connection numbers

* Add migration

* Use defaults from constants file

* Remove dead code

* Add tests and restructure useMigrateDatabaseField

* Update function names

* Update docs

* Make sure we don't continually issue updates

* Update docs

* Use onOptionsChnage in ConnectionLimits

* Update docs

* Clean up docs

* Update migration

* Fix default values in docs

* Fix spacing issue

* Fix test

* Update default values for SQL connections

* Include consts

* Allow override for default SQL datasource connection parameters

* Fix linter errors

* Remove extra @ts-ignore

* Centralize logic for default values

* Remove debugging

* Remove unecessary function

* Update configuration docs

* minor suggested change

* Fix comment misspelling

* Remove unecessary default setting code

* Update docs to indicate that code was included for backport version

* Remove dead code

---------

Co-authored-by: lwandz13 <larissa.wandzura@grafana.com>
 2023-04-17 11:44:05 +03:00
Victor Marin
02a8bc76d2 SQL Datasources: Fix variable throwing error if query returns no data (#65937) 
* Fix SQL query variable throwing error if query returns no data

* Tests to verify that metricFindQuery returns properly and doesn't throw error

* Fix all codepaths that might throw errors because of undefined backendSrv response
 2023-04-11 15:54:55 +03:00
Zoltán Bedi
a0e0af2dc6 SQL Datasources: Add back help content (#65383) 2023-03-30 10:19:30 +02:00
Stephanie Hingtgen
10db808ea1 Plugins: Add sql support for the secure socks proxy (#64630) 2023-03-16 06:54:19 -06:00
Kyle Cunningham
09f71a6901 MySql Datasource: Improve Tooltips and Documentation (#64122) 
* Add tooltips to Skip TLS and TLS Auth

* Update docs with provisioning examples
 2023-03-09 19:50:07 +07:00
Zoltán Bedi
62c30dea4d MySQL: Quote identifiers that include special characters (#61135) 
* SQL: toRawSQL required and escape table

* Fix autocomplete for MySQL

* Change the way we escape for builder

* Rework escape ident to be smart instead

* Fix A11y for alias

* Add first e2e test

* Add test for code editor

* Add doc

* Review comments

* Move functions to sqlUtil
 2023-01-31 18:16:28 +01:00
Zoltán Bedi
d65899de7b SQL Datasources: Move database setting to jsonData (#58649) 
* Datasource settings: Add deprecation notice for database field

* SQL Datasources: Migrate from settings.database to settings.jsonData.database

* Check jsonData first

* Remove comment from docs
 2022-12-13 09:56:52 +01:00
Josh Hunt
45d1cfa172 Datasources Fix formatting for SQL data sources permissions disclaimer (#60155) 
Chore: Fix formatting for sql datasources permissions disclaimer
 2022-12-12 14:56:30 +00:00
Zoltán Bedi
75097b99fb SQL: Fix code editor for SQL datasources (#58116) 
* SQL: Fix code editor for sql datasources

* Fix: mysql completion with defaultdb
 2022-11-23 10:36:07 +01:00
Oscar Kilhed
b1bfae0350 MySQL: make it possible to add CA cert without using tlsAuth (#58226) 2022-11-07 09:38:42 +01:00
Zoltán Bedi
26659baf8f PostgreSQL: Migrate to React (#52831) 
- Migrate Postgres query editor to react
- Add support for field aliasing in SELECT clauses to SQL based datasources

Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com>
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
 2022-11-02 11:30:35 +07:00
Victor Marin
902a230867 MSSQL/MySQL: Fix variable interpolation (#56879) 
* MSSQL/MySQL: Fix variable interpolation

* Escape string vars
 2022-10-14 11:52:08 +03:00
Scott Lepper
fe7add0bc6 ref experimental query editor (#53061) 
* ref experimental query editor
 2022-08-02 11:44:06 -04:00
Michael Mandrus
e5d89ddb95 fix typo in SQL editor placeholders #52846 2022-07-26 19:23:47 -04:00
Simon Podlipsky
7eabd7c83a Chore: typos in MySQL/PostgreSQL ConfigurationEditor (#52735) 2022-07-25 23:58:52 +00:00
Scott Lepper
de956fc3d8 Core code editor/builder components (#52421) 
* migrate experimental to core grafana - update refs

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2022-07-20 12:50:08 -04:00
Scott Lepper
53933972b6 mysql query editor - angular to react (#50343) 
mysql conversion to react

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-07-15 16:49:24 -04:00
Zoltán Bedi
35d98104ad MSSQL: Migrate to React (#51765) 
* Fix: sql plugins feature

* SQLDS: Use builtin annotation editor

Plus strict rule fixes

* MSSQL: Migrate query editor to React

* Make code editor work

* Make SQLOptions and SQLQuery in SQLDatasource and in Editor generic

* MSSQL: Fix ts issues

* Fix SQLDatasource refID

* Remove comment

* Revert "Make SQLOptions and SQLQuery in SQLDatasource and in Editor generic"

This reverts commit 1d15b4061a.

* Fix ts issues without generic

* TS
 2022-07-15 19:51:28 +02:00
Oscar Kilhed
9498ee3d54 SQL: Migrate (MS/My/Postgres)SQL configuration pages from Angular to React (#51891) 
* Migrate SQL configuration pages from angular to react

* Move enums to types.ts and remove angular partials

* remove es lint disables and update betterer instead

* Fix automatically added type declarations

* Bump wor.. betterer ;)

* Export SecretInput component from grafana-ui

* Fix A11y issues

* Export SecretTextArea as well

* Fix typo

* Use const instead of var

* Fix typo in doc

* Add autoDetectFeatures to postgres config editor

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-07-14 13:29:08 +02:00
Nathaniel Saxe
683f31f2c6 Variables: improve performance of transformMetricFindResponse (#49360) 
* improve performance of transformMetricFindResponse

* use lodash uniqBy for postgres

* use lodash uniqBy for mysql

* use lodash uniqBy for mssql

* hopefully conform to import linting rules

* Added .betterer.results

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Victor Marin <victor.marin@grafana.com>
 2022-06-27 14:26:46 +03:00
Josh Hunt
3c6e0e8ef8 Chore: ESlint import order (#44959) 
* Add and configure eslint-plugin-import

* Fix the lint:ts npm command

* Autofix + prettier all the files

* Manually fix remaining files

* Move jquery code in jest-setup to external file to safely reorder imports

* Resolve issue caused by circular dependencies within Prometheus

* Update .betterer.results

* Fix missing // @ts-ignore

* ignore iconBundle.ts

* Fix missing // @ts-ignore
 2022-04-22 14:33:13 +01:00
Marcus Andersson
9a12b3ea00 TemplateSrv: exposing a function to detect if a target contains a template (#45214) 
* exposing a function to check if a target contains variables.

* fixed tests.

* renamed function

* updated betterer result.
 2022-02-15 08:53:42 +01:00
Marcus Efraimsson
0e8a5407d1 Postgres/MySQL/MSSQL: Remove usage of legacy timeSrv (#45241) 2022-02-11 13:36:11 +01:00
renovate[bot]
d87cd6f26c Update dependency prettier to v2.5.1 (#43473) 
* Update dependency prettier to v2.5.1

* prettier fixes

* chore(toolkit): bump prettier to 2.5.1

* style(eslint): bump grafana config to 2.5.2 in core and toolkit

* style(mssql-datasource): fix no-inferrable-types eslint errors

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-02-02 12:02:32 +00:00
Kyle Cunningham
6958de846c Accessibility Fixes for Several SQL Based Query Editors (#43981) 
* Fix postgres QE a11y label issue

* Add aria-label to query-editor

* Remove unecessary element ID.

* Use aria-labeledby instead of aria-label

* Prefer aria-labelby with dynamic ids

* Prefer "for" over aria-labeledby

* Prefer "for" over aria-labeledby for MSSQL QE
 2022-01-19 15:56:33 -06:00
Kyle Cunningham
febc24522d Accessibility Fixes for Several SQL Based Datasource Config Pages (#43982) 
* Add label elements for select boxes: MSSQL config

* Add Permission level label

* Add aria-label for password field

* Fixes for Postgres a11y page

* Fix whitespace error

* Swap aria-labelby for "for"

* Prefer "for" over aria-labeledby
 2022-01-19 15:53:54 -06:00
Marcus Efraimsson
7d3bdb6d1b Plugins: Set backend metadata property for core plugins (#43349) 
Ref #42648
Ref #42781
 2021-12-22 17:59:26 +01:00
Ryan McKinley
6c1a0cc707 DataSourceRef: use reference rather than id where possible (#41372) 2021-11-09 07:24:41 -08:00
Torkel Ödegaard
d07fa0ce5e AngularJS: Move angular stuff into app/angular (#41415) 
* Moving more angular parts

* Moving more angular stuff

* Moving components

* Move more things
 2021-11-08 18:41:04 +01:00
Ryan McKinley
7319efe077 Dashboard: replace datasource name with a reference object (#33817) 
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Elfo404 <me@giordanoricci.com>
 2021-10-29 10:57:24 -07:00
Torkel Ödegaard
bc01c9cdbc Prettier: Fix all markdown files and add markdown files to CI verify step (#39776) 2021-09-29 14:34:40 +02:00
Ivana Huckova
7f8576ee37 Postgres: For template queries return [] and not error (#38060) 
* Postgres: For template queries return [] and not error

* remove the console error

* update mssql and mysql

Co-authored-by: Ying WANG <ying.wang@grafana.com>
 2021-08-19 13:43:41 +02:00