INFRA-13891 Pull upstream changes #1
+6,037
−8,497
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
Fixed incorrect calculation of nginx_vts_upstream_request_seconds and nginx_vts_upstream_response_seconds values
Getting a total is better done by letting Prometheus calculate the sum of each instance of the named metric (eg sum(nginx_vts_server_requests_total) ). With them there, we have to explicit exclude them in queries, which is quite awkward.
The `ngx_http_vhost_traffic_status_node_init` function initializes the data structures and processes the first request. However it was not updating the histogram buckets. Refactor the common code from this function and `ngx_http_vhost_traffic_status_node_set` into a common `ngx_http_vhost_traffic_status_node_update` function to fix this and to reduce the chance of similar problems.
Co-authored-by: Furhan Shabir <[email protected]>
r->uri doesn't end with '\0'.
There is a small typo in src/ngx_http_vhost_traffic_status_display_json.c. Should read `destroy` rather than `destory`.
fix vhost_traffic_status_filter_max_node 16 uris
docs: fix simple typo, destory -> destroy
Fixed incorrect calculation of nginx_vts_upstream_request_seconds and nginx_vts_upstream_response_seconds values
fix: limit the r->uri search scope to avoid overflow
Cast key length to correct type
Set histogram buckets on first request
Escape special characters in Prometheus output
prometheus filter field name direction change to code
remove redundant comparision, found by cppcheck
Prometheus request count label fixes
Test: describe how to test and fix failed test case
Add support for nginx_upstream_check_module module
Feature: added moduleVersion field in format/json
test: Add upstream check test
test: Fix upstream check test properly
* it is necessary while the below patch is released officially. * nginx/nginx@2c5fccd
Fix escaping filter_key in prometheus output
Fix vtsn.len type #269
Release [v0.2.2] - 2023-04-17 ** Bugfix - fixed issues/228 Change the reffered source of upstream_states in shm_add_upstream() - fixed issues/248 Shared memory (lock|unlock) is set when using the ngx_http_vhost_traffic_status_display_get_size() function ** Bugfix - Add shmtx unlock ** Chore - add cpanm --notest in CI ** Test - Fix upstream check test properly - Add upstream check test
Release v0.2.2
ci: support freenginx
fix encodeURI into template
Release [v0.2.3] - 2024-12-31
** Bugfix
- fixed encodeURI into template
** Ci
- support freenginx
** Docs
- Fix README
Release v0.2.3
Add new boolean flag `vhost_traffic_status_stats_by_upstream` to allow disabling statistics collection for upstream servers --------- Co-authored-by: Ben Kochie <[email protected]>
Add issue template
Fix issue template
add 1.27.x compatibility
Update README.md
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.
Pulling in upstream changes to address issues in Bookworm.
The
509-as-429branch is the one we are running in our nginx build.