Fix telemetry.sh passing in null as log level value #14303
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qiluo-msft
reviewed
Mar 17, 2023
| if [ ! -z $LOG_LEVEL ]; then | ||
| TELEMETRY_ARGS+=" -v=$LOG_LEVEL" | ||
| else | ||
| if [ -z $LOG_LEVEL ] || [ $LOG_LEVEL == "null" ]; then |
There was a problem hiding this comment.
If you expect only numbers, check for numbers as allowlist. ref: https://stackoverflow.com/a/2210386/2514803 #Closed
qiluo-msft
approved these changes
Mar 20, 2023
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Mar 24, 2023
#### Why I did it Bug in script that was passing in null as log level value if missing from config_db #### How I did it Added more robust conditional statement #### How to verify it 1) Remove log_level from config db 2) config reload -y 3) telemetry should not crash
|
Cherry-pick PR to 202205: #14410 |
mssonicbld
added a commit
that referenced
this pull request
Mar 24, 2023
mssonicbld
added
Included in 202205 Branch
and removed
Approved for 202205 Branch
Created PR to 202205 Branch
labels
qiluo-msft
pushed a commit
that referenced
this pull request
Mar 30, 2023
#### Why I did it Bug in script that was passing in null as log level value if missing from config_db #### How I did it Added more robust conditional statement #### How to verify it 1) Remove log_level from config db 2) config reload -y 3) telemetry should not crash
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Apr 20, 2023
#### Why I did it Bug in script that was passing in null as log level value if missing from config_db #### How I did it Added more robust conditional statement #### How to verify it 1) Remove log_level from config db 2) config reload -y 3) telemetry should not crash
|
Cherry-pick PR to 202211: #14763 |
mssonicbld
added a commit
that referenced
this pull request
Apr 22, 2023
mssonicbld
added
Included in 202211 Branch
and removed
Approved for 202211 Branch
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
Bug in script that was passing in null as log level value if missing from config_db
How I did it
Added more robust conditional statement
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)