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

Edit alert screen for nodes, etcd, events always has "scheduler" selected by default 

https://github.com/rancher/rancher/issues/16936
This commit is contained in:
n313893254 2018-12-07 10:45:54 +08:00
parent cf5d9b5429
commit 12f8cb4783
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, 'restartIntervalSeconds', n);
set(this, 'model.podRule.restartIntervalSeconds', n * 60); set(this, 'model.podRule.restartIntervalSeconds', n * 60);
this.expressionChange()
}, },
expressionChange: observer('model.metricRule.expression', function() { expressionChange: observer('model.metricRule.expression', function() {
@ -29,19 +30,19 @@ export default Component.extend({
const expression = get(this, 'model.metricRule.expression') const expression = get(this, 'model.metricRule.expression')
const globalStore = get(this, 'globalStore') const globalStore = get(this, 'globalStore')
const clusterId = get(this, 'scope.currentCluster.id') const projectId = get(this, 'scope.currentProject.id')
if (expression) { if (expression) {
set(this, 'graphLoading', true) set(this, 'graphLoading', true)
globalStore.rawRequest({ globalStore.rawRequest({
url: `monitormetrics?action=querycluster`, url: `monitormetrics?action=queryproject`,
method: 'POST', method: 'POST',
data: { data: {
expr: expression, expr: expression,
from: 'now-24h', from: 'now-24h',
interval: '300s', interval: '300s',
to: 'now', to: 'now',
clusterId, projectId,
} }
}).then((res) => { }).then((res) => {
if (res.body) { 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 t = get(alert, 'targetType');
const et = get(alert, 'eventRule.eventType'); const et = get(alert, 'eventRule.eventType');
set(alert, '_targetType', t);
switch (t) { switch (t) {
case 'event': case 'event':
switch (et) { switch (et) {
@ -102,8 +104,6 @@ export default Route.extend({
eventRule, eventRule,
}) })
break; break;
default:
set(alert, '_targetType', t);
} }
return alert; 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 t = get(alert, 'targetType');
const et = get(alert, 'eventRule.eventType'); const et = get(alert, 'eventRule.eventType');
set(alert, '_targetType', t);
switch (t) { switch (t) {
case 'event': case 'event':
switch (et) { switch (et) {
@ -99,8 +101,6 @@ export default Route.extend({
eventRule, eventRule,
}) })
break; break;
default:
set(alert, '_targetType', t);
} }
return alert; return alert;