40 Commits (bba4d9bd7f85ea44e8bc1188f77a8472e1c274b0)

Author	SHA1	Message	Date
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>	4 years ago
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>	4 years ago
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>	4 years ago
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>	5 years ago
Eder Nucci	c22940fe35	MSSQL: Fix parsing of uniqueidentifier type (#25751) ... Closes #17084 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
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>	5 years ago
Noval Agung Prayogo	ea35ae4d1f	Chore: Update the xorm dependency (#22376) ... * Upgrade xorm Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
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	6 years ago
Marcus Efraimsson	3de693af49	MySQL: Limit datasource error details returned from the backend (#19373) ... Only return certain mysql errors from backend. The following errors is returned as is from backend: error code 1064 (parse error) error code 1054 (bad column/field selected) error code 1146 (table not exists) Any other errors is logged and returned as a generic error. Restrict use of certain functions: Do not allow usage of the following in query: system_user() session_user() current_user() or current_user user() show grants Fixes #19360	6 years ago
Marcus Efraimsson	0f524fc947	MSSQL: Revert usage of new connectionstring format (#19203) ... This reverts commit 2514209 from #18384. Reason is that it doesn't work due to xorm 0.7.1 which doesn't support this new connectionstring format. Fixes #19189 Ref #18384 Ref #17665	6 years ago
Brian Gann	9eafc693b2	MSSQL: Fix memory leak when debug enabled (#19049) ... * fix for #19049	6 years ago
Kyle Brandt	e5bf3027fc	Refactor: Move sql_engine to sub package of tsdb (#18991) ... this way importing the tsdb package does not come with xorm dependencies	6 years ago
Elykov Alexandr	2514209083	MSSQL: Change connectionstring to URL format to fix using passwords with semicolon (#18384) ... Fixes #17665	6 years ago
zhulongcheng	2fff8f77dc	move log package to /infra (#17023) ... ref #14679 Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	6 years ago
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	6 years ago
Andrej Ocenas	09b9b595b2	Add check for Env before log	6 years ago
Marcus Efraimsson	d433ca7d40	fix util for splitting host and port ... Now you can provide both a default host and a default port	6 years ago
Mario Trangoni	8261613b51	pkg/util/{ip.go,url.go}: Fix some golint issues ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint) url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint) url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint) url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)	7 years ago
Vlad Ellis	c208186f26	Parse database host correctly when using IPv6	7 years ago
Ramiro Morales	49a3bd3097	add encrypt connstr param conditionally on the value chosen via GUI.	7 years ago
Ramiro Morales	d859a6aeb8	rename new JSON data attrbute.	7 years ago
Ramiro Morales	37f16ca80a	Add 'encrypt' setting to MSSQL data source. ... Fixes #13629	7 years ago
Marcus Efraimsson	4f7882cda2	mssql: use new sql engine	7 years ago
Marcus Efraimsson	de0d409a23	Revert "Opportunities to unindent code (unindent)"	7 years ago
Karsten Weiss	893a91af3a	Use opportunities to unindent code (unindent) ... This commit fixes the following unindent findings: pkg/api/common.go:102:2: "if x { if y" should be "if x && y" pkg/components/dynmap/dynmap.go:642:2: invert condition and early return pkg/components/dynmap/dynmap.go:681:2: invert condition and early return pkg/components/simplejson/simplejson.go:171:2: "if x { if y" should be "if x && y" pkg/middleware/dashboard_redirect.go:42:3: invert condition and early return pkg/tsdb/mssql/mssql.go:301:3: invert condition and early break pkg/tsdb/mysql/mysql.go:312:3: invert condition and early break pkg/tsdb/postgres/postgres.go:292:3: invert condition and early break pkg/tsdb/sql_engine.go:144:2: invert condition and early return	7 years ago
Marcus Efraimsson	1452634a2a	mssql: fix value columns conversion to float when using timeseries query	7 years ago
Karsten Weiss	f61e69ce75	Simplify comparison to bool constant (gosimple) ... This fixes: build.go:553:6: should omit comparison to bool constant, can be simplified to !strings.Contains(path, ".sha256") (S1002) pkg/cmd/grafana-cli/commands/ls_command.go:27:5: should omit comparison to bool constant, can be simplified to !pluginDirInfo.IsDir() (S1002) pkg/components/dynmap/dynmap_test.go:24:5: should omit comparison to bool constant, can be simplified to !value (S1002) pkg/components/dynmap/dynmap_test.go:122:14: should omit comparison to bool constant, can be simplified to b (S1002) pkg/components/dynmap/dynmap_test.go:125:14: should omit comparison to bool constant, can be simplified to !b (S1002) pkg/components/dynmap/dynmap_test.go:128:14: should omit comparison to bool constant, can be simplified to !b (S1002) pkg/models/org_user.go:51:5: should omit comparison to bool constant, can be simplified to !(*r).IsValid() (S1002) pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go:77:12: should omit comparison to bool constant, can be simplified to !haveBool (S1002) pkg/services/alerting/conditions/evaluator.go:23:9: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/evaluator.go:48:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/evaluator.go:91:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/query.go:56:6: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/extractor.go:107:20: should omit comparison to bool constant, can be simplified to !enabled.MustBool() (S1002) pkg/services/alerting/notifiers/telegram.go:222:41: should omit comparison to bool constant, can be simplified to this.UploadImage (S1002) pkg/services/sqlstore/apikey.go:58:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/apikey.go:72:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:66:33: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002) pkg/services/sqlstore/dashboard.go:175:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:311:13: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:444:12: should omit comparison to bool constant, can be simplified to !exists (S1002) pkg/services/sqlstore/dashboard.go:472:12: should omit comparison to bool constant, can be simplified to !exists (S1002) pkg/services/sqlstore/dashboard.go:554:32: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002) pkg/services/sqlstore/dashboard_snapshot.go:83:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/plugin_setting.go:39:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:34:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:111:6: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:136:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:213:6: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/temp_user.go:129:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:157:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:182:5: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:191:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:212:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:307:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/social/generic_oauth.go:185:5: should omit comparison to bool constant, can be simplified to !s.extractToken(&data, token) (S1002) pkg/tsdb/mssql/mssql.go:148:39: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mssql/mssql.go:212:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/mssql/mssql.go:247:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mssql/mssql.go:274:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mssql/mssql.go:282:8: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mysql/mysql.go:221:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/mysql/mysql.go:256:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mysql/mysql.go:283:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mysql/mysql.go:291:8: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/postgres/postgres.go:134:39: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/postgres/postgres.go:201:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/postgres/postgres.go:236:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/postgres/postgres.go:263:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/postgres/postgres.go:271:8: should omit comparison to bool constant, can be simplified to !exist (S1002)	7 years ago
Marcus Efraimsson	9d84e6f31f	mssql: fix precision for time columns in time series query mode	7 years ago
Marcus Efraimsson	b69ebee066	mssql: fix precision for the time column in table/annotation query mode ... Use the ConvertSqlTimeColumnToEpochMs function to convert any native datetime data type or epoch time (millisecond precision). Additional tests and update of existing due to timezone issues running MSSQL on UTC and dev environment on non-utc. Update stored procedures test to handle more parameters. Update test dashboard.	7 years ago
Daniel Lee	ae4c6e4648	mssql: fix precision for time column in table mode ... ref #11306	7 years ago
Marcus Efraimsson	8f6626e805	mssql: encrypt password in database	7 years ago
Marcus Efraimsson	449a307575	mssql: remove dynamic construction of metric column and other columns ... This seems like a niche feature which can be solved by defining multiple queries. In the future we'll probably add support for defining series name by alias field similar to how other datasources have solved that, e.g. prometheus.	7 years ago
Marcus Efraimsson	d14946a135	mssql: cleanup and minor refactor	7 years ago
Marcus Efraimsson	24c0f28f41	mssql: allow host without port and fallback to default port 1433	7 years ago
Marcus Efraimsson	f0f8006d8d	mssql: support money, smallmoney and decimal data types	7 years ago
Leonard Gram	3b03dce3c2	mssql: timeGroup fill support added.	7 years ago
linux chips	6e7a067857	adding support for sgl native time datatypes	8 years ago
linux chips	5114b1f792	fixing a few fromattings	8 years ago
linux chips	c75f9a1923	MSSQL Data Source	8 years ago
Daniel Lee	5dd9582520	mysql: add data source support for Azure MySql ... Fixes #9649	8 years ago
Daniel Lee	d1c9760fa8	Postgres Data Source (#9475) ... * add postgresql datasource * add rest of files for postgres datasource * fix timeseries query, remove unused code * consistent naming, refactoring * s/mysql/postgres/ * s/mysql/postgres/ * couple more tests * tests for more datatypes * fix macros for postgres * add __timeSec macro * add frontend for postgres datasource * adjust documentation * fix formatting * add proper plugin description * merge editor changes from mysql * port changes from mysql datasource * set proper defaultQuery for postgres * add time_sec to timeseries query accept int for value for timeseries query * revert allowing time_sec and handle int or float values as unix timestamp for "time" column * fix tslint error * handle decimal values in timeseries query * allow setting sslmode for postgres datasource * use type switch for handling data types * fix value for timeseries query * refactor timeseries queries to make them more flexible * remove debug statement from inner loop in type conversion * use plain for loop in getTypedRowData * fix timeseries queries * adjust postgres datasource to tsdb refactoring * adjust postgres datasource to frontend changes * update lib/pq to latest version * move type conversion to getTypedRowData * handle address types cidr, inet and macaddr * adjust response parser and docs for annotations * convert unknown types to string * add documentation for postgres datasource * add another example query with metric column * set more helpful default query * update help text in query editor * handle NULL in value column of timeseries query * add __timeGroup macro * add test for __timeGroup macro * document __timeGroup and set proper default query for annotations * fix typos in docs * add postgres to list of datasources * add postgres to builtInPlugins * mysql: refactoring as prep for merging postgres Refactors out the initialization of the xorm engine and the query logic for an sql data source. * mysql: rename refactoring + test update * postgres:refactor to use SqlEngine(same as mysql) Refactored to use a common base class with the MySql data source. Other changes from the original PR: - Changed time column to be time_sec to allow other time units in the future and to be the same as MySQL - Changed integration test to test the main Query method rather than the private transformToTable method - Changed the __timeSec macro name to __timeEpoch - Renamed PostgresExecutor to PostgresQueryEndpoint Fixes #9209 (the original PR) * postgres: encrypt password on config page With some other cosmetic changes to the config page: - placeholder texts - reset button for the password after it has been encrypted. - default value for the sslmode field. * postgres: change back col name to time from time_sec * postgres mysql: remove annotation title Title has been removed from annotations * postgres: fix images for docs page * postgres mysql: fix specs	8 years ago
bergquist	ed661767f8	follow go idiom and return error as second param	8 years ago
bergquist	a45e2ec9c3	context is reserved for go's context	8 years ago
bergquist	16b5b9f6be	make ds a param for Query	8 years ago
bergquist	7f9f388293	rename executor into tsdbqueryendpoint	8 years ago
bergquist	0229d28d64	remove unused structs	8 years ago
bergquist	55f1b36e31	refactor response flow	8 years ago
mxlxm	c5400ffe76	mysql: use collation instead of charset (#9156) ... - use charset would issue additional 'SET NAMES <VALUE>' queries, set collation would be better. see: https://github.com/go-sql-driver/mysql#charset	8 years ago
Torkel Ödegaard	c92317bafa	fix: fixed gofmt formating for #9091	8 years ago
pdoan017	3eea5d235d	Added import for container/list	8 years ago