IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: cleanup

Browse Source
This commit is contained in:
Erik Sundell 2018-10-31 13:55:40 +01:00
parent a46b9cb0bb
commit b3c34be648
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts
View File

@ -1,13 +1,13 @@
import has from 'lodash/has';
import isString from 'lodash/isString';
import { alignmentPeriods } from './constants';
import { MetricFindQueryTypes } from './types';
import {
extractServicesFromMetricDescriptors,
getMetricTypesByService,
getAlignmentOptionsByMetric,
getAggregationOptionsByMetric,
} from './functions';
import { alignmentPeriods } from './constants';
import has from 'lodash/has';
import isString from 'lodash/isString';
import { MetricFindQueryTypes } from './types';
export default class StackdriverMetricFindQuery {
constructor(private datasource) {}

4
public/app/plugins/datasource/stackdriver/components/SimpleDropdown.tsx → public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
View File

@ -7,7 +7,7 @@ interface Props {
label: string;
}
const SimpleDropdown: SFC<Props> = props => {
const SimpleSelect: SFC<Props> = props => {
const { label, onValueChange, value, options } = props;
return (
<div className="gf-form max-width-21">
@ -25,4 +25,4 @@ const SimpleDropdown: SFC<Props> = props => {
);
};
export default SimpleDropdown;
export default SimpleSelect;

20
public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
View File

@ -1,8 +1,8 @@
import React, { PureComponent } from 'react';
import SimpleDropdown from './SimpleDropdown';
import { TemplateQueryProps } from 'app/types/plugins';
import { getMetricTypes, extractServicesFromMetricDescriptors } from '../functions';
import defaultsDeep from 'lodash/defaultsDeep';
import SimpleSelect from './SimpleSelect';
import { getMetricTypes, extractServicesFromMetricDescriptors } from '../functions';
import { MetricFindQueryTypes, TemplateQueryComponentData } from '../types';
export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQueryProps, TemplateQueryComponentData> {
@ -109,7 +109,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
const refId = 'StackdriverTemplateQueryComponent';
const response = await this.props.datasource.getLabels(selectedMetricType, refId);
const labels = Object.keys(response.meta[selectedQueryType]);
const labelKey = labels.indexOf(this.state.labelKey) !== -1 ? this.state.labelKey : labels[0];
const labelKey = labels.some(l => l === this.state.labelKey) ? this.state.labelKey : labels[0];
result = { labels, labelKey };
}
return result;
@ -119,7 +119,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
switch (queryType) {
case MetricFindQueryTypes.MetricTypes:
return (
<SimpleDropdown
<SimpleSelect
value={this.state.selectedService}
options={this.state.services}
onValueChange={this.onServiceChange}
@ -131,19 +131,19 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
case MetricFindQueryTypes.ResourceTypes:
return (
<React.Fragment>
<SimpleDropdown
<SimpleSelect
value={this.state.selectedService}
options={this.state.services}
onValueChange={this.onServiceChange}
label="Services"
/>
<SimpleDropdown
<SimpleSelect
value={this.state.selectedMetricType}
options={this.state.metricTypes}
onValueChange={this.onMetricTypeChange}
label="Metric Types"
/>
<SimpleDropdown
<SimpleSelect
value={this.state.labelKey}
options={this.state.labels.map(l => ({ value: l, name: l }))}
onValueChange={this.onLabelKeyChange}
@ -159,13 +159,13 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
case MetricFindQueryTypes.Aggregations:
return (
<React.Fragment>
<SimpleDropdown
<SimpleSelect
value={this.state.selectedService}
options={this.state.services}
onValueChange={this.onServiceChange}
label="Services"
/>
<SimpleDropdown
<SimpleSelect
value={this.state.selectedMetricType}
options={this.state.metricTypes}
onValueChange={this.onMetricTypeChange}
@ -181,7 +181,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
render() {
return (
<React.Fragment>
<SimpleDropdown
<SimpleSelect
value={this.state.selectedQueryType}
options={this.queryTypes}
onValueChange={this.handleQueryTypeChange}

2
public/app/plugins/datasource/stackdriver/functions.ts
View File

@ -1,5 +1,5 @@
import { alignOptions, aggOptions } from './constants';
import uniqBy from 'lodash/uniqBy';
import { alignOptions, aggOptions } from './constants';
export const extractServicesFromMetricDescriptors = metricDescriptors => uniqBy(metricDescriptors, 'service');