Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1771 from grafana/gabor/postgres-id-fix

Browse Source 
handle changed postgres-plugin-id
This commit is contained in:
Gábor Farkas
2024-01-09 15:15:38 +01:00
committed by GitHub
parent dfe360bf1d 541ba8cd82
commit 566985c410
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/datasource/components/ConfigEditor.tsx
View File

@@ -28,7 +28,8 @@ import {
import { Divider } from './Divider'; import { Divider } from './Divider';
import { css } from '@emotion/css'; import { css } from '@emotion/css';
const SUPPORTED_SQL_DS = ['mysql', 'postgres', 'influxdb']; // the postgres-plugin changed it's id, so we list both the old name and the new name
const SUPPORTED_SQL_DS = ['mysql', 'grafana-postgresql-datasource', 'postgres', 'influxdb'];
const authOptions: Array<SelectableValue<ZabbixAuthType>> = [ const authOptions: Array<SelectableValue<ZabbixAuthType>> = [
{ label: 'User and password', value: ZabbixAuthType.UserLogin }, { label: 'User and password', value: ZabbixAuthType.UserLogin },

8
src/datasource/zabbix/connectors/sql/sqlConnector.ts
View File

@@ -12,7 +12,8 @@ import dbConnector, {
const supportedDatabases = { const supportedDatabases = {
mysql: 'mysql', mysql: 'mysql',
postgres: 'postgres', postgresOld: 'postgres',
postgresNew: 'grafana-postgresql-datasource',
}; };
export class SQLConnector extends DBConnector { export class SQLConnector extends DBConnector {
@@ -31,7 +32,10 @@ export class SQLConnector extends DBConnector {
} }
loadSQLDialect() { loadSQLDialect() {
if (this.datasourceTypeId === supportedDatabases.postgres) { if (
this.datasourceTypeId === supportedDatabases.postgresOld ||
this.datasourceTypeId === supportedDatabases.postgresNew
) {
this.sqlDialect = postgres; this.sqlDialect = postgres;
} else { } else {
this.sqlDialect = mysql; this.sqlDialect = mysql;