Skip to content

fix naming convention between access log format vs encoding #710

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.

Sign up for GitHub

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
istio-testing merged 1 commit into from
Nov 19, 2018
Merged

fix naming convention between access log format vs encoding #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 133 additions & 67 deletions mesh/v1alpha1/config.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions mesh/v1alpha1/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,19 @@ message MeshConfig {
// Empty value disables access logging.
string access_log_file = 13;

// Format for the proxy access log (text or json).
// Default value is text.
// Format for the proxy access log
// Empty value results in proxy's default access log format
string access_log_format = 24;

enum AccessLogEncoding {
TEXT = 0;
JSON = 1;
}

// Encoding for the proxy access log (text or json).
// Default value is text.
AccessLogEncoding access_log_encoding = 27;

// Default proxy config used by the proxy injection mechanism operating in the mesh
// (e.g. Kubernetes admission controller)
// In case of Kubernetes, the proxy config is applied once during the injection process,
Expand Down Expand Up @@ -188,7 +197,7 @@ message MeshConfig {
string trust_domain = 26;

// $hide_from_docs
// Next available field number: 27
// Next available field number: 28
}

// ConfigSource describes information about a configuration store inside a
Expand Down
36 changes: 34 additions & 2 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
generator: protoc-gen-docs
aliases:
- /docs/reference/config/service-mesh.html
number_of_entries: 15
number_of_entries: 16
---
<h2 id="AuthenticationPolicy">AuthenticationPolicy</h2>
<section>
Expand Down Expand Up @@ -221,7 +221,16 @@ <h2 id="MeshConfig">MeshConfig</h2>
<td><code>accessLogFormat</code></td>
<td><code>string</code></td>
<td>
<p>Format for the proxy access log (text or json).
<p>Format for the proxy access log
Empty value results in proxy&rsquo;s default access log format</p>

</td>
</tr>
<tr id="MeshConfig-access_log_encoding">
<td><code>accessLogEncoding</code></td>
<td><code><a href="#MeshConfig-AccessLogEncoding">MeshConfig.AccessLogEncoding</a></code></td>
<td>
<p>Encoding for the proxy access log (text or json).
Default value is text.</p>

</td>
Expand Down Expand Up @@ -286,6 +295,29 @@ <h2 id="MeshConfig">MeshConfig</h2>
Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain
Fallback to old identity format(without trust domain) if not set.</p>

</td>
</tr>
</tbody>
</table>
</section>
<h2 id="MeshConfig-AccessLogEncoding">MeshConfig.AccessLogEncoding</h2>
<section>
<table class="enum-values">
<thead>
<tr>
<th>Name</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr id="MeshConfig-AccessLogEncoding-TEXT">
<td><code>TEXT</code></td>
<td>
</td>
</tr>
<tr id="MeshConfig-AccessLogEncoding-JSON">
<td><code>JSON</code></td>
<td>
</td>
</tr>
</tbody>
Expand Down
Loading