mirror of https://github.com/istio/api.git
Merge in upstream proxy changes (#9)
This commit is contained in:
John Howard
GitHub
parent
ece51e79ff
commit
aaa9b15b2c
|
|
@ -92,26 +92,31 @@ func (MetricType) EnumDescriptor() ([]byte, []int) {
|
|||
type PluginConfig_MetadataMode int32
|
||||
|
||||
const (
|
||||
// Sidecar mode instructs the stats filter to pull local node information
|
||||
// from the Envoy node metadata alone. This will be combined with peer
|
||||
// Instructs the stats filter to pull node information
|
||||
// from the Envoy local node metadata alone. This will be combined with peer
|
||||
// metadata from Envoy filter state to build Istio service metrics.
|
||||
PluginConfig_SIDECAR_METADATA_MODE PluginConfig_MetadataMode = 0
|
||||
// Ambient PEP mode instructs the stats filter to pull local node
|
||||
// information host metadata provided by the control plane. This will be
|
||||
// combined with peer metadata from Envoy filter state to build Istio
|
||||
// service metrics.
|
||||
PluginConfig_AMBIENT_PEP_METADATA_MODE PluginConfig_MetadataMode = 1
|
||||
PluginConfig_LOCAL_NODE_METADATA_MODE PluginConfig_MetadataMode = 0
|
||||
// Instructs the stats filter to pull node information from host
|
||||
// metadata provided by the control plane. This will be combined with peer
|
||||
// metadata from Envoy filter state to build Istio service metrics.
|
||||
PluginConfig_UPSTREAM_HOST_METADATA_MODE PluginConfig_MetadataMode = 1
|
||||
// Instructs the stats filter to pull node information from cluster metadata
|
||||
// provided by the control plane. This will be combined with peer metadata
|
||||
// from Envoy filter state to build Istio service metrics.
|
||||
PluginConfig_CLUSTER_METADATA_MODE PluginConfig_MetadataMode = 2
|
||||
)
|
||||
|
||||
// Enum value maps for PluginConfig_MetadataMode.
|
||||
var (
|
||||
PluginConfig_MetadataMode_name = map[int32]string{
|
||||
0: "SIDECAR_METADATA_MODE",
|
||||
1: "AMBIENT_PEP_METADATA_MODE",
|
||||
0: "LOCAL_NODE_METADATA_MODE",
|
||||
1: "UPSTREAM_HOST_METADATA_MODE",
|
||||
2: "CLUSTER_METADATA_MODE",
|
||||
}
|
||||
PluginConfig_MetadataMode_value = map[string]int32{
|
||||
"SIDECAR_METADATA_MODE": 0,
|
||||
"AMBIENT_PEP_METADATA_MODE": 1,
|
||||
"LOCAL_NODE_METADATA_MODE": 0,
|
||||
"UPSTREAM_HOST_METADATA_MODE": 1,
|
||||
"CLUSTER_METADATA_MODE": 2,
|
||||
}
|
||||
)
|
||||
|
||||
|
|
@ -440,7 +445,7 @@ func (x *PluginConfig) GetMetadataMode() PluginConfig_MetadataMode {
|
|||
if x != nil {
|
||||
return x.MetadataMode
|
||||
}
|
||||
return PluginConfig_SIDECAR_METADATA_MODE
|
||||
return PluginConfig_LOCAL_NODE_METADATA_MODE
|
||||
}
|
||||
|
||||
var File_envoy_extensions_stats_config_proto protoreflect.FileDescriptor
|
||||
|
|
@ -472,7 +477,7 @@ var file_envoy_extensions_stats_config_proto_rawDesc = []byte{
|
|||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
|
||||
0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x0e, 0x32, 0x11, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63,
|
||||
0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xd3, 0x04, 0x0a, 0x0c, 0x50,
|
||||
0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xf3, 0x04, 0x0a, 0x0c, 0x50,
|
||||
0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x64,
|
||||
0x65, 0x62, 0x75, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x64, 0x65, 0x62, 0x75,
|
||||
0x67, 0x12, 0x2d, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x63, 0x61,
|
||||
|
|
@ -505,11 +510,13 @@ var file_envoy_extensions_stats_config_proto_rawDesc = []byte{
|
|||
0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x50,
|
||||
0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4d, 0x65, 0x74, 0x61,
|
||||
0x64, 0x61, 0x74, 0x61, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
|
||||
0x74, 0x61, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x48, 0x0a, 0x0c, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
|
||||
0x74, 0x61, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x49, 0x44, 0x45, 0x43, 0x41,
|
||||
0x52, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x10,
|
||||
0x00, 0x12, 0x1d, 0x0a, 0x19, 0x41, 0x4d, 0x42, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x50, 0x45, 0x50,
|
||||
0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x10, 0x01,
|
||||
0x74, 0x61, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x68, 0x0a, 0x0c, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
|
||||
0x74, 0x61, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x5f,
|
||||
0x4e, 0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d, 0x4f,
|
||||
0x44, 0x45, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x55, 0x50, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d,
|
||||
0x5f, 0x48, 0x4f, 0x53, 0x54, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d,
|
||||
0x4f, 0x44, 0x45, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52,
|
||||
0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x10, 0x02,
|
||||
0x2a, 0x33, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b,
|
||||
0x0a, 0x07, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x45, 0x52, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x47,
|
||||
0x41, 0x55, 0x47, 0x45, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47,
|
||||
|
|
|
|||
|
|
@ -109,21 +109,22 @@ message PluginConfig {
|
|||
repeated MetricDefinition definitions = 9;
|
||||
|
||||
enum MetadataMode {
|
||||
// Sidecar mode instructs the stats filter to pull local node information
|
||||
// from the Envoy node metadata alone. This will be combined with peer
|
||||
// Instructs the stats filter to pull node information
|
||||
// from the Envoy local node metadata alone. This will be combined with peer
|
||||
// metadata from Envoy filter state to build Istio service metrics.
|
||||
SIDECAR_METADATA_MODE = 0;
|
||||
LOCAL_NODE_METADATA_MODE = 0;
|
||||
|
||||
// Ambient PEP mode instructs the stats filter to pull local node
|
||||
// information host metadata provided by the control plane. This will be
|
||||
// combined with peer metadata from Envoy filter state to build Istio
|
||||
// service metrics.
|
||||
AMBIENT_PEP_METADATA_MODE = 1;
|
||||
// Instructs the stats filter to pull node information from host
|
||||
// metadata provided by the control plane. This will be combined with peer
|
||||
// metadata from Envoy filter state to build Istio service metrics.
|
||||
UPSTREAM_HOST_METADATA_MODE = 1;
|
||||
|
||||
// Potential other modes:
|
||||
// - AMBIENT_UPROXY_METADATA_MODE
|
||||
// Instructs the stats filter to pull node information from cluster metadata
|
||||
// provided by the control plane. This will be combined with peer metadata
|
||||
// from Envoy filter state to build Istio service metrics.
|
||||
CLUSTER_METADATA_MODE = 2;
|
||||
|
||||
// next id: 2
|
||||
// next id: 3
|
||||
}
|
||||
|
||||
// This will control how the stats filter discovers metadata for the workloads
|
||||
|
|
@ -131,4 +132,4 @@ message PluginConfig {
|
|||
MetadataMode metadata_mode = 10;
|
||||
|
||||
// next id: 11
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue