From d16f6dbbb2874694e9df2f4956b82a24827f509d Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Wed, 17 Mar 2021 22:49:05 +0000 Subject: [PATCH] Stream access logs (#15494) Signed-off-by: Sotiris Nanopoulos Mirrored from https://github.com/envoyproxy/envoy @ 1dc4cd3d684072ba739476032182014fd978679b --- BUILD | 2 ++ .../access_loggers/stderror/v3/BUILD | 12 +++++++ .../access_loggers/stderror/v3/stderror.proto | 30 +++++++++++++++++ .../access_loggers/stderror/v4alpha/BUILD | 13 ++++++++ .../stderror/v4alpha/stderror.proto | 33 +++++++++++++++++++ .../access_loggers/stdoutput/v3/BUILD | 12 +++++++ .../stdoutput/v3/stdoutput.proto | 30 +++++++++++++++++ .../access_loggers/stdoutput/v4alpha/BUILD | 13 ++++++++ .../stdoutput/v4alpha/stdoutput.proto | 33 +++++++++++++++++++ versioning/BUILD | 2 ++ 10 files changed, 180 insertions(+) create mode 100644 envoy/extensions/access_loggers/stderror/v3/BUILD create mode 100644 envoy/extensions/access_loggers/stderror/v3/stderror.proto create mode 100644 envoy/extensions/access_loggers/stderror/v4alpha/BUILD create mode 100644 envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto create mode 100644 envoy/extensions/access_loggers/stdoutput/v3/BUILD create mode 100644 envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto create mode 100644 envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD create mode 100644 envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto diff --git a/BUILD b/BUILD index e1ec17a8..66b0d97a 100644 --- a/BUILD +++ b/BUILD @@ -155,6 +155,8 @@ proto_library( "//envoy/data/tap/v3:pkg", "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", + "//envoy/extensions/access_loggers/stderror/v3:pkg", + "//envoy/extensions/access_loggers/stdoutput/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", diff --git a/envoy/extensions/access_loggers/stderror/v3/BUILD b/envoy/extensions/access_loggers/stderror/v3/BUILD new file mode 100644 index 00000000..1c1a6f6b --- /dev/null +++ b/envoy/extensions/access_loggers/stderror/v3/BUILD @@ -0,0 +1,12 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/config/core/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/envoy/extensions/access_loggers/stderror/v3/stderror.proto b/envoy/extensions/access_loggers/stderror/v3/stderror.proto new file mode 100644 index 00000000..48da8e44 --- /dev/null +++ b/envoy/extensions/access_loggers/stderror/v3/stderror.proto @@ -0,0 +1,30 @@ +syntax = "proto3"; + +package envoy.extensions.access_loggers.stderror.v3; + +import "envoy/config/core/v3/substitution_format_string.proto"; + +import "google/protobuf/struct.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stderror.v3"; +option java_outer_classname = "StderrorProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Standard Error access log] +// [#extension: envoy.access_loggers.stderror] + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard error. +message StdErrorAccessLog { + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v3.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} diff --git a/envoy/extensions/access_loggers/stderror/v4alpha/BUILD b/envoy/extensions/access_loggers/stderror/v4alpha/BUILD new file mode 100644 index 00000000..650f69cd --- /dev/null +++ b/envoy/extensions/access_loggers/stderror/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/config/core/v4alpha:pkg", + "//envoy/extensions/access_loggers/stderror/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto b/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto new file mode 100644 index 00000000..e14af6ef --- /dev/null +++ b/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto @@ -0,0 +1,33 @@ +syntax = "proto3"; + +package envoy.extensions.access_loggers.stderror.v4alpha; + +import "envoy/config/core/v4alpha/substitution_format_string.proto"; + +import "google/protobuf/struct.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stderror.v4alpha"; +option java_outer_classname = "StderrorProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Standard Error access log] +// [#extension: envoy.access_loggers.stderror] + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard error. +message StdErrorAccessLog { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.access_loggers.stderror.v3.StdErrorAccessLog"; + + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v4alpha.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} diff --git a/envoy/extensions/access_loggers/stdoutput/v3/BUILD b/envoy/extensions/access_loggers/stdoutput/v3/BUILD new file mode 100644 index 00000000..1c1a6f6b --- /dev/null +++ b/envoy/extensions/access_loggers/stdoutput/v3/BUILD @@ -0,0 +1,12 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/config/core/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto b/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto new file mode 100644 index 00000000..e306174d --- /dev/null +++ b/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto @@ -0,0 +1,30 @@ +syntax = "proto3"; + +package envoy.extensions.access_loggers.stdoutput.v3; + +import "envoy/config/core/v3/substitution_format_string.proto"; + +import "google/protobuf/struct.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stdoutput.v3"; +option java_outer_classname = "StdoutputProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Standard Output access log] +// [#extension: envoy.access_loggers.stdoutput] + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard output. +message StdoutputAccessLog { + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v3.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} diff --git a/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD b/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD new file mode 100644 index 00000000..db001ead --- /dev/null +++ b/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/config/core/v4alpha:pkg", + "//envoy/extensions/access_loggers/stdoutput/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto b/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto new file mode 100644 index 00000000..5664025f --- /dev/null +++ b/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto @@ -0,0 +1,33 @@ +syntax = "proto3"; + +package envoy.extensions.access_loggers.stdoutput.v4alpha; + +import "envoy/config/core/v4alpha/substitution_format_string.proto"; + +import "google/protobuf/struct.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stdoutput.v4alpha"; +option java_outer_classname = "StdoutputProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Standard Output access log] +// [#extension: envoy.access_loggers.stdoutput] + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard output. +message StdoutputAccessLog { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.access_loggers.stdoutput.v3.StdoutputAccessLog"; + + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v4alpha.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} diff --git a/versioning/BUILD b/versioning/BUILD index 7043b99a..8358f180 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -38,6 +38,8 @@ proto_library( "//envoy/data/tap/v3:pkg", "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", + "//envoy/extensions/access_loggers/stderror/v3:pkg", + "//envoy/extensions/access_loggers/stdoutput/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",