Merge pull request #28 from efcasado/misc

Misc

Author: efcasado

.releaserc

@@ -28,6 +28,11 @@
         ["@semantic-release/exec", {
             "prepareCmd": "mv dist efcasado-splunk-datasource; tar -czvf efcasado-splunk-datasource-${nextRelease.version}.tar.gz efcasado-splunk-datasource"
         }],
+        ["@semantic-release/git",
+         {
+             "assets": ["CHANGELOG.md"]
+         }
+        ],
         ["@semantic-release/github",
          {
              "assets": ["efcasado-splunk-datasource-*.tar.gz"]

src/ConfigEditor.tsx

@@ -1,11 +1,11 @@
 import React, { ChangeEvent, PureComponent } from 'react';
 import { LegacyForms } from '@grafana/ui';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { MyDataSourceOptions, MySecureJsonData } from './types';
+import { SplunkDataSourceOptions, SplunkSecureJsonData } from './types';
 
 const { SecretFormField, FormField } = LegacyForms;
 
-interface Props extends DataSourcePluginOptionsEditorProps<MyDataSourceOptions> {}
+interface Props extends DataSourcePluginOptionsEditorProps<SplunkDataSourceOptions> {}
 
 interface State {}
 
@@ -118,7 +118,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
   render() {
     const { options } = this.props;
     const { jsonData, secureJsonFields } = options;
-    const secureJsonData = (options.secureJsonData || {}) as MySecureJsonData;
+    const secureJsonData = (options.secureJsonData || {}) as SplunkSecureJsonData;
 
     return (
       <div className="gf-form-group">

src/QueryEditor.tsx

@@ -4,9 +4,9 @@ import React, { PureComponent } from 'react';
 import { QueryField } from '@grafana/ui';
 import { QueryEditorProps } from '@grafana/data';
 import { DataSource } from './datasource';
-import { defaultQuery, MyDataSourceOptions, MyQuery } from './types';
+import { defaultQuery, SplunkDataSourceOptions, SplunkQuery } from './types';
 
-type Props = QueryEditorProps<DataSource, MyQuery, MyDataSourceOptions>;
+type Props = QueryEditorProps<DataSource, SplunkQuery, SplunkDataSourceOptions>;
 
 export class QueryEditor extends PureComponent<Props> {
   onQueryTextChange = (value: string) => {

src/datasource.ts

@@ -8,18 +8,18 @@ import {
   MutableDataFrame,
 } from '@grafana/data';
 
-import { MyQuery, MyDataSourceOptions } from './types';
+import { SplunkQuery, SplunkDataSourceOptions } from './types';
 
-export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
+export class DataSource extends DataSourceApi<SplunkQuery, SplunkDataSourceOptions> {
   url?: string;
 
-  constructor(instanceSettings: DataSourceInstanceSettings<MyDataSourceOptions>) {
+  constructor(instanceSettings: DataSourceInstanceSettings<SplunkDataSourceOptions>) {
     super(instanceSettings);
 
     this.url = instanceSettings.url;
   }
 
-  async query(options: DataQueryRequest<MyQuery>): Promise<DataQueryResponse> {
+  async query(options: DataQueryRequest<SplunkQuery>): Promise<DataQueryResponse> {
     const moment = require('moment');
     const promises = options.targets.map((query) =>
       this.doRequest(query, options).then((response) => {
@@ -113,7 +113,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
     return result;
   }
 
-  async doSearchRequest(query: MyQuery, options: DataQueryRequest<MyQuery>) {
+  async doSearchRequest(query: SplunkQuery, options: DataQueryRequest<SplunkQuery>) {
     const routePath = '/splunk-datasource';
     const { range } = options;
     const from = Math.floor(range!.from.valueOf() / 1000);
@@ -194,7 +194,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
     return { fields: fields, results: results };
   }
 
-  async doRequest(query: MyQuery, options: DataQueryRequest<MyQuery>) {
+  async doRequest(query: SplunkQuery, options: DataQueryRequest<SplunkQuery>) {
     const sid: string = await this.doSearchRequest(query, options);
     // console.log(`DEBUG: sid=${sid}`);
 

src/module.ts

@@ -2,8 +2,8 @@ import { DataSourcePlugin } from '@grafana/data';
 import { DataSource } from './datasource';
 import { ConfigEditor } from './ConfigEditor';
 import { QueryEditor } from './QueryEditor';
-import { MyQuery, MyDataSourceOptions } from './types';
+import { SplunkQuery, SplunkDataSourceOptions } from './types';
 
-export const plugin = new DataSourcePlugin<DataSource, MyQuery, MyDataSourceOptions>(DataSource)
+export const plugin = new DataSourcePlugin<DataSource, SplunkQuery, SplunkDataSourceOptions>(DataSource)
   .setConfigEditor(ConfigEditor)
   .setQueryEditor(QueryEditor);

src/types.ts

@@ -1,17 +1,17 @@
 import { DataQuery, DataSourceJsonData } from '@grafana/data';
 
-export interface MyQuery extends DataQuery {
+export interface SplunkQuery extends DataQuery {
   queryText: string;
 }
 
-export const defaultQuery: Partial<MyQuery> = {
+export const defaultQuery: Partial<SplunkQuery> = {
   queryText: '',
 };
 
 /**
  * These are options configured for each DataSource instance
  */
-export interface MyDataSourceOptions extends DataSourceJsonData {
+export interface SplunkDataSourceOptions extends DataSourceJsonData {
   protocol?: string;
   endpoint?: string;
   port?: string;
@@ -20,7 +20,7 @@ export interface MyDataSourceOptions extends DataSourceJsonData {
 /**
  * Value that is used in the backend, but never sent over HTTP to the frontend
  */
-export interface MySecureJsonData {
+export interface SplunkSecureJsonData {
   username?: string;
   password?: string;
   token?: string;