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
54,191 Commits 5,416 Branches 554 Tags
2113c13e6e22bd7344f70f1703395dc6d6c3e981
Commit Graph

82 Commits

Author SHA1 Message Date
Andrew Hackmann
eac194815e MSSQL: decouple plugin (#89597) 
* decouple from core

* yarn decouple

* make health check work and azure config

* f

* driver error not needed

* merge
 2024-08-26 23:09:21 +03:00
Andrew Hackmann
319a874033 MSSQL: Password auth for Azure AD (#89746) 
* Password auth for Azure AD

* rename auth fields

* add azure flag for client password cred enabled

* prettier

* rename flag

* Update go.mod

* Update public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>

* Apply suggestions from code review

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>

* update package

* go mod

* prettier

* remove password

* gowork

* remove unused env test

* linter

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2024-07-16 14:08:51 -05:00
Andreas Christou
ae84d16a6f MSSQL: Simplify proxy logic (#86278) 
* Simplify proxy dialer creation

- Set new dialer on connector
- Create MSSQL connector in a similar fashion to postgres

* Update test

* Fix lint

* More lint

* Use correct driver name
 2024-04-19 22:03:26 +01:00
Andreas Christou
420067a7e1 MSSQL: Add SQL_VARIANT converter and update test (#85823) 
Add SQL_VARIANT converter and update test
 2024-04-17 16:49:51 -05:00
Gábor Farkas
9015bfa3f4 mssql: decouple sqleng (#86130) 
* mssql: decouple sqleng

* fix codeowners-file
 2024-04-16 08:00:14 +00:00
Adam Simpson
311aa94fab MSSQL: Add Windows AD/Kerberos auth (#84742) 
* mssql: Add Kerberos/Windows AD auth

* need username for cache file

* account for no port in cc file

* add tests around constring

* remove un-needed port

* add docs

* remove comments

* move defer to same locale as where it begins

* fix linting and spelling

* fix gosec linter

* note lack of grafana cloud support
 2024-03-20 16:41:57 +02:00
Andreas Christou
7c3f621688 Chore: Update grafana-azure-sdk-go (#84741) 
* Update grafana-azure-sdk-go

* Update test
 2024-03-19 14:56:40 +00:00
Gábor Farkas
1bab82ab36 mssql: socks proxy: use plugin-sdk (#82407) 2024-02-15 12:01:18 +01:00
Gábor Farkas
67f006a91d sql: remove setting-import from sqleng (#82088) 2024-02-12 12:37:23 +01:00
Gábor Farkas
7b8c7b623c sql: remove the usage of "errutil" (#81888) 2024-02-07 08:39:24 +01:00
Bruno
2332bfb007 Set DatasourceName and DatasourceType in proxy.Options (#80923) 
* Set DatasourceName and DatasourceType in proxy.Options

* upgrade github.com/grafana/grafana-plugin-sdk-go to v0.206.0 and fix merge conflicts
 2024-02-01 11:09:58 -03:00
Gábor Farkas
bfb85f27b1 sql: improve sqleng-api, leave sql.DB creation to the plugins (#79672) 2024-01-05 08:37:15 +01:00
Gábor Farkas
53863c52ca sql: use logging functionality from plugin-sdk (#79294) 2023-12-14 09:42:06 +01:00
Gábor Farkas
5b4da3a7dc mssql: prepare logs-handling for decouple-datasource changes (#79214) 
mssql: refactor logs-handling
 2023-12-11 09:14:06 +01:00
Will Browne
9d92818cae Plugins: Update PDC pattern from latest plugin SDK changes (#76576) 
* update with sdk

* do sql

* fix core plugins

* fix proxy settings

* bump SDK version

* tidy

* enable pdc for test

* add codeowners

* bump dep

* go mod tidy

* bump SDK
 2023-10-16 16:40:04 +02:00
Dan Cech
91cf4f0c1c Revert "Plugins: Update PDC pattern from latest plugin SDK changes" (#76565) 
Revert "Plugins: Update PDC pattern from latest plugin SDK changes (#76036)"

This reverts commit 151f6d6216.
 2023-10-13 12:35:16 -04:00
Will Browne
151f6d6216 Plugins: Update PDC pattern from latest plugin SDK changes (#76036) 
* update with sdk

* do sql

* fix core plugins

* fix proxy settings

* bump SDK version

* tidy

* enable pdc for test

* add codeowners
 2023-10-13 14:42:15 +02:00
Will Browne
7fca1bde54 Plugins: Set grafana config, plugin version and user agent on plugin requests (#75171) 
* first pass

* fixup

* remove test line

* fix tests

* use new fields

* fix imports + formatting

* fix tests

* rollback changes

* undo whitespace

* apply pr feedback
 2023-09-21 11:33:31 +02:00
Oscar Kilhed
579709c7a6 MSSQL: Add support for MI authentication to MSSQL (#73597) 
* Add support for MI authentication to MSSQL

This adds support for managed identity authentication for MSSQL managed
instances running in Azure.

Co-authored-by: baldm0mma <jev.forsberg@grafana.com>
 2023-09-06 18:27:19 +02:00
Ryan McKinley
025b2f3011 Chore: use any rather than interface{} (#74066) 2023-08-30 18:46:47 +03:00
Stephanie Hingtgen
4ece133fce Secure socks proxy: use Grafana Plugin SDK (#71616) 2023-07-18 15:23:02 -06:00
Michael Mandrus
66d2214c3b Config: Add configuration option to define custom user-facing general error message for certain error types (#70023) 
---------

Co-authored-by: Summer Wollin <summer.wollin@grafana.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com>
 2023-06-16 10:46:47 -05:00
Will Browne
286b9e08e9 Plugins: Bump Plugin SDK version and address instance management breaking changes (#68900) 
* bump sdk and propagate ctx

* fix tests
 2023-05-24 10:19:34 +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
Stephanie Hingtgen
211beae736 MSSQL: Update forked go-mssqldb dependency (#65658) 2023-03-31 10:07:37 -06:00
Stephanie Hingtgen
10db808ea1 Plugins: Add sql support for the secure socks proxy (#64630) 2023-03-16 06:54:19 -06:00
Zoltán Bedi
c25fe34ac0 SQL Datasources: Use health check for config test (#59867) 
* SQL Datasources: Use health check for config test

* Remove unnecessary test

* Fix test errors

* Revert mysql go driver update

* Use transform query error

* Use TransformQueryError from sql_engine
 2022-12-19 17:17:52 +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
Victor Marin
6e776d0fec MSSQL: Add connection timeout setting in configuration page (#58631) 
* MSSQL add connection timeout

* add docs

* Update docs and add min value to the timeout setting
 2022-11-11 14:04:08 -05:00
Yuriy Tseretyan
d9c40ca41e Chore: Update sqleng, elasticsearch, tempo and opentsdb plugins to support contextual logs. (#57777) 
* make sql engine use pick log context for logs
* update tempo to get log context
* update opentsdb to use log context
* update es client to use log context
 2022-11-02 10:03:50 -04:00
Dirkco du Plessis
b52794601d mssql: explicit disable encryption when its disabled (#46546) 2022-03-30 15:14:04 +01:00
Morten Nygaard Åsnes
9e4aafa719 MSSQL: Configuration of certificate verification for TLS connection (#31865) 
Fixes #24589

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-01-26 15:00:18 +01:00
Will Browne
7fbc7d019a Plugins: Core plugins register via backend factory provider (#43171) 
* refactoring store interface and init flow

* fix import

* fix linter

* refactor resource calling

* load with class

* re-order args

* fix tests

* fix linter

* remove old creator

* add custom config struct

* fix some tests

* cleanup

* fix

* tackle plugins

* fix linter

* refactor and fix test

* add connect failure error

* add fix for azure, cloud monitoring and test data

* restructure

* remove unused err

* add fake tracer for test

* fix grafana ds plugin
 2022-01-20 18:16:22 +01:00
Will Browne
e4ba5f17dd add core plugins thru store (#43085) 2021-12-14 15:22:40 +01:00
Ivan Anselmi
cf3105e5be MSSQL: Change regex to validate Provider connection string (#40248) 
* Change the regex to allow to specified other connection attribute for MSSQL connection like ApplicationIntent property

* Docs update

* docs update

* some tests added

* formatting

* Change the regex to allow to specified other connection attribute for MSSQL connection like ApplicationIntent property

* Docs update

* docs update

* some tests added

* formatting

* docs and formatting

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2021-11-30 09:28:48 +01:00
Will Browne
b80fbe03f0 Plugins: Refactor Plugin Management (#40477) 
* add core plugin flow

* add instrumentation

* move func

* remove cruft

* support external backend plugins

* refactor + clean up

* remove comments

* refactor loader

* simplify core plugin path arg

* cleanup loggers

* move signature validator to plugins package

* fix sig packaging

* cleanup plugin model

* remove unnecessary plugin field

* add start+stop for pm

* fix failures

* add decommissioned state

* export fields just to get things flowing

* fix comments

* set static routes

* make image loading idempotent

* merge with backend plugin manager

* re-use funcs

* reorder imports + remove unnecessary interface

* add some TODOs + remove unused func

* remove unused instrumentation func

* simplify client usage

* remove import alias

* re-use backendplugin.Plugin interface

* re order funcs

* improve var name

* fix log statements

* refactor data model

* add logic for dupe check during loading

* cleanup state setting

* refactor loader

* cleanup manager interface

* add rendering flow

* refactor loading + init

* add renderer support

* fix renderer plugin

* reformat imports

* track errors

* fix plugin signature inheritance

* name param in interface

* update func comment

* fix func arg name

* introduce class concept

* remove func

* fix external plugin check

* apply changes from pm-experiment

* fix core plugins

* fix imports

* rename interface

* comment API interface

* add support for testdata plugin

* enable alerting + use correct core plugin contracts

* slim manager API

* fix param name

* fix filter

* support static routes

* fix rendering

* tidy rendering

* get tests compiling

* fix install+uninstall

* start finder test

* add finder test coverage

* start loader tests

* add test for core plugins

* load core + bundled test

* add test for nested plugin loading

* add test files

* clean interface + fix registering some core plugins

* refactoring

* reformat and create sub packages

* simplify core plugin init

* fix ctx cancel scenario

* migrate initializer

* remove Init() funcs

* add test starter

* new logger

* flesh out initializer tests

* refactoring

* remove unused svc

* refactor rendering flow

* fixup loader tests

* add enabled helper func

* fix logger name

* fix data fetchers

* fix case where plugin dir doesn't exist

* improve coverage + move dupe checking to loader

* remove noisy debug logs

* register core plugins automagically

* add support for renderer in catalog

* make private func + fix req validation

* use interface

* re-add check for renderer in catalog

* tidy up from moving to auto reg core plugins

* core plugin registrar

* guards

* copy over core plugins for test infra

* all tests green

* renames

* propagate new interfaces

* kill old manager

* get compiling

* tidy up

* update naming

* refactor manager test + cleanup

* add more cases to finder test

* migrate validator to field

* more coverage

* refactor dupe checking

* add test for plugin class

* add coverage for initializer

* split out rendering

* move

* fixup tests

* fix uss test

* fix frontend settings

* fix grafanads test

* add check when checking sig errors

* fix enabled map

* fixup

* allow manual setup of CM

* rename to cloud-monitoring

* remove TODO

* add installer interface for testing

* loader interface returns

* tests passing

* refactor + add more coverage

* support 'stackdriver'

* fix frontend settings loading

* improve naming based on package name

* small tidy

* refactor test

* fix renderer start

* make cloud-monitoring plugin ID clearer

* add plugin update test

* add integration tests

* don't break all if sig can't be calculated

* add root URL check test

* add more signature verification tests

* update DTO name

* update enabled plugins comment

* update comments

* fix linter

* revert fe naming change

* fix errors endpoint

* reset error code field name

* re-order test to help verify

* assert -> require

* pm check

* add missing entry + re-order

* re-check

* dump icon log

* verify manager contents first

* reformat

* apply PR feedback

* apply style changes

* fix one vs all loading err

* improve log output

* only start when no signature error

* move log

* rework plugin update check

* fix test

* fix multi loading from cfg.PluginSettings

* improve log output #2

* add error abstraction to capture errors without registering a plugin

* add debug log

* add unsigned warning

* e2e test attempt

* fix logger

* set home path

* prevent panic

* alternate

* ugh.. fix home path

* return renderer even if not started

* make renderer plugin managed

* add fallback renderer icon, update renderer badge + prevent changes when renderer is installed

* fix icon loading

* rollback renderer changes

* use correct field

* remove unneccessary block

* remove newline

* remove unused func

* fix bundled plugins base + module fields

* remove unused field since refactor

* add authorizer abstraction

* loader only returns plugins expected to run

* fix multi log output
 2021-11-01 10:53:33 +01:00
Joan López de la Franca Beltran
722c414fef Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865) 
* Encryption: Add support to encrypt/decrypt sjd

* Add datasources.Service as a proxy to datasources db operations

* Encrypt ds.SecureJsonData before calling SQLStore

* Move ds cache code into ds service

* Fix tlsmanager tests

* Fix pluginproxy tests

* Remove some securejsondata.GetEncryptedJsonData usages

* Add pluginsettings.Service as a proxy for plugin settings db operations

* Add AlertNotificationService as a proxy for alert notification db operations

* Remove some securejsondata.GetEncryptedJsonData usages

* Remove more securejsondata.GetEncryptedJsonData usages

* Fix lint errors

* Minor fixes

* Remove encryption global functions usages from ngalert

* Fix lint errors

* Minor fixes

* Minor fixes

* Remove securejsondata.DecryptedValue usage

* Refactor the refactor

* Remove securejsondata.DecryptedValue usage

* Move securejsondata to migrations package

* Move securejsondata to migrations package

* Minor fix

* Fix integration test

* Fix integration tests

* Undo undesired changes

* Fix tests

* Add context.Context into encryption methods

* Fix tests

* Fix tests

* Fix tests

* Trigger CI

* Fix test

* Add names to params of encryption service interface

* Remove bus from CacheServiceImpl

* Add logging

* Add keys to logger

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Add missing key to logger

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Undo changes in markdown files

* Fix formatting

* Add context to secrets service

* Rename decryptSecureJsonData to decryptSecureJsonDataFn

* Name args in GetDecryptedValueFn

* Add template back to NewAlertmanagerNotifier

* Copy GetDecryptedValueFn to ngalert

* Add logging to pluginsettings

* Fix pluginsettings test

Co-authored-by: Tania B <yalyna.ts@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-10-07 17:33:50 +03:00
Marcus Efraimsson
1c892a2fc4 Postgres/MySQL/MSSQL: Add setting to limit maximum amount of rows processed (#38986) 
Adds a new setting dataproxy.row_limit that allows an operator to limit the 
amount of rows being processed/accepted in response to database queries 
originating from SQL data sources.

Closes #38975
Ref #39095

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2021-09-13 15:27:51 +02:00
ying-jeanne
c989f0fbbe SQL: Migrate to use SDK contracts (#36635) 
* convert SQLs to use sdk contracts

* make draft

* postgres

* intermedia

* get datasourceinfo filled at the beginning of the service

* move the interval into package because of cyclict  import and fix all postgres tests

* fix mysql test

* fix mssql

* fix the test for pr https://github.com/grafana/grafana/issues/35839

* fix some issue about intervalv2 package

* update sql test

* wire migration for SQLs

* add sqls to the background process

* make it register instead of register and start

* revert formatting

* fix tests

* fix linter

* remove integration test

* Postgres test fix

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2021-09-07 09:35:37 +02:00
ying-jeanne
bd66c8dde3 SQL data sources: Convert to return data frames (#32257) 
Convert SQL data sources to return data frames.

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
 2021-05-05 16:46:07 +02:00
Ryan McKinley
7627b55ef4 TSDB: add deprecation comments to many tsdb structs (#33281) 2021-04-23 03:03:11 +02:00
Arve Knudsen
2c72f8babc MSSQL: By default let driver choose port (#32417) 
* MSSQL: By default let driver choose port

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-30 10:54:57 +02:00
Marcus Efraimsson
b82c510581 Postgres/MySQL/MSSQL: Don't return connection failure details to the client (#32408) 
For security reasons, log any SQL connection error 
details rather than returning it to the client.

Fixes #26623
Fixes #22000

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-29 13:03:01 +02:00
Arve Knudsen
b79e61656a Introduce TSDB service (#31520) 
* Introduce TSDB service

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2021-03-08 07:02:49 +01:00
Arve Knudsen
a078e40238 Settings: Rename constants/variables to follow Go naming standards (#28002) 
* settings: Rename constants/variables to follow Go naming standards
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-02 15:45:45 +02:00
Eder Nucci
c22940fe35 MSSQL: Fix parsing of uniqueidentifier type (#25751) 
Closes #17084

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-06-26 10:11:43 +02:00
Arve Knudsen
d352c213b3 API: Recognize MSSQL data source URLs (#25629) 
* API: Recognize MSSQL URLs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Move MSSQL URL validation into mssql package

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-06-17 11:17:11 +02:00
Noval Agung Prayogo
ea35ae4d1f Chore: Update the xorm dependency (#22376) 
* Upgrade xorm

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-01 15:57:21 +02:00
Arve Knudsen
b858a5f496 Don't truncate IPv6 addresses (#19573) 
* Bugfix: Fix parsing of IPv6 addresses

Make sure that IPv6 addresses aren't truncated when parsing. Fixes #18924
* util: Change network address parsing funcs to return error
* pkg/api: Return NetworkAddress instead of host/port
 2019-10-09 08:58:45 +02:00