lib/fastly/models/logging_datadog_response.rb in fastly-6.0.2 vs lib/fastly/models/logging_datadog_response.rb in fastly-7.0.0
- old
+ new
@@ -17,19 +17,19 @@
attr_accessor :name
# Where in the generated VCL the logging call should be placed. If not set, endpoints with `format_version` of 2 are placed in `vcl_log` and those with `format_version` of 1 are placed in `vcl_deliver`.
attr_accessor :placement
- # The version of the custom logging format used for the configured endpoint. The logging call gets placed by default in `vcl_log` if `format_version` is set to `2` and in `vcl_deliver` if `format_version` is set to `1`.
- attr_accessor :format_version
-
# The name of an existing condition in the configured endpoint, or leave blank to always execute.
attr_accessor :response_condition
# A Fastly [log format string](https://docs.fastly.com/en/guides/custom-log-formats). Must produce valid JSON that Datadog can ingest.
attr_accessor :format
+ # The version of the custom logging format used for the configured endpoint. The logging call gets placed by default in `vcl_log` if `format_version` is set to `2` and in `vcl_deliver` if `format_version` is set to `1`.
+ attr_accessor :format_version
+
# The region that log data will be sent to.
attr_accessor :region
# The API key from your Datadog account. Required.
attr_accessor :token
@@ -72,13 +72,13 @@
# Attribute mapping from ruby-style variable name to JSON key.
def self.attribute_map
{
:'name' => :'name',
:'placement' => :'placement',
- :'format_version' => :'format_version',
:'response_condition' => :'response_condition',
:'format' => :'format',
+ :'format_version' => :'format_version',
:'region' => :'region',
:'token' => :'token',
:'created_at' => :'created_at',
:'deleted_at' => :'deleted_at',
:'updated_at' => :'updated_at',
@@ -95,20 +95,20 @@
# Attribute type mapping.
def self.fastly_types
{
:'name' => :'String',
:'placement' => :'String',
- :'format_version' => :'Integer',
:'response_condition' => :'String',
:'format' => :'String',
+ :'format_version' => :'String',
:'region' => :'String',
:'token' => :'String',
:'created_at' => :'Time',
:'deleted_at' => :'Time',
:'updated_at' => :'Time',
:'service_id' => :'String',
- :'version' => :'Integer'
+ :'version' => :'String'
}
end
# List of attributes with nullable: true
def self.fastly_nullable
@@ -122,12 +122,13 @@
end
# List of class defined in allOf (OpenAPI v3)
def self.fastly_all_of
[
- :'LoggingDatadog',
- :'ServiceIdAndVersion',
+ :'LoggingCommonResponse',
+ :'LoggingDatadogAdditional',
+ :'ServiceIdAndVersionString',
:'Timestamps'
]
end
# Initializes the object
@@ -151,26 +152,26 @@
if attributes.key?(:'placement')
self.placement = attributes[:'placement']
end
- if attributes.key?(:'format_version')
- self.format_version = attributes[:'format_version']
- else
- self.format_version = FORMAT_VERSION::v2
- end
-
if attributes.key?(:'response_condition')
self.response_condition = attributes[:'response_condition']
end
if attributes.key?(:'format')
self.format = attributes[:'format']
else
self.format = '{\"ddsource\":\"fastly\",\"service\":\"%{req.service_id}V\",\"date\":\"%{begin:%Y-%m-%dT%H:%M:%S%Z}t\",\"time_start\":\"%{begin:%Y-%m-%dT%H:%M:%S%Z}t\",\"time_end\":\"%{end:%Y-%m-%dT%H:%M:%S%Z}t\",\"http\":{\"request_time_ms\":\"%D\",\"method\":\"%m\",\"url\":\"%{json.escape(req.url)}V\",\"useragent\":\"%{User-Agent}i\",\"referer\":\"%{Referer}i\",\"protocol\":\"%H\",\"request_x_forwarded_for\":\"%{X-Forwarded-For}i\",\"status_code\":\"%s\"},\"network\":{\"client\":{\"ip\":\"%h\",\"name\":\"%{client.as.name}V\",\"number\":\"%{client.as.number}V\",\"connection_speed\":\"%{client.geo.conn_speed}V\"},\"destination\":{\"ip\":\"%A\"},\"geoip\":{\"geo_city\":\"%{client.geo.city.utf8}V\",\"geo_country_code\":\"%{client.geo.country_code}V\",\"geo_continent_code\":\"%{client.geo.continent_code}V\",\"geo_region\":\"%{client.geo.region}V\"},\"bytes_written\":\"%B\",\"bytes_read\":\"%{req.body_bytes_read}V\"},\"host\":\"%{Fastly-Orig-Host}i\",\"origin_host\":\"%v\",\"is_ipv6\":\"%{if(req.is_ipv6, \\\"true\\\", \\\"false\\\")}V\",\"is_tls\":\"%{if(req.is_ssl, \\\"true\\\", \\\"false\\\")}V\",\"tls_client_protocol\":\"%{json.escape(tls.client.protocol)}V\",\"tls_client_servername\":\"%{json.escape(tls.client.servername)}V\",\"tls_client_cipher\":\"%{json.escape(tls.client.cipher)}V\",\"tls_client_cipher_sha\":\"%{json.escape(tls.client.ciphers_sha)}V\",\"tls_client_tlsexts_sha\":\"%{json.escape(tls.client.tlsexts_sha)}V\",\"is_h2\":\"%{if(fastly_info.is_h2, \\\"true\\\", \\\"false\\\")}V\",\"is_h2_push\":\"%{if(fastly_info.h2.is_push, \\\"true\\\", \\\"false\\\")}V\",\"h2_stream_id\":\"%{fastly_info.h2.stream_id}V\",\"request_accept_content\":\"%{Accept}i\",\"request_accept_language\":\"%{Accept-Language}i\",\"request_accept_encoding\":\"%{Accept-Encoding}i\",\"request_accept_charset\":\"%{Accept-Charset}i\",\"request_connection\":\"%{Connection}i\",\"request_dnt\":\"%{DNT}i\",\"request_forwarded\":\"%{Forwarded}i\",\"request_via\":\"%{Via}i\",\"request_cache_control\":\"%{Cache-Control}i\",\"request_x_requested_with\":\"%{X-Requested-With}i\",\"request_x_att_device_id\":\"%{X-ATT-Device-Id}i\",\"content_type\":\"%{Content-Type}o\",\"is_cacheable\":\"%{if(fastly_info.state~\\\"^(HIT|MISS)$\\\", \\\"true\\\", \\\"false\\\")}V\",\"response_age\":\"%{Age}o\",\"response_cache_control\":\"%{Cache-Control}o\",\"response_expires\":\"%{Expires}o\",\"response_last_modified\":\"%{Last-Modified}o\",\"response_tsv\":\"%{TSV}o\",\"server_datacenter\":\"%{server.datacenter}V\",\"req_header_size\":\"%{req.header_bytes_read}V\",\"resp_header_size\":\"%{resp.header_bytes_written}V\",\"socket_cwnd\":\"%{client.socket.cwnd}V\",\"socket_nexthop\":\"%{client.socket.nexthop}V\",\"socket_tcpi_rcv_mss\":\"%{client.socket.tcpi_rcv_mss}V\",\"socket_tcpi_snd_mss\":\"%{client.socket.tcpi_snd_mss}V\",\"socket_tcpi_rtt\":\"%{client.socket.tcpi_rtt}V\",\"socket_tcpi_rttvar\":\"%{client.socket.tcpi_rttvar}V\",\"socket_tcpi_rcv_rtt\":\"%{client.socket.tcpi_rcv_rtt}V\",\"socket_tcpi_rcv_space\":\"%{client.socket.tcpi_rcv_space}V\",\"socket_tcpi_last_data_sent\":\"%{client.socket.tcpi_last_data_sent}V\",\"socket_tcpi_total_retrans\":\"%{client.socket.tcpi_total_retrans}V\",\"socket_tcpi_delta_retrans\":\"%{client.socket.tcpi_delta_retrans}V\",\"socket_ploss\":\"%{client.socket.ploss}V\"}'
end
+ if attributes.key?(:'format_version')
+ self.format_version = attributes[:'format_version']
+ else
+ self.format_version = '2'
+ end
+
if attributes.key?(:'region')
self.region = attributes[:'region']
else
self.region = 'US'
end
@@ -210,11 +211,11 @@
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
placement_validator = EnumAttributeValidator.new('String', ["none", "waf_debug", "null"])
return false unless placement_validator.valid?(@placement)
- format_version_validator = EnumAttributeValidator.new('Integer', [1, 2])
+ format_version_validator = EnumAttributeValidator.new('String', ["1", "2"])
return false unless format_version_validator.valid?(@format_version)
region_validator = EnumAttributeValidator.new('String', ["US", "EU"])
return false unless region_validator.valid?(@region)
true
end
@@ -230,11 +231,11 @@
end
# Custom attribute writer method checking allowed values (enum).
# @param [Object] format_version Object to be assigned
def format_version=(format_version)
- validator = EnumAttributeValidator.new('Integer', [1, 2])
+ validator = EnumAttributeValidator.new('String', ["1", "2"])
unless validator.valid?(format_version)
fail ArgumentError, "invalid value for \"format_version\", must be one of #{validator.allowable_values}."
end
@format_version = format_version
end
@@ -254,13 +255,13 @@
def ==(o)
return true if self.equal?(o)
self.class == o.class &&
name == o.name &&
placement == o.placement &&
- format_version == o.format_version &&
response_condition == o.response_condition &&
format == o.format &&
+ format_version == o.format_version &&
region == o.region &&
token == o.token &&
created_at == o.created_at &&
deleted_at == o.deleted_at &&
updated_at == o.updated_at &&
@@ -275,10 +276,10 @@
end
# Calculates hash code according to all attributes.
# @return [Integer] Hash code
def hash
- [name, placement, format_version, response_condition, format, region, token, created_at, deleted_at, updated_at, service_id, version].hash
+ [name, placement, response_condition, format, format_version, region, token, created_at, deleted_at, updated_at, service_id, version].hash
end
# Builds the object from hash
# @param [Hash] attributes Model attributes in the form of hash
# @return [Object] Returns the model itself