Skip to content

fix(stats): remove policy-related dimensions#2647

Merged
istio-testing merged 4 commits intoistio:masterfrom
douglas-reid:remove-rbac-dimensions
Feb 6, 2020
Merged

fix(stats): remove policy-related dimensions#2647
istio-testing merged 4 commits intoistio:masterfrom
douglas-reid:remove-rbac-dimensions

Conversation

@douglas-reid
Copy link
Copy Markdown
Contributor

@douglas-reid douglas-reid commented Jan 31, 2020

This PR removes the deprecated and never used Istio RBAC related metrics dimensions from v2 telemetry (matching the v1 telemetry configuration).

Signed-off-by: Douglas Reid douglas-reid@users.noreply.github.com

@douglas-reid douglas-reid added the cherrypick/release-1.5 Set this label on a PR to auto-merge it to the release-1.5 branch label Jan 31, 2020
@douglas-reid douglas-reid requested a review from a team January 31, 2020 21:26
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Jan 31, 2020
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 31, 2020
kyessenov
kyessenov approved these changes Jan 31, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@kyessenov kyessenov left a comment

Choose a reason for hiding this comment

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

TODO: update bootstrap in istio/istio to drop the regex.

@douglas-reid
Copy link
Copy Markdown
Contributor Author

douglas-reid commented Jan 31, 2020

/test test_proxy

@douglas-reid douglas-reid force-pushed the remove-rbac-dimensions branch from aa1cdf3 to 0e7f807 Compare February 1, 2020 00:54
@douglas-reid
fix(stats): remove policy-related dimensions
37b905a 
Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
@douglas-reid
clean up common context
924273f 
Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
@douglas-reid
run clang-format -i
beaf389 
Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
@douglas-reid douglas-reid force-pushed the remove-rbac-dimensions branch from 0e7f807 to beaf389 Compare February 6, 2020 17:23
@douglas-reid
cleanup unused variables
3815f08 
Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
@douglas-reid
Copy link
Copy Markdown
Contributor Author

douglas-reid commented Feb 6, 2020

/test test-tsan_proxy

@istio-testing istio-testing merged commit 044008d into istio:master Feb 6, 2020
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Feb 6, 2020

In response to a cherrypick label: #2647 failed to apply on top of branch "release-1.5":

warning: Cannot merge binary files: extensions/stats/plugin.wasm (HEAD vs. fix(stats): remove policy-related dimensions)
Using index info to reconstruct a base tree...
M	extensions/common/istio_dimensions.h
M	extensions/stats/plugin.h
M	extensions/stats/plugin.wasm
M	extensions/stats/testdata/client.yaml
M	extensions/stats/testdata/server.yaml
M	test/envoye2e/http_metadata_exchange/http_metadata_exchange_test.go
M	test/envoye2e/http_metadata_exchange/testoutput/client.yaml
M	test/envoye2e/http_metadata_exchange/testoutput/server.yaml
M	test/envoye2e/stats_plugin/stats_plugin_test.go
M	test/envoye2e/tcp_metadata_exchange/tcp_metadata_exchange_test.go
M	testdata/bootstrap/stats.yaml.tmpl
M	testdata/metric/client_request_total.yaml.tmpl
M	testdata/metric/server_request_total.yaml.tmpl
Falling back to patching base and 3-way merge...
Auto-merging testdata/metric/server_request_total.yaml.tmpl
Auto-merging testdata/metric/client_request_total.yaml.tmpl
CONFLICT (content): Merge conflict in testdata/metric/client_request_total.yaml.tmpl
Auto-merging testdata/bootstrap/stats.yaml.tmpl
CONFLICT (content): Merge conflict in testdata/bootstrap/stats.yaml.tmpl
Auto-merging test/envoye2e/tcp_metadata_exchange/tcp_metadata_exchange_test.go
Auto-merging test/envoye2e/stats_plugin/stats_plugin_test.go
Auto-merging test/envoye2e/http_metadata_exchange/testoutput/server.yaml
Auto-merging test/envoye2e/http_metadata_exchange/testoutput/client.yaml
Auto-merging test/envoye2e/http_metadata_exchange/http_metadata_exchange_test.go
Auto-merging extensions/stats/testdata/server.yaml
Auto-merging extensions/stats/testdata/client.yaml
Auto-merging extensions/stats/plugin.wasm
CONFLICT (content): Merge conflict in extensions/stats/plugin.wasm
Auto-merging extensions/stats/plugin.h
CONFLICT (content): Merge conflict in extensions/stats/plugin.h
Auto-merging extensions/common/istio_dimensions.h
error: Failed to merge in the changes.
Patch failed at 0001 fix(stats): remove policy-related dimensions

douglas-reid added a commit to douglas-reid/proxy that referenced this pull request Feb 7, 2020
@douglas-reid
fix(stats): remove policy-related dimensions (istio#2647)
47dcca4
istio-testing pushed a commit that referenced this pull request Feb 11, 2020
@douglas-reid
[release-1.5] Updates to stats labels (#2660)
dc79048 
* feat(stats): support grpc status codes in metrics (#2624)

* fix(stats): remove policy-related dimensions (#2647)

* feat(stats): add support for canonical service labels (#2658)

* update istio/envoy SHA

Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>

* add missing deps for cel

Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>

* buildifier lint fix WORKSPACE respositories.bzl

Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>

* restore file test path

* commenting out RBE stuff

Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>

* skip http mxc test

Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kyessenov kyessenov kyessenov approved these changes

+1 more reviewer

@bianpengyuan bianpengyuan bianpengyuan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cherrypick/release-1.5 Set this label on a PR to auto-merge it to the release-1.5 branch cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@douglas-reid @istio-testing @kyessenov @bianpengyuan @googlebot