Skip to content

Turn on v2 telemetry on by default for http and tcp#20258

Merged
istio-testing merged 2 commits intoistio:masterfrom
gargnupur:nup_telv2_on
Jan 27, 2020
Merged

Turn on v2 telemetry on by default for http and tcp#20258
istio-testing merged 2 commits intoistio:masterfrom
gargnupur:nup_telv2_on

Conversation

@gargnupur
Copy link
Copy Markdown
Contributor

Please provide a description for what this PR is for.
Turn on v2 telemetry on by default for http and tcp

THIS IS PENDING TOC APPROVAL

For TCP this will use Alpn based prefixed tunelling metadata exchange -> pending #20126

Followed @howardjohn's PR #20225 for this.

And to help us figure out who should review this PR, please
put an X in all the areas that this PR affects.

[ ] Configuration Infrastructure
[ ] Docs
[X ] Installation
[ ] Networking
[ ] Performance and Scalability
[X ] Policies and Telemetry
[ ] Security
[ ] Test and Release
[ ] User Experience
[ ] Developer Infrastructure

@gargnupur gargnupur added the do-not-merge/hold Block automatic merging of a PR. label Jan 17, 2020
@gargnupur gargnupur requested a review from a team as a code owner January 17, 2020 05:45
@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 17, 2020
@istio-testing istio-testing added needs-rebase Indicates a PR needs to be rebased before being merged size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 17, 2020
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Jan 17, 2020
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

v2 enabled already implies tcp v1 I think?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Adding this option, so that users can go back to behavior of 1.4

In 1.5(pending approval)=>
v2.enabled => tcp and http v2
if user wants to go back to 1.4 behavior:
v1.tcp.enabled => tcp v1 and http v2

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What if they set v1.enabled and v2.enabled? Today this is how they get tcp v1 and http v2

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

oh ok.. in that case we dont need a new value

we can say as follows:
v2.enabled, v1.disabled : v2 http, v2 tcp
v2.enabled, v1.enabled: v2 http, v1 tcp
v2.disabled, v1.disabled: no telemetry
v2.disabled, v1.enabled: v1 http, v1 tcp

@mandarjog , @bianpengyuan : what do you guys think too?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am ok with the above, but also open to other ideas

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we add this condition to the preceding clause?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Removed as we are not adding new TCP specific value

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this trying to redefine this key ? It may work with parsing but would be confusing

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, just setting it empty

@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Jan 17, 2020
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Jan 24, 2020
@gargnupur gargnupur added the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jan 24, 2020
@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Jan 24, 2020
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Jan 24, 2020
@istio-testing istio-testing added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 24, 2020
@gargnupur gargnupur requested a review from a team January 24, 2020 22:18
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this not a wasm filter? Do we add this in addition to the http filter?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

oh nevermind the http one is only on HCM

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit/question: do we actually want this to be a separate envoyfilter from http? I think internally we merge anyways so there isn't perf issues either way

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this is added to network filter chain for tcp and the other one to HCM

@howardjohn
Copy link
Copy Markdown
Member

/cherrypick release-1.5

@istio-testing
Copy link
Copy Markdown
Collaborator

@howardjohn: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Turn on v2 telemetry on by default for http and tcp

THIS IS PENDING TOC APPROVAL

For TCP this will use Alpn based prefixed tunelling metadata exchange -> pending istio#20126

Followed @howardjohn's PR istio#20225 for this.

Fixed based on feedback

Fix bad rebase

Trying to fix bas rebase again

Trying to fix bas rebase again

Trying to fix bas rebase again

fix assets file

Running Make Gen

Running Make Gen after changes to values.yaml

Set telemetry component to false

Add EnvoyFilter for TCP

Run Make gen again
Enable mixer in mixer tests

Fix Unit test
@gargnupur gargnupur removed do-not-merge/hold Block automatic merging of a PR. do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. labels Jan 27, 2020
@gargnupur
Copy link
Copy Markdown
Contributor Author

@mandarjog , @bianpengyuan : Can you please take a look at this pr?

Copy link
Copy Markdown
Contributor

@mandarjog mandarjog left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jan 27, 2020

@gargnupur: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
integ-new-install-k8s-tests_istio 463e7dbf6f1ad6f1a74e1fae2e37c5c000955a71 link /test integ-new-install-k8s-tests_istio
Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@gargnupur
Copy link
Copy Markdown
Contributor Author

@howardjohn , @mandarjog : looks like I am not authorized to merge this. Can you please help merge this PR?

@howardjohn
Copy link
Copy Markdown
Member

@gargnupur see https://github.com/istio/istio/wiki/Working-with-Prow#why-isnt-my-pr-merging this is expected and just needs to wait

@istio-testing istio-testing merged commit a24f595 into istio:master Jan 27, 2020
@istio-testing
Copy link
Copy Markdown
Collaborator

@howardjohn: #20258 failed to apply on top of branch "release-1.5":

Using index info to reconstruct a base tree...
M	manifests/istio-control/istio-discovery/values.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/all_on.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_force.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_output.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_output_set_profile.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_output_set_values.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_override_values.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/flag_set_values.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.yaml
M	operator/pkg/vfs/assets.gen.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/vfs/assets.gen.go
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_set_values.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_override_values.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_output_set_values.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_output_set_profile.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_output.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/flag_force.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/all_on.yaml
CONFLICT (content): Merge conflict in operator/cmd/mesh/testdata/manifest-generate/output/all_on.yaml
Auto-merging manifests/istio-control/istio-discovery/values.yaml
error: Failed to merge in the changes.
Patch failed at 0001 add option

Details

In response to this:

/cherrypick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

howardjohn pushed a commit to howardjohn/istio that referenced this pull request Jan 27, 2020
* add option

Turn on v2 telemetry on by default for http and tcp

THIS IS PENDING TOC APPROVAL

For TCP this will use Alpn based prefixed tunelling metadata exchange -> pending istio#20126

Followed @howardjohn's PR istio#20225 for this.

Fixed based on feedback

Fix bad rebase

Trying to fix bas rebase again

Trying to fix bas rebase again

Trying to fix bas rebase again

fix assets file

Running Make Gen

Running Make Gen after changes to values.yaml

Set telemetry component to false

Add EnvoyFilter for TCP

Run Make gen again
Enable mixer in mixer tests

Fix Unit test

* Run make gen

(cherry picked from commit a24f595)
istio-testing pushed a commit that referenced this pull request Jan 27, 2020
* add option

Turn on v2 telemetry on by default for http and tcp

THIS IS PENDING TOC APPROVAL

For TCP this will use Alpn based prefixed tunelling metadata exchange -> pending #20126

Followed @howardjohn's PR #20225 for this.

Fixed based on feedback

Fix bad rebase

Trying to fix bas rebase again

Trying to fix bas rebase again

Trying to fix bas rebase again

fix assets file

Running Make Gen

Running Make Gen after changes to values.yaml

Set telemetry component to false

Add EnvoyFilter for TCP

Run Make gen again
Enable mixer in mixer tests

Fix Unit test

* Run make gen

(cherry picked from commit a24f595)

Co-authored-by: Nupur Garg <37600866+gargnupur@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants