rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2477 from n313893254/issue-16936 

Fix edit cluster alert not show right targetType
This commit is contained in:
Westly Wright 2018-12-07 07:46:09 -07:00 committed by GitHub
parent 1dc0e4adb0 12f8cb4783
commit ab7a111f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/alert/addon/components/alert/form-project-rule-row/component.js
View File

@ -20,6 +20,7 @@ export default Component.extend({
set(this, 'restartIntervalSeconds', n);
set(this, 'model.podRule.restartIntervalSeconds', n * 60);
this.expressionChange()
},
expressionChange: observer('model.metricRule.expression', function() {
@ -29,19 +30,19 @@ export default Component.extend({
const expression = get(this, 'model.metricRule.expression')
const globalStore = get(this, 'globalStore')
const clusterId = get(this, 'scope.currentCluster.id')
const projectId = get(this, 'scope.currentProject.id')
if (expression) {
set(this, 'graphLoading', true)
globalStore.rawRequest({
url: `monitormetrics?action=querycluster`,
url: `monitormetrics?action=queryproject`,
method: 'POST',
data: {
expr: expression,
from: 'now-24h',
interval: '300s',
to: 'now',
clusterId,
projectId,
}
}).then((res) => {
if (res.body) {

4
lib/alert/addon/edit-rule/route.js
View File

@ -64,6 +64,8 @@ export default Route.extend({
const t = get(alert, 'targetType');
const et = get(alert, 'eventRule.eventType');
set(alert, '_targetType', t);
switch (t) {
case 'event':
switch (et) {
@ -102,8 +104,6 @@ export default Route.extend({
eventRule,
})
break;
default:
set(alert, '_targetType', t);
}
return alert;

4
lib/alert/addon/edit/route.js
View File

@ -61,6 +61,8 @@ export default Route.extend({
const t = get(alert, 'targetType');
const et = get(alert, 'eventRule.eventType');
set(alert, '_targetType', t);
switch (t) {
case 'event':
switch (et) {
@ -99,8 +101,6 @@ export default Route.extend({
eventRule,
})
break;
default:
set(alert, '_targetType', t);
}
return alert;