From 8e587fecdfaca1f98609b113c8c91e23cc5163ca Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 5 Mar 2021 13:38:44 +0300 Subject: [PATCH 01/81] Update function def model --- pkg/datasource/models.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/datasource/models.go b/pkg/datasource/models.go index b2291e1..f5e9204 100644 --- a/pkg/datasource/models.go +++ b/pkg/datasource/models.go @@ -85,8 +85,15 @@ type QueryFunction struct { // QueryOptions model type QueryFunctionDef struct { - Name string `json:"name"` - Category string `json:"category"` + Name string `json:"name"` + Category string `json:"category"` + Params []QueryFunctionParamDef `json:"params"` + DefaultParams []string `json:"defaultParams"` +} + +type QueryFunctionParamDef struct { + Name string `json:"name"` + Type string `json:"type"` } // ReadQuery will read and validate Settings from the DataSourceConfg From a596d3e18add3e87170b6dd6fd7a7f264ab1cb91 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 5 Mar 2021 14:46:39 +0300 Subject: [PATCH 02/81] update grafana packages --- package.json | 13 +- .../components/VariableQueryEditor.tsx | 1 + src/panel-triggers/components/AckModal.tsx | 13 +- tsconfig.json | 3 +- yarn.lock | 6140 +++++++---------- 5 files changed, 2535 insertions(+), 3635 deletions(-) diff --git a/package.json b/package.json index 91e2428..595b949 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ "@babel/preset-env": "7.7.7", "@babel/preset-react": "7.6.3", "@emotion/core": "10.0.27", - "@grafana/data": "^7.3.2", - "@grafana/runtime": "^7.3.2", - "@grafana/toolkit": "^7.3.2", - "@grafana/ui": "7.0.1", + "@grafana/data": "^7.4.3", + "@grafana/runtime": "^7.4.3", + "@grafana/toolkit": "^7.4.3", + "@grafana/ui": "^7.4.3", "@popperjs/core": "2.4.0", "@types/classnames": "2.2.9", "@types/grafana": "github:CorpGlory/types-grafana", @@ -81,14 +81,15 @@ "react-test-renderer": "^16.7.0", "react-transition-group": "4.3.0", "rst2html": "github:thoward/rst2html#990cb89", + "rxjs": "6.6.3", "sass-loader": "8.0.2", "semver": "^7.3.2", "style-loader": "1.1.3", "tether-drop": "^1.4.2", "ts-jest": "24.1.0", "ts-loader": "4.4.1", - "tslint": "5.20.1", - "typescript": "3.9.2", + "tslint": "^6.1.3", + "typescript": "^4.1.2", "webpack": "4.41.5", "webpack-cli": "3.3.10" }, diff --git a/src/datasource-zabbix/components/VariableQueryEditor.tsx b/src/datasource-zabbix/components/VariableQueryEditor.tsx index 33f5919..bf9702d 100644 --- a/src/datasource-zabbix/components/VariableQueryEditor.tsx +++ b/src/datasource-zabbix/components/VariableQueryEditor.tsx @@ -149,6 +149,7 @@ export class ZabbixVariableQueryEditor extends PureComponent Legacy Query diff --git a/src/panel-triggers/components/AckModal.tsx b/src/panel-triggers/components/AckModal.tsx index 71664ec..f849b8f 100644 --- a/src/panel-triggers/components/AckModal.tsx +++ b/src/panel-triggers/components/AckModal.tsx @@ -147,8 +147,9 @@ export class AckModalUnthemed extends PureComponent { const { canClose } = this.props; const actions = [ - , + , { onChange={this.onChangeSelectedSeverity} />, canClose && - , + , ]; // doesn't handle empty elements properly, so don't return it @@ -197,6 +205,7 @@ export class AckModalUnthemed extends PureComponent {