Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify cluster_name and application_id in expression filters #1425

Merged

Conversation

Counterflowwind
Copy link
Contributor

What type of this PR

Add one of the following kinds:
/kind bug

What this PR does / why we need it:

modify cluster_name and application_id in expression filters

Specified Reviewers:

/assign @liuhaoyang

ChangeLog

Language Changelog
🇺🇸 English cluster_name and application_id do not take effect when they exist in custom filter rules
🇨🇳 中文 cluster_name和application_id在自定义过滤规则中存在时不生效

@erda-bot erda-bot requested a review from liuhaoyang August 13, 2021 03:24
@codecov
Copy link

codecov bot commented Aug 13, 2021

Codecov Report

Merging #1425 (e0fdece) into master (d7b735d) will increase coverage by 0.04%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1425      +/-   ##
==========================================
+ Coverage   12.00%   12.05%   +0.04%     
==========================================
  Files         990      990              
  Lines      103737   103749      +12     
==========================================
+ Hits        12455    12502      +47     
+ Misses      90172    90078      -94     
- Partials     1110     1169      +59     
Impacted Files Coverage Δ
.../core/monitor/alert/alert-apis/adapt/expression.go 18.40% <ø> (-8.99%) ⬇️
...re/monitor/alert/alert-apis/adapt/alert_convert.go 17.57% <33.33%> (+8.98%) ⬆️
...dules/core/monitor/alert/alert-apis/adapt/alert.go 1.47% <0.00%> (+0.81%) ⬆️
...core/monitor/alert/alert-apis/adapt/alert_route.go 40.62% <0.00%> (+31.25%) ⬆️

@Counterflowwind Counterflowwind added msp microsevice platform bugfix labels Aug 13, 2021
liuhaoyang
liuhaoyang previously approved these changes Aug 13, 2021
@liuhaoyang
Copy link
Contributor

/approve

erda-bot
erda-bot previously approved these changes Aug 13, 2021
@Counterflowwind Counterflowwind dismissed stale reviews from erda-bot and liuhaoyang via c7c8541 August 16, 2021 03:31
liuhaoyang
liuhaoyang previously approved these changes Aug 16, 2021
@liuhaoyang
Copy link
Contributor

/approve

@erda-bot erda-bot merged commit 1c0f12d into erda-project:master Aug 16, 2021
@liuhaoyang
Copy link
Contributor

/cherry-pick release/1.2

erda-bot pushed a commit to erda-bot/erda that referenced this pull request Aug 16, 2021
…oject#1425)

* change kubernetes组件实例Ready状态异常 recover is true

* modify cluster_name and application_id value in expression filters

* modify sql delete commit

* delete annotation

* add ToDBAlertExpressionModel test function

* add filters in test

* add filters in test

* modify filters in template
liuhaoyang pushed a commit that referenced this pull request Aug 16, 2021
…1459)

* change kubernetes组件实例Ready状态异常 recover is true

* modify cluster_name and application_id value in expression filters

* modify sql delete commit

* delete annotation

* add ToDBAlertExpressionModel test function

* add filters in test

* add filters in test

* modify filters in template

Co-authored-by: panjiayao <44628544+Counterflowwind@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved bugfix msp microsevice platform
Development

Successfully merging this pull request may close these issues.

3 participants