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

[syslog] Adjust runningconfiguration syslog command #2843

Merged
merged 2 commits into from
Jun 14, 2023

Conversation

fastiuk
Copy link
Contributor

@fastiuk fastiuk commented May 22, 2023

What I did

Adjust show runningconfiguration syslog command according to the new syslog configuration file

How I did it

Fix regex to match the target syslog server

How to verify it

Run the next command in sonic shell:

show runningconfiguration syslog

Previous command output (if the output of a command-line utility has changed)

N/A

New command output (if the output of a command-line utility has changed)

N/A

wen587
wen587 previously approved these changes May 24, 2023
@wen587 wen587 dismissed their stale review May 24, 2023 08:23

During the time that after this utilities PR merge, before buildimage PR merge, it will break "show run syslog" right?

@fastiuk
Copy link
Contributor Author

fastiuk commented May 24, 2023

@wen587 yes, it will

dgsudharsan
dgsudharsan previously approved these changes May 24, 2023
@dgsudharsan
Copy link
Collaborator

@wen587 yes, it will

We need to do submodule update in the sonic-buildimage PR of rsyslog to avoid any break

wen587
wen587 previously approved these changes May 25, 2023
@fastiuk fastiuk force-pushed the rsyslog-merge branch 2 times, most recently from 5f59c54 to 47cf222 Compare May 28, 2023 22:34
@fastiuk fastiuk dismissed stale reviews from dgsudharsan and wen587 via 3e30e08 May 31, 2023 14:44
@fastiuk
Copy link
Contributor Author

fastiuk commented May 31, 2023

Rebased to master due to conflicts.
@wen587 / @dgsudharsan please reapprove

dgsudharsan
dgsudharsan previously approved these changes May 31, 2023
@fastiuk
Copy link
Contributor Author

fastiuk commented Jun 1, 2023

@wen587 yes, it will

We need to do submodule update in the sonic-buildimage PR of rsyslog to avoid any break

added

@qiluo-msft qiluo-msft merged commit 659ba24 into sonic-net:master Jun 14, 2023
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Jun 20, 2023
Update sonic-utilities submodule pointer to include the following:
* 0b629ba1 Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882))
* 3ba8241a [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839))
* fceef2ed [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789))
* 659ba24b [syslog] Adjust runningconfiguration syslog command ([sonic-net#2843](sonic-net/sonic-utilities#2843))
* 46fba26f [db_migrator] add required protocol field in ROUTE_TABLE ([sonic-net#2766](sonic-net/sonic-utilities#2766))
* f186376e Fix issue: show interfaces transceiver eeprom -d should display same entry for CMIS cable ([sonic-net#2864](sonic-net/sonic-utilities#2864))
* de491798 fix precedence in portstat CLI ([sonic-net#2874](sonic-net/sonic-utilities#2874))

Signed-off-by: dprital <[email protected]>
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Jun 21, 2023
Update sonic-utilities submodule pointer to include the following:
* 0b629ba1 Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882))
* 3ba8241a [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839))
* fceef2ed [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789))
* 659ba24b [syslog] Adjust runningconfiguration syslog command ([sonic-net#2843](sonic-net/sonic-utilities#2843))
* 46fba26f [db_migrator] add required protocol field in ROUTE_TABLE ([sonic-net#2766](sonic-net/sonic-utilities#2766))
* f186376e Fix issue: show interfaces transceiver eeprom -d should display same entry for CMIS cable ([sonic-net#2864](sonic-net/sonic-utilities#2864))
* de491798 fix precedence in portstat CLI ([sonic-net#2874](sonic-net/sonic-utilities#2874))

Signed-off-by: dprital <[email protected]>
fastiuk added a commit to fastiuk/sonic-utilities that referenced this pull request Jul 18, 2023
#### What I did
Adjust `show runningconfiguration syslog` command according to the new syslog configuration file

#### How I did it
Fix regex to match the target syslog server

#### How to verify it
Run the next command in sonic shell:
```
show runningconfiguration syslog
```
@StormLiangMS
Copy link
Contributor

This PR will cause PR test failure, revert from 202305. @fastiuk pls fix and have separate PR to 202305

==================================== ERRORS ====================================
______________ ERROR at teardown of test_syslog_server_tc1_suite _______________

duthosts = [], rand_one_dut_hostname = 'vlab-01'
original_syslog_servers = ['10.0.0.5', '10.0.0.6']

@pytest.fixture(autouse=True)
def setup_env(duthosts, rand_one_dut_hostname, original_syslog_servers):
    """
    Setup/teardown fixture for syslog config
    Args:
        duthosts: list of DUTs.
        rand_selected_dut: The fixture returns a randomly selected DuT.
        original_syslog_servers: original syslog servers stored in config
    """
    duthost = duthosts[rand_one_dut_hostname]
    create_checkpoint(duthost)

    yield

    try:
        logger.info("Rolled back to original checkpoint")
        rollback_or_reload(duthost)

        current_syslog_servers = get_current_syslog_servers(duthost)
      pytest_assert(
            set(current_syslog_servers) == set(original_syslog_servers),
            "Syslog servers are not rollback_or_reload to initial config setup"
        )

E Failed: Syslog servers are not rollback_or_reload to initial config setup

StormLiangMS added a commit that referenced this pull request Jul 24, 2023
qiluo-msft pushed a commit that referenced this pull request Aug 11, 2023
cherry-pick: #2843

#### What I did
Adjust `show runningconfiguration syslog` command according to the new syslog configuration file

#### How I did it
Fix regex to match the target syslog server

#### How to verify it
Run the next command in sonic shell:
```
show runningconfiguration syslog
```
pdhruv-marvell pushed a commit to pdhruv-marvell/sonic-utilities that referenced this pull request Aug 23, 2023
#### What I did
Adjust `show runningconfiguration syslog` command according to the new syslog configuration file

#### How I did it
Fix regex to match the target syslog server

#### How to verify it
Run the next command in sonic shell:
```
show runningconfiguration syslog
```
@fastiuk fastiuk deleted the rsyslog-merge branch December 14, 2023 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants