From d01ca09c0fa6c1177f4c81bf597c9d98e9b9479b Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Fri, 27 Oct 2023 17:29:13 +0200 Subject: [PATCH 1/5] Logs datasource: deprecate showContextToggle --- examples/datasource-logs/src/datasource.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/examples/datasource-logs/src/datasource.ts b/examples/datasource-logs/src/datasource.ts index e9150357b..3d2284ab1 100644 --- a/examples/datasource-logs/src/datasource.ts +++ b/examples/datasource-logs/src/datasource.ts @@ -97,12 +97,6 @@ export class MyDataSource extends DataSourceApi im return {...query, queryText}; } - // This method can be used to show "context" button based on runtime conditions (for example, row model data or plugin settings) - showContextToggle() { - // If you want to always show toggle, you can just return true - return true - } - async getLogRowContextQuery( row: LogRowModel, options?: LogRowContextOptions, From 889448829f870765520ff31fd77952436a7223fb Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Tue, 31 Oct 2023 15:08:21 +0100 Subject: [PATCH 2/5] Deps: update grafana/data to 10.2 --- examples/datasource-logs/package-lock.json | 153 ++++++++++++++++++--- examples/datasource-logs/package.json | 2 +- 2 files changed, 136 insertions(+), 19 deletions(-) diff --git a/examples/datasource-logs/package-lock.json b/examples/datasource-logs/package-lock.json index 50449f4eb..427d0de3c 100644 --- a/examples/datasource-logs/package-lock.json +++ b/examples/datasource-logs/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.1.0", + "@grafana/data": "10.2.0", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0", @@ -2123,34 +2123,34 @@ } }, "node_modules/@grafana/data": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.1.0.tgz", - "integrity": "sha512-PzjeXSJJP14p4mSvL/+7+iDFVWQcU/T8deB5ppZG5efZS20fnWoiLL+JZOvjSMtXlPcsroJ2Rr4ygUciu7R+4g==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.2.0.tgz", + "integrity": "sha512-MPUmkokQY7AWbJKVundp9AtTZdk4HqZHUCNvM1TFkTACUW9rVCi5fmmjwJQFLfTJ9JL2fkls8Z6S1l9Hd9ViTw==", "dependencies": { "@braintree/sanitize-url": "6.0.2", - "@grafana/schema": "10.1.0", + "@grafana/schema": "10.2.0", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.1", "d3-interpolate": "3.0.1", "date-fns": "2.30.0", "dompurify": "^2.4.3", - "eventemitter3": "5.0.0", + "eventemitter3": "5.0.1", "fast_array_intersect": "1.1.0", "history": "4.10.1", "lodash": "4.17.21", "marked": "5.1.1", "marked-mangle": "1.1.0", "moment": "2.29.4", - "moment-timezone": "0.5.41", + "moment-timezone": "0.5.43", "ol": "7.4.0", "papaparse": "5.4.1", "react-use": "17.4.0", "regenerator-runtime": "0.13.11", - "rxjs": "7.8.0", + "rxjs": "7.8.1", "string-hash": "^1.1.3", "tinycolor2": "1.6.0", "tslib": "2.6.0", - "uplot": "1.6.24", + "uplot": "1.6.26", "xss": "^1.0.14" }, "peerDependencies": { @@ -2158,10 +2158,18 @@ "react-dom": "^17.0.0 || ^18.0.0" } }, + "node_modules/@grafana/data/node_modules/@grafana/schema": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-10.2.0.tgz", + "integrity": "sha512-IvjlezsOfIRjnsOwTJ1qu1GWbq9Rz3ofFi2Pd+1Brza6Gn951Hv/5MlLwqIuZJ+VnSVs35ZlNOl3sz9uSq2ibg==", + "dependencies": { + "tslib": "2.6.0" + } + }, "node_modules/@grafana/data/node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } @@ -2171,6 +2179,11 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" }, + "node_modules/@grafana/data/node_modules/uplot": { + "version": "1.6.26", + "resolved": "https://registry.npmjs.org/uplot/-/uplot-1.6.26.tgz", + "integrity": "sha512-qN0mveL6UsP40TnHzHAJkUQvpfA3y8zSLXtXKVlJo/sLfj2+vjan/Z3g81MCZjy/hEDUFNtnLftPmETDA4s7Rg==" + }, "node_modules/@grafana/e2e": { "version": "9.5.3", "resolved": "https://registry.npmjs.org/@grafana/e2e/-/e2e-9.5.3.tgz", @@ -2720,6 +2733,42 @@ "react-dom": "^17.0.0 || ^18.0.0" } }, + "node_modules/@grafana/runtime/node_modules/@grafana/data": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.1.0.tgz", + "integrity": "sha512-PzjeXSJJP14p4mSvL/+7+iDFVWQcU/T8deB5ppZG5efZS20fnWoiLL+JZOvjSMtXlPcsroJ2Rr4ygUciu7R+4g==", + "dependencies": { + "@braintree/sanitize-url": "6.0.2", + "@grafana/schema": "10.1.0", + "@types/d3-interpolate": "^3.0.0", + "@types/string-hash": "1.1.1", + "d3-interpolate": "3.0.1", + "date-fns": "2.30.0", + "dompurify": "^2.4.3", + "eventemitter3": "5.0.0", + "fast_array_intersect": "1.1.0", + "history": "4.10.1", + "lodash": "4.17.21", + "marked": "5.1.1", + "marked-mangle": "1.1.0", + "moment": "2.29.4", + "moment-timezone": "0.5.41", + "ol": "7.4.0", + "papaparse": "5.4.1", + "react-use": "17.4.0", + "regenerator-runtime": "0.13.11", + "rxjs": "7.8.0", + "string-hash": "^1.1.3", + "tinycolor2": "1.6.0", + "tslib": "2.6.0", + "uplot": "1.6.24", + "xss": "^1.0.14" + }, + "peerDependencies": { + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + } + }, "node_modules/@grafana/runtime/node_modules/@grafana/e2e-selectors": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-10.1.0.tgz", @@ -2730,6 +2779,22 @@ "typescript": "4.8.4" } }, + "node_modules/@grafana/runtime/node_modules/eventemitter3": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz", + "integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==" + }, + "node_modules/@grafana/runtime/node_modules/moment-timezone": { + "version": "0.5.41", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz", + "integrity": "sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, "node_modules/@grafana/runtime/node_modules/rxjs": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", @@ -2838,6 +2903,42 @@ "react-dom": "^17.0.0 || ^18.0.0" } }, + "node_modules/@grafana/ui/node_modules/@grafana/data": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.1.0.tgz", + "integrity": "sha512-PzjeXSJJP14p4mSvL/+7+iDFVWQcU/T8deB5ppZG5efZS20fnWoiLL+JZOvjSMtXlPcsroJ2Rr4ygUciu7R+4g==", + "dependencies": { + "@braintree/sanitize-url": "6.0.2", + "@grafana/schema": "10.1.0", + "@types/d3-interpolate": "^3.0.0", + "@types/string-hash": "1.1.1", + "d3-interpolate": "3.0.1", + "date-fns": "2.30.0", + "dompurify": "^2.4.3", + "eventemitter3": "5.0.0", + "fast_array_intersect": "1.1.0", + "history": "4.10.1", + "lodash": "4.17.21", + "marked": "5.1.1", + "marked-mangle": "1.1.0", + "moment": "2.29.4", + "moment-timezone": "0.5.41", + "ol": "7.4.0", + "papaparse": "5.4.1", + "react-use": "17.4.0", + "regenerator-runtime": "0.13.11", + "rxjs": "7.8.0", + "string-hash": "^1.1.3", + "tinycolor2": "1.6.0", + "tslib": "2.6.0", + "uplot": "1.6.24", + "xss": "^1.0.14" + }, + "peerDependencies": { + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + } + }, "node_modules/@grafana/ui/node_modules/@grafana/e2e-selectors": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-10.1.0.tgz", @@ -2848,6 +2949,22 @@ "typescript": "4.8.4" } }, + "node_modules/@grafana/ui/node_modules/eventemitter3": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz", + "integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==" + }, + "node_modules/@grafana/ui/node_modules/moment-timezone": { + "version": "0.5.41", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz", + "integrity": "sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, "node_modules/@grafana/ui/node_modules/rxjs": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", @@ -9810,9 +9927,9 @@ "dev": true }, "node_modules/eventemitter3": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz", - "integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" }, "node_modules/events": { "version": "3.3.0", @@ -15883,9 +16000,9 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.41", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz", - "integrity": "sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==", + "version": "0.5.43", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", + "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", "dependencies": { "moment": "^2.29.4" }, diff --git a/examples/datasource-logs/package.json b/examples/datasource-logs/package.json index 51e1baa12..86f712efd 100644 --- a/examples/datasource-logs/package.json +++ b/examples/datasource-logs/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.1.0", + "@grafana/data": "10.2.0", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0", From 35c4f51891f677b025336f5e2cb0f44fd3a5dcbb Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Fri, 9 Feb 2024 12:54:56 +0100 Subject: [PATCH 3/5] Update examples/datasource-logs/package.json --- examples/datasource-logs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/datasource-logs/package.json b/examples/datasource-logs/package.json index 86f712efd..bc45436cd 100644 --- a/examples/datasource-logs/package.json +++ b/examples/datasource-logs/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.2.0", + "@grafana/data": "10.3.0", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0", From af75e8cad435146ff55e3bce61f4b0ec07dc6603 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Fri, 9 Feb 2024 13:05:39 +0100 Subject: [PATCH 4/5] Update package lock --- examples/datasource-logs/package-lock.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/datasource-logs/package-lock.json b/examples/datasource-logs/package-lock.json index 427d0de3c..740630cc0 100644 --- a/examples/datasource-logs/package-lock.json +++ b/examples/datasource-logs/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.2.0", + "@grafana/data": "10.3.0", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0", @@ -2123,12 +2123,13 @@ } }, "node_modules/@grafana/data": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.2.0.tgz", - "integrity": "sha512-MPUmkokQY7AWbJKVundp9AtTZdk4HqZHUCNvM1TFkTACUW9rVCi5fmmjwJQFLfTJ9JL2fkls8Z6S1l9Hd9ViTw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.3.0.tgz", + "integrity": "sha512-jyAjk4qtJWD1ruXz4BkgVPAvQziNIuiNvLOu0u7ddMsBzmbLLt3kTSFwfEN4HYEJo/VEP+2DaVErfQ6GwL2tGA==", + "deprecated": "This version was published by accident and does NOT contain the code of Grafana 10.3.0.", "dependencies": { "@braintree/sanitize-url": "6.0.2", - "@grafana/schema": "10.2.0", + "@grafana/schema": "10.3.0", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.1", "d3-interpolate": "3.0.1", @@ -2159,9 +2160,10 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-10.2.0.tgz", - "integrity": "sha512-IvjlezsOfIRjnsOwTJ1qu1GWbq9Rz3ofFi2Pd+1Brza6Gn951Hv/5MlLwqIuZJ+VnSVs35ZlNOl3sz9uSq2ibg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-10.3.0.tgz", + "integrity": "sha512-dbNC3gfj/zRw3lVPr/TffKZLmmGzW38EHMXunMatKv1nc5A+BscRwH9xHO2LDrsHzkGEdW8ROwVYAkIWbxl/0Q==", + "deprecated": "This version was published by accident and does NOT contain the code of Grafana 10.3.0.", "dependencies": { "tslib": "2.6.0" } From 3f27fa5c941c06c3ff256876a6fd576d707e0dc5 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Wed, 14 Feb 2024 17:06:59 +0100 Subject: [PATCH 5/5] Datasource logs: upgrade grafana/data --- examples/datasource-logs/package-lock.json | 33 ++++++++++++---------- examples/datasource-logs/package.json | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/examples/datasource-logs/package-lock.json b/examples/datasource-logs/package-lock.json index 740630cc0..5d11dc347 100644 --- a/examples/datasource-logs/package-lock.json +++ b/examples/datasource-logs/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.3.0", + "@grafana/data": "10.3.3", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0", @@ -2123,13 +2123,12 @@ } }, "node_modules/@grafana/data": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.3.0.tgz", - "integrity": "sha512-jyAjk4qtJWD1ruXz4BkgVPAvQziNIuiNvLOu0u7ddMsBzmbLLt3kTSFwfEN4HYEJo/VEP+2DaVErfQ6GwL2tGA==", - "deprecated": "This version was published by accident and does NOT contain the code of Grafana 10.3.0.", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-10.3.3.tgz", + "integrity": "sha512-TkTxe/gHvLenTayDjqfM70kqRO18RyAyHCRlCGOlLOQF1J3YRqSvEnr91Izo1AmKOsWHr8IogXAEV1OjcNOmVg==", "dependencies": { "@braintree/sanitize-url": "6.0.2", - "@grafana/schema": "10.3.0", + "@grafana/schema": "10.3.3", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.1", "d3-interpolate": "3.0.1", @@ -2146,12 +2145,12 @@ "ol": "7.4.0", "papaparse": "5.4.1", "react-use": "17.4.0", - "regenerator-runtime": "0.13.11", + "regenerator-runtime": "0.14.0", "rxjs": "7.8.1", "string-hash": "^1.1.3", "tinycolor2": "1.6.0", "tslib": "2.6.0", - "uplot": "1.6.26", + "uplot": "1.6.28", "xss": "^1.0.14" }, "peerDependencies": { @@ -2160,14 +2159,18 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-10.3.0.tgz", - "integrity": "sha512-dbNC3gfj/zRw3lVPr/TffKZLmmGzW38EHMXunMatKv1nc5A+BscRwH9xHO2LDrsHzkGEdW8ROwVYAkIWbxl/0Q==", - "deprecated": "This version was published by accident and does NOT contain the code of Grafana 10.3.0.", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-10.3.3.tgz", + "integrity": "sha512-u5jIBZe6lLsGoFmERJZ35+NTP72gJYYKgUKdiO48l78uSFAmPFgR/t2MeNlY5wJTRgi54GB7giMwzrXnM4qlFg==", "dependencies": { "tslib": "2.6.0" } }, + "node_modules/@grafana/data/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + }, "node_modules/@grafana/data/node_modules/rxjs": { "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", @@ -2182,9 +2185,9 @@ "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" }, "node_modules/@grafana/data/node_modules/uplot": { - "version": "1.6.26", - "resolved": "https://registry.npmjs.org/uplot/-/uplot-1.6.26.tgz", - "integrity": "sha512-qN0mveL6UsP40TnHzHAJkUQvpfA3y8zSLXtXKVlJo/sLfj2+vjan/Z3g81MCZjy/hEDUFNtnLftPmETDA4s7Rg==" + "version": "1.6.28", + "resolved": "https://registry.npmjs.org/uplot/-/uplot-1.6.28.tgz", + "integrity": "sha512-6AQ/Hu2ZvwF1P6PtIELdWKFml8Vvf3PUqrkVndL4A1+s/0loHwXfsk3yMwy4WGkRAt0MAMpf0uKLa9h0Yt3miw==" }, "node_modules/@grafana/e2e": { "version": "9.5.3", diff --git a/examples/datasource-logs/package.json b/examples/datasource-logs/package.json index bc45436cd..a4d1d3703 100644 --- a/examples/datasource-logs/package.json +++ b/examples/datasource-logs/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "@emotion/css": "^11.1.3", - "@grafana/data": "10.3.0", + "@grafana/data": "10.3.3", "@grafana/runtime": "10.1.0", "@grafana/ui": "10.1.0", "loadash": "^1.0.0",