Skip to content

Commit

Permalink
1.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jsers committed Jan 6, 2021
1 parent b040ca0 commit 11c2dba
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 21 deletions.
2 changes: 1 addition & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Nightingale >= V2.4.1

## Installation
```BASH
grafana-cli --pluginUrl https://github.com/n9e/grafana-n9e-datasource/archive/v1.5.2.zip plugins install grafana-n9e-datasource
grafana-cli --pluginUrl https://github.com/n9e/grafana-n9e-datasource/archive/v1.5.3.zip plugins install grafana-n9e-datasource
```

## Configuration
Expand Down
41 changes: 27 additions & 14 deletions dist/module.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/module.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
}
],
"screenshots": [],
"version": "1.5.3",
"updated": "2020-10-18"
"version": "1.5.4",
"updated": "2021-01-06"
},
"routes": [{
"path": "v1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "n9e-datasource",
"version": "1.5.3",
"version": "1.5.4",
"description": "",
"scripts": {
"build": "grafana-toolkit plugin:build",
Expand Down
18 changes: 16 additions & 2 deletions src/DataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ import { hasDtag, hasVariable, getDTagvKeyword, dFilter, getDTagV } from './Comp
import { TypeTreeNode } from './Components/TreeSelect/types';
import { normalizeEndpointCounters } from './utils';
import { comparisonOptions } from './config';
import { request, fetchTreeData, fetchEndpointsData, fetchCountersData, fetchSeriesData, fetchTagkvData } from './services';
import {
request,
fetchTreeData,
fetchEndpointsData,
fetchCountersData,
fetchSeriesData,
fetchTagkvData,
} from './services';

export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
constructor(public instanceSettings: DataSourceInstanceSettings<MyDataSourceOptions>, public backendSrv: BackendSrv) {
Expand Down Expand Up @@ -77,7 +84,14 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
}

if (hasDtag(selectedTagkv)) {
await fetchTagkvData(this.instanceSettings, this.backendSrv, query, [query.selectedMetric], cateVal, category).then((res) => {
await fetchTagkvData(
this.instanceSettings,
this.backendSrv,
query,
[query.selectedMetric],
cateVal,
category
).then(res => {
selectedTagkv = _.map(selectedTagkv, item => {
const tagkvData = _.get(res, 'tagkv');
return {
Expand Down

0 comments on commit 11c2dba

Please sign in to comment.