Switching deprecated types and adding cors headers to dockerfile (#383)

* Switching deprecated types and adding cors headers to dockerfile * moving to schema for dataquery * moving dataquery type to schema * moving dataquery type to schema * making imports for types consistent
grafana · Sep 26, 2024 · 668f47f · 668f47f
1 parent 85f9ab7
commit 668f47f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/examples/datasource-basic/src/types.ts b/examples/datasource-basic/src/types.ts
@@ -1,4 +1,5 @@
-import type { DataQuery, DataSourceJsonData } from '@grafana/data';
+import type { DataSourceJsonData } from '@grafana/data';
+import type { DataQuery } from '@grafana/schema';
 
 export interface BasicQuery extends DataQuery {
   rawQuery: string;

diff --git a/examples/datasource-http-backend/server/Dockerfile b/examples/datasource-http-backend/server/Dockerfile
@@ -1,11 +1,11 @@
-FROM node:18
+FROM node:20
 
 WORKDIR /usr/src/app
 
 COPY . .
 
 ENV NODE_ENV production
-RUN npm install
+RUN npm ci
 
 EXPOSE 8080
 

diff --git a/examples/datasource-http-backend/server/index.js b/examples/datasource-http-backend/server/index.js
@@ -2,10 +2,16 @@ const express = require('express');
 const app = express();
 const port = 10000;
 
+
+app.options('/metrics', (req, res) => {
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Access-Control-Allow-Headers', '*');
+  res.send();
+});
 app.get('/metrics', (req, res) => {
   const pointsN = 1024;
   const dataPoints = [];
-  const multiplier = parseInt(req.query.multiplier) || 1;
+  const multiplier = parseInt(req.query.multiplier, 10) || 1;
 
   for (let i = 0; i < pointsN; i++) {
     const ts = new Date(Date.now() - i * 1000);
@@ -16,6 +22,7 @@ app.get('/metrics', (req, res) => {
   }
 
   res.setHeader('Content-Type', 'application/json');
+  res.setHeader('Access-Control-Allow-Origin', '*');
   res.send(JSON.stringify({ dataPoints }));
 });
 

diff --git a/examples/datasource-http-backend/src/types.ts b/examples/datasource-http-backend/src/types.ts
@@ -1,4 +1,5 @@
-import { DataQuery, DataSourceJsonData } from '@grafana/data';
+import type { DataSourceJsonData } from '@grafana/data';
+import type { DataQuery } from '@grafana/schema';
 
 export interface MyQuery extends DataQuery {
   multiplier: number;

diff --git a/examples/datasource-http/src/DataSource.ts b/examples/datasource-http/src/DataSource.ts
@@ -6,6 +6,7 @@ import {
   DataSourceApi,
   DataSourceInstanceSettings,
   FieldType,
+  createDataFrame,
 } from '@grafana/data';
 import { getBackendSrv, isFetchError } from '@grafana/runtime';
 import { DataSourceResponse, defaultQuery, MyDataSourceOptions, MyQuery } from './types';
@@ -35,14 +36,13 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
 
     // Return a constant for each query.
     const data = options.targets.map((target) => {
-      const df: DataFrame = {
-        length: 2,
+      const df: DataFrame = createDataFrame({        
         refId: target.refId,
         fields: [
           { name: 'Time', values: [from, to], type: FieldType.time, config: {} },
           { name: 'Value', values: [target.constant, target.constant], type: FieldType.number, config: {} },
         ],
-      };
+      });
       return df;
     });
 

diff --git a/examples/datasource-http/src/types.ts b/examples/datasource-http/src/types.ts
@@ -1,4 +1,5 @@
-import { DataQuery, DataSourceJsonData } from '@grafana/data';
+import type { DataSourceJsonData } from '@grafana/data';
+import type { DataQuery } from '@grafana/schema';
 
 export interface MyQuery extends DataQuery {
   queryText?: string;

diff --git a/examples/datasource-logs/src/types.ts b/examples/datasource-logs/src/types.ts
@@ -1,4 +1,4 @@
-import { DataQuery } from '@grafana/schema';
+import type { DataQuery } from '@grafana/schema';
 
 export interface MyQuery extends DataQuery {
   queryText: string;

diff --git a/...es/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/src/types.ts b/...es/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/src/types.ts
@@ -1,4 +1,5 @@
-import { DataQuery, DataSourceJsonData } from '@grafana/data';
+import type { DataSourceJsonData } from '@grafana/data';
+import type { DataQuery } from '@grafana/schema';
 
 export interface MyQuery extends DataQuery {
   upperLimit: number;

diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/types.ts b/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/types.ts
@@ -1,5 +1,5 @@
-import { DataQuery, DataSourceJsonData } from '@grafana/data';
-
+import type { DataSourceJsonData } from '@grafana/data';
+import type { DataQuery } from '@grafana/schema';
 export interface MyQuery extends DataQuery {
   queryText?: string;
   constant: number;