Skip to content

add field to global config for setting the access log format to text or json #660

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
rshriram merged 2 commits into from
Oct 19, 2018
Merged

add field to global config for setting the access log format to text or json #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ab4a20
add field to global config for setting the access log format to text …
GregHanson Oct 19, 2018
2792dcd
move field next to access_log_file but retain original numbering
GregHanson Oct 19, 2018
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
137 changes: 94 additions & 43 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.

7 changes: 7 additions & 0 deletions mesh/v1alpha1/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ message MeshConfig {
// File address for the proxy access log (e.g. /dev/stdout).
// Empty value disables access logging.
string access_log_file = 13;

// Format for the proxy access log (text or json).
// Default value is text.
string access_log_format = 24;

// Default proxy config used by the proxy injection mechanism operating in the mesh
// (e.g. Kubernetes admission controller)
Expand Down Expand Up @@ -136,4 +140,7 @@ message MeshConfig {
// for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which
// will be used to generate key/cert eventually. This isn't supported for non-k8s case.
bool enable_sds_token_mount = 23;

// $hide_from_docs
// Next available field number: 25
}
9 changes: 9 additions & 0 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 @@ -167,6 +167,15 @@ <h2 id="MeshConfig">MeshConfig</h2>
<p>File address for the proxy access log (e.g. /dev/stdout).
Empty value disables access logging.</p>

</td>
</tr>
<tr id="MeshConfig-access_log_format">
<td><code>accessLogFormat</code></td>
<td><code>string</code></td>
<td>
<p>Format for the proxy access log (text or json).
Default value is text.</p>

</td>
</tr>
<tr id="MeshConfig-default_config">
Expand Down
25 changes: 16 additions & 9 deletions python/istio_api/mesh/v1alpha1/config_pb2.py
View file
Open in desktop

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