stackdriver: remove services query type

public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts

@@ -2,12 +2,7 @@ import has from 'lodash/has';
 import isString from 'lodash/isString';
 import isString from 'lodash/isString';
 import { alignmentPeriods } from './constants';
 import { alignmentPeriods } from './constants';
 import { MetricFindQueryTypes } from './types';
 import { MetricFindQueryTypes } from './types';
-import {
-  extractServicesFromMetricDescriptors,
-  getMetricTypesByService,
-  getAlignmentOptionsByMetric,
-  getAggregationOptionsByMetric,
-} from './functions';
+import { getMetricTypesByService, getAlignmentOptionsByMetric, getAggregationOptionsByMetric } from './functions';
 
 
 export default class StackdriverMetricFindQuery {
 export default class StackdriverMetricFindQuery {
   constructor(private datasource) {}
   constructor(private datasource) {}
@@ -15,8 +10,6 @@ export default class StackdriverMetricFindQuery {
   async query(query: any) {
   async query(query: any) {
     try {
     try {
       switch (query.selectedQueryType) {
       switch (query.selectedQueryType) {
-        case MetricFindQueryTypes.Services:
-          return this.handleServiceQuery();
         case MetricFindQueryTypes.MetricTypes:
         case MetricFindQueryTypes.MetricTypes:
           return this.handleMetricTypesQuery(query);
           return this.handleMetricTypesQuery(query);
         case MetricFindQueryTypes.MetricLabels:
         case MetricFindQueryTypes.MetricLabels:
@@ -39,16 +32,6 @@ export default class StackdriverMetricFindQuery {
     }
     }
   }
   }
 
 
-  async handleServiceQuery() {
-    const metricDescriptors = await this.datasource.getMetricTypes(this.datasource.projectName);
-    const services = extractServicesFromMetricDescriptors(metricDescriptors);
-    return services.map(s => ({
-      text: s.serviceShortName,
-      value: s.name,
-      expandable: true,
-    }));
-  }
-
   async handleMetricTypesQuery({ selectedService }) {
   async handleMetricTypesQuery({ selectedService }) {
     if (!selectedService) {
     if (!selectedService) {
       return [];
       return [];

public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx

 import React, { PureComponent } from 'react';
 import React, { PureComponent } from 'react';
+import uniqBy from 'lodash/uniqBy';
 import { TemplateQueryProps } from 'app/types/plugins';
 import { TemplateQueryProps } from 'app/types/plugins';
 import SimpleSelect from './SimpleSelect';
 import SimpleSelect from './SimpleSelect';
-import { getMetricTypes, extractServicesFromMetricDescriptors } from '../functions';
+import { getMetricTypes } from '../functions';
 import { MetricFindQueryTypes, TemplateQueryComponentData } from '../types';
 import { MetricFindQueryTypes, TemplateQueryComponentData } from '../types';
 
 
 export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQueryProps, TemplateQueryComponentData> {
 export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQueryProps, TemplateQueryComponentData> {
   queryTypes: Array<{ value: string; name: string }> = [
   queryTypes: Array<{ value: string; name: string }> = [
-    { value: MetricFindQueryTypes.Services, name: 'Services' },
     { value: MetricFindQueryTypes.MetricTypes, name: 'Metric Types' },
     { value: MetricFindQueryTypes.MetricTypes, name: 'Metric Types' },
     { value: MetricFindQueryTypes.MetricLabels, name: 'Metric Labels' },
     { value: MetricFindQueryTypes.MetricLabels, name: 'Metric Labels' },
     { value: MetricFindQueryTypes.ResourceLabels, name: 'Resource Labels' },
     { value: MetricFindQueryTypes.ResourceLabels, name: 'Resource Labels' },
@@ -38,7 +38,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
 
 
   async componentDidMount() {
   async componentDidMount() {
     const metricDescriptors = await this.props.datasource.getMetricTypes(this.props.datasource.projectName);
     const metricDescriptors = await this.props.datasource.getMetricTypes(this.props.datasource.projectName);
-    const services = extractServicesFromMetricDescriptors(metricDescriptors).map(m => ({
+    const services = uniqBy(metricDescriptors, 'service').map(m => ({
       value: m.service,
       value: m.service,
       name: m.serviceShortName,
       name: m.serviceShortName,
     }));
     }));

public/app/plugins/datasource/stackdriver/functions.ts

-import uniqBy from 'lodash/uniqBy';
 import { alignOptions, aggOptions } from './constants';
 import { alignOptions, aggOptions } from './constants';
 
 
-export const extractServicesFromMetricDescriptors = metricDescriptors => uniqBy(metricDescriptors, 'service');
-
 export const getMetricTypesByService = (metricDescriptors, service) =>
 export const getMetricTypesByService = (metricDescriptors, service) =>
   metricDescriptors.filter(m => m.service === service);
   metricDescriptors.filter(m => m.service === service);