Skip to content

docs: Update the Traffic tapping configuration#28158

Merged
phlax merged 1 commit intoenvoyproxy:mainfrom
haiyuewa:update-traffic-tapping-doc
Jun 28, 2023
Merged

docs: Update the Traffic tapping configuration#28158
phlax merged 1 commit intoenvoyproxy:mainfrom
haiyuewa:update-traffic-tapping-doc

Conversation

@haiyuewa
Copy link

The option 'envoy.config.tap.v3.TapConfig.match_config' has been marked deprecated by the commit 520389e ("tap: factor out the TAP filter matcher for later reuse in other filters (#12429)").

Update the option to 'envoy.config.tap.v3.TapConfig.match'.

@repokitteh-read-only
Copy link

Docs for this Pull Request will be rendered here:

https://storage.googleapis.com/envoy-pr/28158/docs/index.html

The docs are (re-)rendered each time the CI envoy-presubmit (precheck docs) job completes.

🐱

Caused by: #28158 was opened by haiyuewa.

see: more, trace.

@repokitteh-read-only
Copy link

Hi @haiyuewa, welcome and thank you for your contribution.

We will try to review your Pull Request as quickly as possible.

In the meantime, please take a look at the contribution guidelines if you have not done so already.

🐱

Caused by: #28158 was opened by haiyuewa.

see: more, trace.

@phlax phlax self-assigned this Jun 28, 2023
@phlax
Copy link
Member

phlax commented Jun 28, 2023

hi @haiyuewa thanks for raising this

we have been gradually moving all of our (bootstrap) config out of rst and into yaml - this ensures that the config is tested and doesnt go stale

would you be willing to shift these to yaml ?

you can find exsiting examples where the config has been separated with:

$ git grep literalinclude docs/

im happy to help if needed

@haiyuewa
Copy link
Author

@phlax
By my understanding:

  1. Add a dir '_include' into 'docs/root/operations'.
  2. Put my workable yaml into it.
  3. Then change to 'literalinclude'.

Right ?

@phlax
Copy link
Member

phlax commented Jun 28, 2023

yep - thats basically the gist - you will probably need to wrap the config with bootstrap boilerplate - ie listeners/clusters/etc

with the literalinclude there are a few options - not all are currently used in all examples - but ideally we want:

  • only relevant lines showing
  • caption/download for the config file itself
  • optionally highlighting of significant lines

i should probably write this up somewhere as it comes up a lot

@phlax
Copy link
Member

phlax commented Jun 28, 2023

cc @kanurag94

@haiyuewa
Copy link
Author

haiyuewa commented Jun 28, 2023

@phlax Yes, I found the format. I will submit a new patch about 'Traffic tapping' as a start.

.. literalinclude:: _include/http-cache-configuration.yaml
   :language: yaml
   :lines: 29-34
   :linenos:
   :lineno-start: 29
   :caption: :download:`http-cache-configuration.yaml <_include/http-cache-configuration.yaml>`

@phlax
Copy link
Member

phlax commented Jun 28, 2023

great, thanks @haiyuewa

re patch, i would just update this pr (perhaps i misunderstand)

@haiyuewa
Copy link
Author

@phlax

The doc showing is as:
image

@phlax
Copy link
Member

phlax commented Jun 28, 2023

nice work @haiyuewa docs are buiilding - just a couple of (yaml) format issues to resolve

CodeChecker ERROR [yamllint] docs/root/operations/_include/traffic_tapping_plain_text.yaml (indentation 39:19): wrong indentation: expected 16 but found 18
CodeChecker ERROR [yamllint] docs/root/operations/_include/traffic_tapping_ssl.yaml (indentation 54:17): wrong indentation: expected 14 but found 16

@haiyuewa
Copy link
Author

@phlax

Fixed, just copy it from the original design. ;-)

image

Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @haiyuewa for resolving this properly

@phlax phlax enabled auto-merge (squash) June 28, 2023 16:49
The option 'envoy.config.tap.v3.TapConfig.match_config' has been marked
deprecated by the commit 520389e ("tap: factor out the TAP filter
matcher for later reuse in other filters (#12429)").

Update the option to 'envoy.config.tap.v3.TapConfig.match'. And copy the
configuration out of rst and into yaml.

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
@phlax phlax merged commit 164187e into envoyproxy:main Jun 28, 2023
@haiyuewa haiyuewa deleted the update-traffic-tapping-doc branch June 28, 2023 17:02
reskin89 pushed a commit to reskin89/envoy that referenced this pull request Jul 11, 2023
The option 'envoy.config.tap.v3.TapConfig.match_config' has been marked
deprecated by the commit 520389e ("tap: factor out the TAP filter
matcher for later reuse in other filters (envoyproxy#12429)").

Update the option to 'envoy.config.tap.v3.TapConfig.match'. And copy the
configuration out of rst and into yaml.

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Signed-off-by: Ryan Eskin <ryan.eskin89@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants