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

Add check if there are any warnings in the NGINX config validation #257

Merged
merged 1 commit into from
Mar 23, 2023
+12 −4
Merged

Add check if there are any warnings in the NGINX config validation #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/proto/events/event.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ message SecurityViolationEvent {
// DEPRECATED
reserved 39;
reserved "NginxID";

string PolicyName = 1 [(gogoproto.jsontag) = "policy_name"];
string SupportID = 2 [(gogoproto.jsontag) = "support_id"];

Expand Down
4 changes: 4 additions & 0 deletions src/core/nginx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string,
return fmt.Errorf("error running nginx -t -c %v:\n%s", configLocation, response)
}

if strings.Contains(response.String(), "nginx: [warn]") {
return fmt.Errorf("error running nginx -t -c %v:\n%s", configLocation, response)
}

log.Infof("Config validated:\n%s", response)

return nil
Expand Down
2 changes: 1 addition & 1 deletion test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/events/event.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/events/event.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/nginx/agent/sdk/v2/proto/events/event.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.