diff --git a/google/monitoring/v3/alert.proto b/google/monitoring/v3/alert.proto index 0f61bddf..a4ea225d 100644 --- a/google/monitoring/v3/alert.proto +++ b/google/monitoring/v3/alert.proto @@ -76,7 +76,7 @@ message AlertPolicy { // identifies which time series should be compared with the threshold. // // The filter is similar to the one that is specified in the - // [`MetricService.ListTimeSeries` + // [`ListTimeSeries` // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that // call is useful to verify the time series that will be retrieved / // processed) and must specify the metric type and optionally may contain @@ -91,8 +91,7 @@ message AlertPolicy { // members of a group of resrouces). Multiple aggregations // are applied in the order specified. // - // This field is similar to the one in the - // [`MetricService.ListTimeSeries` + // This field is similar to the one in the [`ListTimeSeries` // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It // is advisable to use the `ListTimeSeries` method when debugging this // field. @@ -163,7 +162,7 @@ message AlertPolicy { // identifies which time series should be compared with the threshold. // // The filter is similar to the one that is specified in the - // [`MetricService.ListTimeSeries` + // [`ListTimeSeries` // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that // call is useful to verify the time series that will be retrieved / // processed) and must specify the metric type and optionally may contain @@ -178,8 +177,7 @@ message AlertPolicy { // members of a group of resrouces). Multiple aggregations // are applied in the order specified. // - // This field is similar to the - // one in the [`MetricService.ListTimeSeries` + // This field is similar to the one in the [`ListTimeSeries` // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It // is advisable to use the `ListTimeSeries` method when debugging this // field. diff --git a/google/monitoring/v3/dropped_labels.proto b/google/monitoring/v3/dropped_labels.proto index 016ecf7b..9b943ccd 100644 --- a/google/monitoring/v3/dropped_labels.proto +++ b/google/monitoring/v3/dropped_labels.proto @@ -19,10 +19,10 @@ package google.monitoring.v3; option csharp_namespace = "Google.Cloud.Monitoring.V3"; option go_package = "google.golang.org/genproto/googleapis/monitoring/v3;monitoring"; -option php_namespace = "Google\\Cloud\\Monitoring\\V3"; option java_multiple_files = true; option java_outer_classname = "DroppedLabelsProto"; option java_package = "com.google.monitoring.v3"; +option php_namespace = "Google\\Cloud\\Monitoring\\V3"; // A set of (label, value) pairs which were dropped during aggregation, attached // to google.api.Distribution.Exemplars in google.api.Distribution values during diff --git a/google/monitoring/v3/metric.proto b/google/monitoring/v3/metric.proto index 4c5c0a84..3c202ed4 100644 --- a/google/monitoring/v3/metric.proto +++ b/google/monitoring/v3/metric.proto @@ -33,14 +33,14 @@ option php_namespace = "Google\\Cloud\\Monitoring\\V3"; // A single data point in a time series. message Point { // The time interval to which the data point applies. For `GAUGE` metrics, - // the start time is optional, but if it is supplied, it must equal the end - // time. For `DELTA` metrics, the start and end time should specify a - // non-zero interval, with subsequent points specifying contiguous and - // non-overlapping intervals. For `CUMULATIVE` metrics, the start and end - // time should specify a non-zero interval, with subsequent points specifying - // the same start time and increasing end times, until an event resets the - // cumulative value to zero and sets a new start time for the following - // points. + // the start time is optional, but if it is supplied, it must equal the + // end time. For `DELTA` metrics, the start + // and end time should specify a non-zero interval, with subsequent points + // specifying contiguous and non-overlapping intervals. For `CUMULATIVE` + // metrics, the start and end time should specify a non-zero interval, with + // subsequent points specifying the same start time and increasing end times, + // until an event resets the cumulative value to zero and sets a new start + // time for the following points. TimeInterval interval = 1; // The value of the data point. diff --git a/google/monitoring/v3/metric_service.proto b/google/monitoring/v3/metric_service.proto index 3dc20be9..101dee40 100644 --- a/google/monitoring/v3/metric_service.proto +++ b/google/monitoring/v3/metric_service.proto @@ -252,13 +252,15 @@ message ListTimeSeriesRequest { // in the response. TimeInterval interval = 4; - // By default, the raw time series data is returned. - // Use this field to combine multiple time series for different - // views of the data. + // Specifies the alignment of data points in individual time series as + // well as how to combine the retrieved time series across specified labels. + // + // By default (if no `aggregation` is explicitly specified), the raw time + // series data is returned. Aggregation aggregation = 5; // Unsupported: must be left blank. The points in each time series are - // returned in reverse time order. + // currently returned in reverse time order (most recent to oldest). string order_by = 6; // Specifies which information is returned about the time series. @@ -308,14 +310,32 @@ message CreateTimeSeriesRequest { repeated TimeSeries time_series = 2; } -// Describes the result of a failed request to write data to a time series. +// DEPRECATED. Used to hold per-time-series error status. message CreateTimeSeriesError { - // The time series, including the `Metric`, `MonitoredResource`, - // and `Point`s (including timestamp and value) that resulted - // in the error. This field provides all of the context that - // would be needed to retry the operation. - TimeSeries time_series = 1; + // DEPRECATED. Time series ID that resulted in the `status` error. + TimeSeries time_series = 1 [deprecated = true]; - // The status of the requested write operation. - google.rpc.Status status = 2; + // DEPRECATED. The status of the requested write operation for `time_series`. + google.rpc.Status status = 2 [deprecated = true]; +} + +// Summary of the result of a failed request to write data to a time series. +message CreateTimeSeriesSummary { + // Detailed information about an error category. + message Error { + // The status of the requested write operation. + google.rpc.Status status = 1; + + // The number of points that couldn't be written because of `status`. + int32 point_count = 2; + } + + // The number of points in the request. + int32 total_point_count = 1; + + // The number of points that were successfully written. + int32 success_point_count = 2; + + // The number of points that failed to be written. Order is not guaranteed. + repeated Error errors = 3; } diff --git a/google/monitoring/v3/notification.proto b/google/monitoring/v3/notification.proto index 4ee97b8f..939ca267 100644 --- a/google/monitoring/v3/notification.proto +++ b/google/monitoring/v3/notification.proto @@ -18,6 +18,7 @@ syntax = "proto3"; package google.monitoring.v3; import "google/api/label.proto"; +import "google/api/launch_stage.proto"; import "google/monitoring/v3/common.proto"; import "google/protobuf/wrappers.proto"; diff --git a/google/monitoring/v3/service.proto b/google/monitoring/v3/service.proto index 5622931c..7de20331 100644 --- a/google/monitoring/v3/service.proto +++ b/google/monitoring/v3/service.proto @@ -22,10 +22,12 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "google/type/calendar_period.proto"; +option csharp_namespace = "Google.Cloud.Monitoring.V3"; option go_package = "google.golang.org/genproto/googleapis/monitoring/v3;monitoring"; option java_multiple_files = true; option java_outer_classname = "ServiceMonitoringProto"; option java_package = "com.google.monitoring.v3"; +option php_namespace = "Google\\Cloud\\Monitoring\\V3"; // A `Service` is a discrete, autonomous, and network-accessible unit, designed // to solve an individual concern diff --git a/google/monitoring/v3/service_service.proto b/google/monitoring/v3/service_service.proto index 85cefa10..e0a35833 100644 --- a/google/monitoring/v3/service_service.proto +++ b/google/monitoring/v3/service_service.proto @@ -24,10 +24,12 @@ import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/api/client.proto"; +option csharp_namespace = "Google.Cloud.Monitoring.V3"; option go_package = "google.golang.org/genproto/googleapis/monitoring/v3;monitoring"; option java_multiple_files = true; option java_outer_classname = "ServiceMonitoringServiceProto"; option java_package = "com.google.monitoring.v3"; +option php_namespace = "Google\\Cloud\\Monitoring\\V3"; // The Stackdriver Monitoring Service-Oriented Monitoring API has endpoints for // managing and querying aspects of a workspace's services. These include the diff --git a/google/monitoring/v3/uptime.proto b/google/monitoring/v3/uptime.proto index 2601f531..eb424e97 100644 --- a/google/monitoring/v3/uptime.proto +++ b/google/monitoring/v3/uptime.proto @@ -27,27 +27,6 @@ option java_outer_classname = "UptimeProto"; option java_package = "com.google.monitoring.v3"; option php_namespace = "Google\\Cloud\\Monitoring\\V3"; -// The regions from which an Uptime check can be run. -enum UptimeCheckRegion { - // Default value if no region is specified. Will result in Uptime checks - // running from all regions. - REGION_UNSPECIFIED = 0; - - // Allows checks to run from locations within the United States of America. - USA = 1; - - // Allows checks to run from locations within the continent of Europe. - EUROPE = 2; - - // Allows checks to run from locations within the continent of South - // America. - SOUTH_AMERICA = 3; - - // Allows checks to run from locations within the Asia Pacific area (ex: - // Singapore). - ASIA_PACIFIC = 4; -} - // An internal checker allows Uptime checks to run on private/internal GCP // resources. message InternalChecker { @@ -104,21 +83,25 @@ message InternalChecker { State state = 7; } -// The supported resource types that can be used as values of -// `group_resource.resource_type`. -// `INSTANCE` includes `gce_instance` and `aws_ec2_instance` resource types. -// The resource types `gae_app` and `uptime_url` are not valid here because -// group checks on App Engine modules and URLs are not allowed. -enum GroupResourceType { - // Default value (not valid). - RESOURCE_TYPE_UNSPECIFIED = 0; +// The regions from which an Uptime check can be run. +enum UptimeCheckRegion { + // Default value if no region is specified. Will result in Uptime checks + // running from all regions. + REGION_UNSPECIFIED = 0; - // A group of instances from Google Cloud Platform (GCP) or - // Amazon Web Services (AWS). - INSTANCE = 1; + // Allows checks to run from locations within the United States of America. + USA = 1; - // A group of Amazon ELB load balancers. - AWS_ELB_LOAD_BALANCER = 2; + // Allows checks to run from locations within the continent of Europe. + EUROPE = 2; + + // Allows checks to run from locations within the continent of South + // America. + SOUTH_AMERICA = 3; + + // Allows checks to run from locations within the Asia Pacific area (ex: + // Singapore). + ASIA_PACIFIC = 4; } // This message configures which resources and services to monitor for @@ -202,8 +185,11 @@ message UptimeCheckConfig { int32 port = 1; } - // Used to perform string matching. It allows substring and regular - // expressions, together with their negations. + // Optional. Used to perform content matching. This allows matching based on + // substrings and regular expressions, together with their negations. Only the + // first 4 MB of an HTTP or HTTPS check's response (and the first + // 1 MB of a TCP check's response) are examined for purposes of content + // matching. message ContentMatcher { // Options to perform content matching. enum ContentMatcherOption { @@ -212,27 +198,28 @@ message UptimeCheckConfig { // Treated as `CONTAINS_STRING`. CONTENT_MATCHER_OPTION_UNSPECIFIED = 0; - // Selects substring matching (there is a match if the output contains - // the `content` string). This is the default value for checks without + // Selects substring matching. The match succeeds if the output contains + // the `content` string. This is the default value for checks without // a `matcher` option, or where the value of `matcher` is // `CONTENT_MATCHER_OPTION_UNSPECIFIED`. CONTAINS_STRING = 1; - // Selects negation of substring matching (there is a match if the output - // does NOT contain the `content` string). + // Selects negation of substring matching. The match succeeds if the + // output does _NOT_ contain the `content` string. NOT_CONTAINS_STRING = 2; - // Selects regular expression matching (there is a match of the output - // matches the regular expression specified in the `content` string). + // Selects regular-expression matching. The match succeeds of the output + // matches the regular expression specified in the `content` string. MATCHES_REGEX = 3; - // Selects negation of regular expression matching (there is a match if - // the output does NOT match the regular expression specified in the - // `content` string). + // Selects negation of regular-expression matching. The match succeeds if + // the output does _NOT_ match the regular expression specified in the + // `content` string. NOT_MATCHES_REGEX = 4; } - // String or regex content to match (max 1024 bytes) + // String or regex content to match. Maximum 1024 bytes. An empty `content` + // string indicates no content matching is to be performed. string content = 1; // The type of content matcher that will be applied to the server output, @@ -335,3 +322,20 @@ message UptimeCheckIp { // interpreting this field in either IPv4 or IPv6 format. string ip_address = 3; } + +// The supported resource types that can be used as values of +// `group_resource.resource_type`. +// `INSTANCE` includes `gce_instance` and `aws_ec2_instance` resource types. +// The resource types `gae_app` and `uptime_url` are not valid here because +// group checks on App Engine modules and URLs are not allowed. +enum GroupResourceType { + // Default value (not valid). + RESOURCE_TYPE_UNSPECIFIED = 0; + + // A group of instances from Google Cloud Platform (GCP) or + // Amazon Web Services (AWS). + INSTANCE = 1; + + // A group of Amazon ELB load balancers. + AWS_ELB_LOAD_BALANCER = 2; +}