Skip to content

sFlow : disable sflow docker by default#3930

Closed
padmanarayana wants to merge 1 commit intosonic-net:masterfrom
padmanarayana:sflow_default_disable
Closed

sFlow : disable sflow docker by default#3930
padmanarayana wants to merge 1 commit intosonic-net:masterfrom
padmanarayana:sflow_default_disable

Conversation

@padmanarayana
Copy link
Contributor

@padmanarayana padmanarayana commented Dec 19, 2019

- What I did

Removed sflow from generated_services.conf so that sonic-generator does not enable sflow at startup. Note that this is a workaround until the "features" infrastructure can be fully utilized.

- How I did it

After generation of service file, remove sflow.

- How to verify it

Inspect fsroot/etc/sonic/generated_services.conf after build and /etc/sonic/generated_services.conf.

- Description for the changelog

Remove sflow from list of services started at bootup.

- A picture of a cute animal (not mandatory but encouraged)

@padmanarayana padmanarayana mentioned this pull request Dec 19, 2019
Merged
jleveque
jleveque previously approved these changes Dec 19, 2019
View reviewed changes
@prsunny
Copy link
Contributor

prsunny commented Dec 19, 2019

The diff is showing a lot of files. Can you rebase?

@padmanarayana
Copy link
Contributor Author

padmanarayana commented Dec 19, 2019

rebased

@prsunny
Copy link
Contributor

prsunny commented Dec 20, 2019

retest vsimage please

@jleveque
Copy link
Contributor

jleveque commented Dec 20, 2019

Retest vsimage please

1 similar comment
@jleveque
Copy link
Contributor

jleveque commented Dec 20, 2019

Retest vsimage please

@prsunny
Copy link
Contributor

prsunny commented Jan 10, 2020

retest vsimage please

@prsunny
Copy link
Contributor

prsunny commented Jan 17, 2020

retest vsimage please

lguohan
lguohan reviewed Jan 24, 2020
View reviewed changes
files/build_templates/sonic_debian_extension.j2
{% endfor %}

# Remove services that are to be disabled by default
sudo sed -i '/sflow.service/d' $GENERATED_SERVICE_FILE
Copy link
Collaborator

@lguohan lguohan Jan 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should provide abstraction in the build config to enable/disable services. Instead of directly modifying the sonic_debian_extensions.j2.

lguohan
lguohan requested changes Jan 24, 2020
View reviewed changes
Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as comments

@padmanarayana
Copy link
Contributor Author

padmanarayana commented Feb 4, 2020

Will address this using the "features" infrastructure.

mssonicbld added a commit that referenced this pull request Jun 25, 2025
@mssonicbld
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
2013e66 
…atically (#23069)

#### Why I did it
src/sonic-utilities
```
* 5312331b - (HEAD -> 202505, origin/202505) feat: support specific BP port information display for show interfaces (#3930) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jan 11, 2026
@mssonicbld
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
2920aef 
…lly (#25025)

#### Why I did it
src/sonic-swss
```
* 42a396b4 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #3930 from divyagayathri-hcl/acl_table_create (10 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log 138a8c09 - Merge branch 'master' into acl_table_create (20 hours ago) [StephenWangGoogle]
| |\ 
| |/ 
|/| 
* | 392de495 - Merge pull request #3918 from rkavitha-hcl/bulk_tunnel (20 hours ago) [StephenWangGoogle]
* | 377c0517 - Merge branch 'master' into bulk_tunnel (28 hours ago) [StephenWangGoogle]
* | 7b0950a5 - Use bulk APIs in tunnel manager. (32 hours ago) [mint570]
 / 
* 5ab67793 - [P4Orch] Add ACL action list during ACL table creation if they are mandatory. (2 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jasonbridges pushed a commit to jasonbridges/sonic-buildimage that referenced this pull request Jan 22, 2026
@mssonicbld @jasonbridges
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
b5b13e0 
…lly (sonic-net#25025)

#### Why I did it
src/sonic-swss
```
* 42a396b4 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request sonic-net#3930 from divyagayathri-hcl/acl_table_create (10 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log 138a8c09 - Merge branch 'master' into acl_table_create (20 hours ago) [StephenWangGoogle]
| |\ 
| |/ 
|/| 
* | 392de495 - Merge pull request sonic-net#3918 from rkavitha-hcl/bulk_tunnel (20 hours ago) [StephenWangGoogle]
* | 377c0517 - Merge branch 'master' into bulk_tunnel (28 hours ago) [StephenWangGoogle]
* | 7b0950a5 - Use bulk APIs in tunnel manager. (32 hours ago) [mint570]
 / 
* 5ab67793 - [P4Orch] Add ACL action list during ACL table creation if they are mandatory. (2 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
@mssonicbld @FengPan-Frank
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
3e3371f 
…lly (sonic-net#25025)

#### Why I did it
src/sonic-swss
```
* 42a396b4 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request sonic-net#3930 from divyagayathri-hcl/acl_table_create (10 hours ago) [StephenWangGoogle]
|\
| failure_prs.log 138a8c09 - Merge branch 'master' into acl_table_create (20 hours ago) [StephenWangGoogle]
| |\
| |/
|/|
* | 392de495 - Merge pull request sonic-net#3918 from rkavitha-hcl/bulk_tunnel (20 hours ago) [StephenWangGoogle]
* | 377c0517 - Merge branch 'master' into bulk_tunnel (28 hours ago) [StephenWangGoogle]
* | 7b0950a5 - Use bulk APIs in tunnel manager. (32 hours ago) [mint570]
 /
* 5ab67793 - [P4Orch] Add ACL action list during ACL table creation if they are mandatory. (2 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Feng Pan <[email protected]>
dprital pushed a commit that referenced this pull request Mar 19, 2026
@mssonicbld @dprital
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
0eae63f 
…lly (#25025)

#### Why I did it
src/sonic-swss
```
* 42a396b4 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #3930 from divyagayathri-hcl/acl_table_create (10 hours ago) [StephenWangGoogle]
|\
| failure_prs.log 138a8c09 - Merge branch 'master' into acl_table_create (20 hours ago) [StephenWangGoogle]
| |\
| |/
|/|
* | 392de495 - Merge pull request #3918 from rkavitha-hcl/bulk_tunnel (20 hours ago) [StephenWangGoogle]
* | 377c0517 - Merge branch 'master' into bulk_tunnel (28 hours ago) [StephenWangGoogle]
* | 7b0950a5 - Use bulk APIs in tunnel manager. (32 hours ago) [mint570]
 /
* 5ab67793 - [P4Orch] Add ACL action list during ACL table creation if they are mandatory. (2 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: dprital <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lguohan lguohan lguohan requested changes

@prsunny prsunny prsunny approved these changes

+1 more reviewer

@jleveque jleveque jleveque approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Request for 201911 Branch :shipit:

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@padmanarayana @prsunny @jleveque @lguohan