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

Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin

Browse Source
This commit is contained in:
Erik Sundell 2018-09-26 11:17:52 +02:00
commit 186dcc001c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -12,7 +12,7 @@
"devDependencies": { "devDependencies": {
"@types/d3": "^4.10.1", "@types/d3": "^4.10.1",
"@types/enzyme": "^3.1.13", "@types/enzyme": "^3.1.13",
"@types/jest": "^21.1.4", "@types/jest": "^23.3.2",
"@types/node": "^8.0.31", "@types/node": "^8.0.31",
"@types/react": "^16.4.14", "@types/react": "^16.4.14",
"@types/react-custom-scrollbars": "^4.0.5", "@types/react-custom-scrollbars": "^4.0.5",

2
public/app/plugins/datasource/stackdriver/partials/query.editor.html
View File

@ -55,7 +55,7 @@
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label query-keyword width-9">Alias By</span> <span class="gf-form-label query-keyword width-9">Alias By</span>
<input type="text" class="gf-form-input width-30" ng-model="ctrl.target.aliasBy" /> <input type="text" class="gf-form-input width-30" ng-model="ctrl.target.aliasBy" ng-change="ctrl.refresh()" ng-model-options="{ debounce: 500 }" />
</div> </div>
<div class="gf-form gf-form--grow"> <div class="gf-form gf-form--grow">
<div class="gf-form-label gf-form-label--grow"></div> <div class="gf-form-label gf-form-label--grow"></div>

3
public/app/plugins/datasource/stackdriver/specs/query_ctrl.test.ts
View File

@ -427,5 +427,8 @@ function createTarget(existingFilters?: string[]) {
}, },
filters: existingFilters || [], filters: existingFilters || [],
aliasBy: '', aliasBy: '',
metricService: '',
metricKind: '',
valueType: '',
}; };
} }

6
yarn.lock
View File

@ -228,9 +228,9 @@
version "7946.0.4" version "7946.0.4"
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.4.tgz#4e049756383c3f055dd8f3d24e63fb543e98eb07" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.4.tgz#4e049756383c3f055dd8f3d24e63fb543e98eb07"
"@types/jest@^21.1.4": "@types/jest@^23.3.2":
version "21.1.10" version "23.3.2"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-21.1.10.tgz#dcacb5217ddf997a090cc822bba219b4b2fd7984" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.2.tgz#07b90f6adf75d42c34230c026a2529e56c249dbb"
"@types/node@*": "@types/node@*":
version "10.9.4" version "10.9.4"