mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
d1c9760fa8
* 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
172 lines
4.9 KiB
Go
172 lines
4.9 KiB
Go
package models
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/components/securejsondata"
|
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
|
)
|
|
|
|
const (
|
|
DS_GRAPHITE = "graphite"
|
|
DS_INFLUXDB = "influxdb"
|
|
DS_INFLUXDB_08 = "influxdb_08"
|
|
DS_ES = "elasticsearch"
|
|
DS_OPENTSDB = "opentsdb"
|
|
DS_CLOUDWATCH = "cloudwatch"
|
|
DS_KAIROSDB = "kairosdb"
|
|
DS_PROMETHEUS = "prometheus"
|
|
DS_POSTGRES = "postgres"
|
|
DS_ACCESS_DIRECT = "direct"
|
|
DS_ACCESS_PROXY = "proxy"
|
|
)
|
|
|
|
// Typed errors
|
|
var (
|
|
ErrDataSourceNotFound = errors.New("Data source not found")
|
|
ErrDataSourceNameExists = errors.New("Data source with same name already exists")
|
|
)
|
|
|
|
type DsAccess string
|
|
|
|
type DataSource struct {
|
|
Id int64
|
|
OrgId int64
|
|
Version int
|
|
|
|
Name string
|
|
Type string
|
|
Access DsAccess
|
|
Url string
|
|
Password string
|
|
User string
|
|
Database string
|
|
BasicAuth bool
|
|
BasicAuthUser string
|
|
BasicAuthPassword string
|
|
WithCredentials bool
|
|
IsDefault bool
|
|
JsonData *simplejson.Json
|
|
SecureJsonData securejsondata.SecureJsonData
|
|
|
|
Created time.Time
|
|
Updated time.Time
|
|
}
|
|
|
|
var knownDatasourcePlugins map[string]bool = map[string]bool{
|
|
DS_ES: true,
|
|
DS_GRAPHITE: true,
|
|
DS_INFLUXDB: true,
|
|
DS_INFLUXDB_08: true,
|
|
DS_KAIROSDB: true,
|
|
DS_CLOUDWATCH: true,
|
|
DS_PROMETHEUS: true,
|
|
DS_OPENTSDB: true,
|
|
DS_POSTGRES: true,
|
|
"opennms": true,
|
|
"druid": true,
|
|
"dalmatinerdb": true,
|
|
"gnocci": true,
|
|
"zabbix": true,
|
|
"newrelic-app": true,
|
|
"grafana-datadog-datasource": true,
|
|
"grafana-simple-json": true,
|
|
"grafana-splunk-datasource": true,
|
|
"udoprog-heroic-datasource": true,
|
|
"grafana-openfalcon-datasource": true,
|
|
"opennms-datasource": true,
|
|
"rackerlabs-blueflood-datasource": true,
|
|
"crate-datasource": true,
|
|
"ayoungprogrammer-finance-datasource": true,
|
|
"monasca-datasource": true,
|
|
"vertamedia-clickhouse-datasource": true,
|
|
}
|
|
|
|
func IsKnownDataSourcePlugin(dsType string) bool {
|
|
_, exists := knownDatasourcePlugins[dsType]
|
|
return exists
|
|
}
|
|
|
|
// ----------------------
|
|
// COMMANDS
|
|
|
|
// Also acts as api DTO
|
|
type AddDataSourceCommand struct {
|
|
Name string `json:"name" binding:"Required"`
|
|
Type string `json:"type" binding:"Required"`
|
|
Access DsAccess `json:"access" binding:"Required"`
|
|
Url string `json:"url"`
|
|
Password string `json:"password"`
|
|
Database string `json:"database"`
|
|
User string `json:"user"`
|
|
BasicAuth bool `json:"basicAuth"`
|
|
BasicAuthUser string `json:"basicAuthUser"`
|
|
BasicAuthPassword string `json:"basicAuthPassword"`
|
|
WithCredentials bool `json:"withCredentials"`
|
|
IsDefault bool `json:"isDefault"`
|
|
JsonData *simplejson.Json `json:"jsonData"`
|
|
SecureJsonData map[string]string `json:"secureJsonData"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
|
|
Result *DataSource
|
|
}
|
|
|
|
// Also acts as api DTO
|
|
type UpdateDataSourceCommand struct {
|
|
Name string `json:"name" binding:"Required"`
|
|
Type string `json:"type" binding:"Required"`
|
|
Access DsAccess `json:"access" binding:"Required"`
|
|
Url string `json:"url"`
|
|
Password string `json:"password"`
|
|
User string `json:"user"`
|
|
Database string `json:"database"`
|
|
BasicAuth bool `json:"basicAuth"`
|
|
BasicAuthUser string `json:"basicAuthUser"`
|
|
BasicAuthPassword string `json:"basicAuthPassword"`
|
|
WithCredentials bool `json:"withCredentials"`
|
|
IsDefault bool `json:"isDefault"`
|
|
JsonData *simplejson.Json `json:"jsonData"`
|
|
SecureJsonData map[string]string `json:"secureJsonData"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
Id int64 `json:"-"`
|
|
Version int `json:"-"`
|
|
}
|
|
|
|
type DeleteDataSourceByIdCommand struct {
|
|
Id int64
|
|
OrgId int64
|
|
}
|
|
|
|
type DeleteDataSourceByNameCommand struct {
|
|
Name string
|
|
OrgId int64
|
|
}
|
|
|
|
// ---------------------
|
|
// QUERIES
|
|
|
|
type GetDataSourcesQuery struct {
|
|
OrgId int64
|
|
Result []*DataSource
|
|
}
|
|
|
|
type GetDataSourceByIdQuery struct {
|
|
Id int64
|
|
OrgId int64
|
|
Result *DataSource
|
|
}
|
|
|
|
type GetDataSourceByNameQuery struct {
|
|
Name string
|
|
OrgId int64
|
|
Result *DataSource
|
|
}
|
|
|
|
// ---------------------
|
|
// EVENTS
|
|
type DataSourceCreatedEvent struct {
|
|
}
|