-
Notifications
You must be signed in to change notification settings - Fork 102
Expand upgrade tests #1689
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
Merged
Merged
Expand upgrade tests #1689
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0d4d164
Update existing upgrade tests
craigell a82777d
Update upgrade tests
craigell e5209e6
Adding custom otel test
craigell 4cdeb98
Update tests
craigell 2513824
Fixing integration tests
craigell 88fbf70
Code review feedback
craigell eb5ebdf
update deps
aphralG c4ac8ae
Update existing upgrade tests
craigell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Empty file.
File renamed without changes.
|
aphralG marked this conversation as resolved.
|
File renamed without changes.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| receivers: | ||
| containermetrics: | ||
| collection_interval: 1m0s | ||
| hostmetrics: | ||
| collection_interval: 1m0s | ||
| initial_delay: 1s | ||
| scrapers: | ||
| network: | ||
|
|
||
| processors: | ||
| batch/default_logs: | ||
| send_batch_size: 100 | ||
| timeout: 1m0s | ||
| send_batch_max_size: 100 | ||
| batch/default_metrics: | ||
| send_batch_size: 1000 | ||
| timeout: 30s | ||
| send_batch_max_size: 1000 | ||
| securityviolationsfilter/default: {} | ||
|
|
||
| exporters: | ||
| otlp_grpc/default: | ||
| endpoint: "managementPlane:9092" | ||
| timeout: 10s | ||
| retry_on_failure: | ||
| enabled: true | ||
| initial_interval: 10s | ||
| max_interval: 60s | ||
| max_elapsed_time: 10m | ||
| tls: | ||
| insecure: true | ||
| extensions: | ||
|
|
||
| service: | ||
| telemetry: | ||
| metrics: | ||
| level: none | ||
| logs: | ||
| level: DEBUG | ||
| output_paths: ["/var/log/nginx-agent/opentelemetry-collector-agent.log"] | ||
| error_output_paths: ["/var/log/nginx-agent/opentelemetry-collector-agent.log"] | ||
| extensions: | ||
|
|
||
| pipelines: | ||
| metrics/default: | ||
| receivers: | ||
| - containermetrics | ||
| - hostmetrics | ||
| processors: | ||
| - batch/default_metrics | ||
| exporters: | ||
| - otlp_grpc/default |
52 changes: 52 additions & 0 deletions
52
test/integration/upgrade/configs/expected-otel-config.yaml
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| receivers: | ||
| containermetrics: | ||
| collection_interval: 1m0s | ||
| hostmetrics: | ||
| collection_interval: 1m0s | ||
| initial_delay: 1s | ||
| scrapers: | ||
| network: | ||
|
|
||
| processors: | ||
| batch/default_logs: | ||
| send_batch_size: 100 | ||
| timeout: 1m0s | ||
| send_batch_max_size: 100 | ||
| batch/default_metrics: | ||
| send_batch_size: 1000 | ||
| timeout: 30s | ||
| send_batch_max_size: 1000 | ||
| securityviolationsfilter/default: {} | ||
|
|
||
| exporters: | ||
| otlp_grpc/default: | ||
| endpoint: "managementPlane:9092" | ||
| timeout: 10s | ||
| retry_on_failure: | ||
| enabled: true | ||
| initial_interval: 10s | ||
| max_interval: 60s | ||
| max_elapsed_time: 10m | ||
| tls: | ||
| insecure: true | ||
| extensions: | ||
|
|
||
| service: | ||
| telemetry: | ||
| metrics: | ||
| level: none | ||
| logs: | ||
| level: DEBUG | ||
| output_paths: ["/var/log/nginx-agent/opentelemetry-collector-agent.log"] | ||
| error_output_paths: ["/var/log/nginx-agent/opentelemetry-collector-agent.log"] | ||
| extensions: | ||
|
|
||
| pipelines: | ||
| metrics/default: | ||
| receivers: | ||
| - containermetrics | ||
| - hostmetrics | ||
| processors: | ||
| - batch/default_metrics | ||
| exporters: | ||
| - otlp_grpc/default |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| receivers: | ||
| hostmetrics: | ||
| collection_interval: 10s | ||
| scrapers: | ||
| cpu: | ||
|
|
||
| exporters: | ||
| debug: | ||
| verbosity: detailed | ||
|
|
||
| service: | ||
| pipelines: | ||
| metrics: | ||
| receivers: [hostmetrics] | ||
| exporters: [debug] |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # | ||
| # /etc/nginx-agent/nginx-agent.conf | ||
| # | ||
| # Configuration file for NGINX Agent. | ||
| # | ||
|
|
||
| log: | ||
| # set log level (error, warn, info, debug; default "info") | ||
| level: debug | ||
| # set log path. if empty, don't log to file. | ||
| path: /var/log/nginx-agent/ | ||
|
|
||
| allowed_directories: | ||
| - /etc/nginx | ||
| - /usr/local/etc/nginx | ||
| - /usr/share/nginx/modules | ||
| - /var/run/nginx | ||
| - /var/log/nginx | ||
|
|
||
| command: | ||
| server: | ||
| host: managementPlane | ||
| port: 9092 | ||
| type: grpc | ||
|
|
||
| collector: | ||
| additional_config_paths: | ||
| - "/etc/nginx-agent/my_config.yaml" |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.