Skip to content

Commit 277ce06

Browse files
dapengzhang0snowp
dapengzhang0
authored and
snowp
committed
api: update to envoyproxy/envoy@02659d4 (#86)
Update to envoyproxy/envoy@02659d4 Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
1 parent 2b3053a commit 277ce06

121 files changed

Lines changed: 1607 additions & 457 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/main/proto/envoy/admin/v2alpha/certs.proto‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
syntax = "proto3";
2+
3+
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
6+
7+
import "google/protobuf/timestamp.proto";
8+
9+
// [#protodoc-title: Certificates]
10+
11+
// Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to
12+
// display certificate information. See :ref:`/certs <operations_admin_interface_certs>` for more
13+
// information.
14+
message Certificates {
15+
// List of certificates known to an Envoy.
16+
repeated Certificate certificates = 1;
17+
}
18+
19+
message Certificate {
20+
21+
// Details of CA certificate.
22+
repeated CertificateDetails ca_cert = 1;
23+
24+
// Details of Certificate Chain
25+
repeated CertificateDetails cert_chain = 2;
26+
}
27+
28+
message CertificateDetails {
29+
// Path of the certificate.
30+
string path = 1;
31+
32+
// Certificate Serial Number.
33+
string serial_number = 2;
34+
35+
// List of Subject Alternate names.
36+
repeated SubjectAlternateName subject_alt_names = 3;
37+
38+
// Minimum of days until expiration of certificate and it's chain.
39+
uint64 days_until_expiration = 4;
40+
41+
// Indicates the time from which the certificate is valid.
42+
google.protobuf.Timestamp valid_from = 5;
43+
44+
// Indicates the time at which the certificate expires.
45+
google.protobuf.Timestamp expiration_time = 6;
46+
}
47+
48+
message SubjectAlternateName {
49+
50+
// Subject Alternate Name.
51+
oneof name {
52+
string dns = 1;
53+
string uri = 2;
54+
}
55+
}

‎api/src/main/proto/envoy/admin/v2alpha/clusters.proto‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax = "proto3";
22

33
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
46

57
import "envoy/admin/v2alpha/metrics.proto";
68
import "envoy/api/v2/core/address.proto";
@@ -58,6 +60,9 @@ message HostStatus {
5860
// success rate or the cluster did not have enough hosts to run through success rate outlier
5961
// ejection.
6062
envoy.type.Percent success_rate = 4;
63+
64+
// The host's weight. If not configured, the value defaults to 1.
65+
uint32 weight = 5;
6166
}
6267

6368
// Health status for a host.
@@ -68,6 +73,9 @@ message HostHealthStatus {
6873
// The host is currently considered an outlier and has been ejected.
6974
bool failed_outlier_check = 2;
7075

76+
// The host is currently being marked as degraded through active health checking.
77+
bool failed_active_degraded_check = 4;
78+
7179
// Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
7280
// here.
7381
// TODO(mrice32): pipe through remaining EDS health status possibilities.

‎api/src/main/proto/envoy/admin/v2alpha/config_dump.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax = "proto3";
22

33
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
46

57
import "envoy/api/v2/cds.proto";
68
import "envoy/api/v2/lds.proto";

‎api/src/main/proto/envoy/admin/v2alpha/memory.proto‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax = "proto3";
22

33
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
46

57
// [#protodoc-title: Memory]
68

@@ -16,4 +18,18 @@ message Memory {
1618
// The number of bytes reserved by the heap but not necessarily allocated. This is an alias for
1719
// `generic.heap_size`.
1820
uint64 heap_size = 2;
21+
22+
// The number of bytes in free, unmapped pages in the page heap. These bytes always count towards
23+
// virtual memory usage, and depending on the OS, typically do not count towards physical memory
24+
// usage. This is an alias for `tcmalloc.pageheap_unmapped_bytes`.
25+
uint64 pageheap_unmapped = 3;
26+
27+
// The number of bytes in free, mapped pages in the page heap. These bytes always count towards
28+
// virtual memory usage, and unless the underlying memory is swapped out by the OS, they also
29+
// count towards physical memory usage. This is an alias for `tcmalloc.pageheap_free_bytes`.
30+
uint64 pageheap_free = 4;
31+
32+
// The amount of memory used by the TCMalloc thread caches (for small objects). This is an alias
33+
// for `tcmalloc.current_total_thread_cache_bytes`.
34+
uint64 total_thread_cache = 5;
1935
}

‎api/src/main/proto/envoy/admin/v2alpha/metrics.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax = "proto3";
22

33
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
46

57
// [#protodoc-title: Metrics]
68

‎api/src/main/proto/envoy/admin/v2alpha/mutex_stats.proto‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
syntax = "proto3";
2+
3+
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
6+
7+
// [#protodoc-title: MutexStats]
8+
9+
// Proto representation of the statistics collected upon absl::Mutex contention, if Envoy is run
10+
// under :option:`--enable-mutex-tracing`. For more information, see the `absl::Mutex`
11+
// [docs](https://abseil.io/about/design/mutex#extra-features).
12+
//
13+
// *NB*: The wait cycles below are measured by `absl::base_internal::CycleClock`, and may not
14+
// correspond to core clock frequency. For more information, see the `CycleClock`
15+
// [docs](https://github.com/abseil/abseil-cpp/blob/master/absl/base/internal/cycleclock.h).
16+
message MutexStats {
17+
18+
// The number of individual mutex contentions which have occurred since startup.
19+
uint64 num_contentions = 1;
20+
21+
// The length of the current contention wait cycle.
22+
uint64 current_wait_cycles = 2;
23+
24+
// The lifetime total of all contention wait cycles.
25+
uint64 lifetime_wait_cycles = 3;
26+
}

‎api/src/main/proto/envoy/admin/v2alpha/server_info.proto‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
syntax = "proto3";
2+
3+
package envoy.admin.v2alpha;
4+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
5+
option java_multiple_files = true;
6+
7+
import "google/protobuf/duration.proto";
8+
9+
// [#protodoc-title: Server State]
10+
11+
// Proto representation of the value returned by /server_info, containing
12+
// server version/server status information.
13+
message ServerInfo {
14+
// Server version.
15+
string version = 1;
16+
17+
enum State {
18+
// Server is live and serving traffic.
19+
LIVE = 0;
20+
// Server is draining listeners in response to external health checks failing.
21+
DRAINING = 1;
22+
// Server has not yet completed cluster manager initialization.
23+
PRE_INITIALIZING = 2;
24+
// Server is running the cluster manager initialization callbacks (e.g., RDS).
25+
INITIALIZING = 3;
26+
}
27+
28+
// State of the server.
29+
State state = 2;
30+
31+
// Uptime since current epoch was started.
32+
google.protobuf.Duration uptime_current_epoch = 3;
33+
34+
// Uptime since the start of the first epoch.
35+
google.protobuf.Duration uptime_all_epochs = 4;
36+
37+
// Command line options the server is currently running with.
38+
CommandLineOptions command_line_options = 6;
39+
}
40+
41+
message CommandLineOptions {
42+
// See :option:`--base-id` for details.
43+
uint64 base_id = 1;
44+
45+
// See :option:`--concurrency` for details.
46+
uint32 concurrency = 2;
47+
48+
// See :option:`--config-path` for details.
49+
string config_path = 3;
50+
51+
// See :option:`--config-yaml` for details.
52+
string config_yaml = 4;
53+
54+
// See :option:`--allow-unknown-fields` for details.
55+
bool allow_unknown_fields = 5;
56+
57+
// See :option:`--admin-address-path` for details.
58+
string admin_address_path = 6;
59+
60+
enum IpVersion {
61+
v4 = 0;
62+
v6 = 1;
63+
}
64+
65+
// See :option:`--local-address-ip-version` for details.
66+
IpVersion local_address_ip_version = 7;
67+
68+
// See :option:`--log-level` for details.
69+
string log_level = 8;
70+
71+
// See :option:`--component-log-level` for details.
72+
string component_log_level = 9;
73+
74+
// See :option:`--log-format` for details.
75+
string log_format = 10;
76+
77+
// See :option:`--log-path` for details.
78+
string log_path = 11;
79+
80+
// See :option:`--hot-restart-version` for details.
81+
bool hot_restart_version = 12;
82+
83+
// See :option:`--service-cluster` for details.
84+
string service_cluster = 13;
85+
86+
// See :option:`--service-node` for details.
87+
string service_node = 14;
88+
89+
// See :option:`--service-zone` for details.
90+
string service_zone = 15;
91+
92+
// See :option:`--file-flush-interval-msec` for details.
93+
google.protobuf.Duration file_flush_interval = 16;
94+
95+
// See :option:`--drain-time-s` for details.
96+
google.protobuf.Duration drain_time = 17;
97+
98+
// See :option:`--parent-shutdown-time-s` for details.
99+
google.protobuf.Duration parent_shutdown_time = 18;
100+
101+
enum Mode {
102+
// Validate configs and then serve traffic normally.
103+
Serve = 0;
104+
105+
// Validate configs and exit.
106+
Validate = 1;
107+
108+
// Completely load and initialize the config, and then exit without running the listener loop.
109+
InitOnly = 2;
110+
}
111+
112+
// See :option:`--mode` for details.
113+
Mode mode = 19;
114+
115+
// See :option:`--max-stats` for details.
116+
uint64 max_stats = 20;
117+
118+
// See :option:`--max-obj-name-len` for details.
119+
uint64 max_obj_name_len = 21;
120+
121+
// See :option:`--disable-hot-restart` for details.
122+
bool disable_hot_restart = 22;
123+
124+
// See :option:`--enable-mutex-tracing` for details.
125+
bool enable_mutex_tracing = 23;
126+
127+
// See :option:`--restart-epoch` for details.
128+
uint32 restart_epoch = 24;
129+
}

0 commit comments

Comments
 (0)