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.

Sign up for GitHub

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

Jump to bottom

Monitor tables for Sirius #725

Merged
merged 2 commits into from
Jan 4, 2023
Merged

Monitor tables for Sirius #725

merged 2 commits into from
Jan 4, 2023

Conversation

siqbal1986
Copy link
Contributor

Added 2 VNET_MONITOR tables. one in APP DB and the other in State DB for Vxlan tunnel endpoint custom monitor.

@siqbal1986
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@siqbal1986
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@siqbal1986
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@siqbal1986 siqbal1986 merged commit 01fc252 into sonic-net:master Jan 4, 2023
yxieca pushed a commit that referenced this pull request Jan 4, 2023
@siqbal1986 @yxieca
Added customer monitoring tables in app db and state db (#725)
9616287
@zbud-msft zbud-msft mentioned this pull request Jan 6, 2023
Merged
8 tasks
lguohan pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jan 8, 2023
@zbud-msft
[submodule]: update sonic-swss-common head (#13295)
063495e 
9e1176d Zain Budhwani Fri Jan 6 09:00:11 2023 -0800 Refactor eventpublisher deinit (sonic-net/sonic-swss-common#734)
b9a9dbb Liu Shilong Thu Jan 5 10:12:49 2023 +0800 Simplify azure pipeline build template (sonic-net/sonic-swss-common#729)
01fc252 siqbal1986 Wed Jan 4 11:03:53 2023 -0800 Added customer monitoring tables in app db and state db (sonic-net/sonic-swss-common#725)
28dc42a Liu Shilong Wed Dec 28 11:19:32 2022 +0800 Fix sonic-slave docker image environment issue. (sonic-net/sonic-swss-common#727)
1d7607a Saikrishna Arcot Fri Dec 23 11:11:33 2022 -0800 Switch to using stock gcovr 5.2 (sonic-net/sonic-swss-common#726)
@qiluo-msft
Copy link
Contributor

This commit could not be cleanly cherry-picked to 202012. Please submit another PR.

siqbal1986 added a commit to siqbal1986/sonic-swss-common that referenced this pull request Jan 13, 2023
@siqbal1986
202012 cast of PR sonic-net#725
f03993b 
Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>
@siqbal1986 siqbal1986 mentioned this pull request Jan 13, 2023
Merged
siqbal1986 added a commit that referenced this pull request Jan 17, 2023
@siqbal1986
202012 cast of PR #725 (#738)
c5ed58a 
Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>
@prsunny prsunny mentioned this pull request Jan 17, 2023
Merged
8 tasks
prsunny added a commit to sonic-net/sonic-buildimage that referenced this pull request Jan 18, 2023
@prsunny
[Submodule] Update swss-common (#13406)
21ad987 
Swss-common submodule update:
c5ed58a - 2023-01-17 : 202012 cast of PR sonic-net/sonic-swss-common#725 (#738) [siqbal1986]
fe28725 - 2022-11-30 : Use github code scanning instead of LGTM (#718) [Liu Shilong]
@prsunny
Copy link
Contributor

prsunny commented Feb 2, 2023

@qiluo-msft , PR is already raised to 202012 and merged. What is the next step? Would you add label "included"?

@qiluo-msft
Copy link
Contributor

@prsunny @siqbal1986
I added the label. I notice 2 issues, you may consider in future:

  1. The PR is not 'squash' merge, so there are 2 commits on master branch
  2. The 202012 PR has a different title, it is not easy to find and track. Suggest cherry-pick and solve the conflict, and git commit. This way the original commit title will be kept.

@prsunny
Copy link
Contributor

prsunny commented Feb 2, 2023

@prsunny @siqbal1986 I added the label. I notice 2 issues, you may consider in future:

  1. The PR is not 'squash' merge, so there are 2 commits on master branch
  2. The 202012 PR has a different title, it is not easy to find and track. Suggest cherry-pick and solve the conflict, and git commit. This way the original commit title will be kept.

Ack

@siqbal1986
Copy link
Contributor Author

sorry about that. Ill make sure that it doesn't happen again.

@liuh-80
Copy link
Contributor

liuh-80 commented Feb 6, 2023

@siqbal1986, please also create a submodule PR for 202012 branch, currently the submodule still not update with this change:
https://github.com/sonic-net/sonic-swss-common/tree/fb89310e616ce4a5331aa024a080d70423131131

@siqbal1986 siqbal1986 mentioned this pull request Apr 17, 2023
Closed
@siqbal1986
Copy link
Contributor Author

@qiluo-msft can you please CP it to 202211. This needs to be merged for sonic-net/sonic-swss#2738 to get in.

@StormLiangMS
Copy link
Contributor

@siqbal1986 cherry-pick failure, pls submit separate PR to 202211.

@siqbal1986
Copy link
Contributor Author

@siqbal1986 cherry-pick failure, pls submit separate PR to 202211.

Ack

@siqbal1986 siqbal1986 mentioned this pull request Apr 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

Assignees
No one assigned
Labels
Cherry Pick Conflict_202012 Cherry Pick Conflict_202211 Included in 202012 Branch Included in 202205 Branch Included in 202211 Branch Request for 202012 Branch Request for 202205 Branch Request for 202211 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@siqbal1986 @qiluo-msft @prsunny @liuh-80 @StormLiangMS @yxieca @keboliu