From 040b8a0d95a2556b691982e4fc9b0824932e3cd8 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 9 Nov 2018 00:38:11 -0800 Subject: [PATCH] Regenerate monitoring client --- .../v3/NotificationChannelServiceGrpc.java | 8 +- .../google/monitoring/v3/InternalChecker.java | 534 ++++++++++-------- .../v3/InternalCheckerOrBuilder.java | 80 +-- .../v3/NotificationServiceProto.java | 186 +++--- .../com/google/monitoring/v3/ServiceTier.java | 12 +- .../monitoring/v3/UptimeCheckConfig.java | 125 ++-- .../v3/UptimeCheckConfigOrBuilder.java | 24 +- .../com/google/monitoring/v3/UptimeProto.java | 94 +-- .../proto/google/monitoring/v3/alert.proto | 3 +- .../google/monitoring/v3/alert_service.proto | 3 +- .../proto/google/monitoring/v3/common.proto | 11 +- .../google/monitoring/v3/dropped_labels.proto | 3 +- .../proto/google/monitoring/v3/group.proto | 3 +- .../google/monitoring/v3/group_service.proto | 3 +- .../proto/google/monitoring/v3/metric.proto | 3 +- .../google/monitoring/v3/metric_service.proto | 4 +- .../monitoring/v3/mutation_record.proto | 3 +- .../google/monitoring/v3/notification.proto | 3 +- .../monitoring/v3/notification_service.proto | 6 +- .../google/monitoring/v3/span_context.proto | 3 +- .../proto/google/monitoring/v3/uptime.proto | 54 +- .../google/monitoring/v3/uptime_service.proto | 3 +- .../v3/NotificationChannelServiceClient.java | 8 +- 23 files changed, 648 insertions(+), 528 deletions(-) diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelServiceGrpc.java b/google-api-grpc/grpc-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelServiceGrpc.java index 570127d157a6..d831f48f3e44 100644 --- a/google-api-grpc/grpc-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelServiceGrpc.java +++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelServiceGrpc.java @@ -482,7 +482,7 @@ public void getNotificationChannel(com.google.monitoring.v3.GetNotificationChann /** *
      * Creates a new notification channel, representing a single notification
-     * endpoint such as an email address, SMS number, or pagerduty service.
+     * endpoint such as an email address, SMS number, or PagerDuty service.
      * 
*/ public void createNotificationChannel(com.google.monitoring.v3.CreateNotificationChannelRequest request, @@ -714,7 +714,7 @@ public void getNotificationChannel(com.google.monitoring.v3.GetNotificationChann /** *
      * Creates a new notification channel, representing a single notification
-     * endpoint such as an email address, SMS number, or pagerduty service.
+     * endpoint such as an email address, SMS number, or PagerDuty service.
      * 
*/ public void createNotificationChannel(com.google.monitoring.v3.CreateNotificationChannelRequest request, @@ -873,7 +873,7 @@ public com.google.monitoring.v3.NotificationChannel getNotificationChannel(com.g /** *
      * Creates a new notification channel, representing a single notification
-     * endpoint such as an email address, SMS number, or pagerduty service.
+     * endpoint such as an email address, SMS number, or PagerDuty service.
      * 
*/ public com.google.monitoring.v3.NotificationChannel createNotificationChannel(com.google.monitoring.v3.CreateNotificationChannelRequest request) { @@ -1030,7 +1030,7 @@ public com.google.common.util.concurrent.ListenableFuture * Creates a new notification channel, representing a single notification - * endpoint such as an email address, SMS number, or pagerduty service. + * endpoint such as an email address, SMS number, or PagerDuty service. * */ public com.google.common.util.concurrent.ListenableFuture createNotificationChannel( diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java index 0f143b940dc5..7b161ec0aec1 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java @@ -5,7 +5,8 @@ /** *
- * Nimbus InternalCheckers.
+ * An internal checker allows uptime checks to run on private/internal GCP
+ * resources.
  * 
* * Protobuf type {@code google.monitoring.v3.InternalChecker} @@ -20,11 +21,11 @@ private InternalChecker(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } private InternalChecker() { - projectId_ = ""; + name_ = ""; + displayName_ = ""; network_ = ""; gcpZone_ = ""; - checkerId_ = ""; - displayName_ = ""; + peerProjectId_ = ""; } @java.lang.Override @@ -54,31 +55,31 @@ private InternalChecker( case 10: { java.lang.String s = input.readStringRequireUtf8(); - projectId_ = s; + name_ = s; break; } case 18: { java.lang.String s = input.readStringRequireUtf8(); - network_ = s; + displayName_ = s; break; } case 26: { java.lang.String s = input.readStringRequireUtf8(); - gcpZone_ = s; + network_ = s; break; } case 34: { java.lang.String s = input.readStringRequireUtf8(); - checkerId_ = s; + gcpZone_ = s; break; } - case 42: { + case 50: { java.lang.String s = input.readStringRequireUtf8(); - displayName_ = s; + peerProjectId_ = s; break; } default: { @@ -113,214 +114,226 @@ private InternalChecker( com.google.monitoring.v3.InternalChecker.class, com.google.monitoring.v3.InternalChecker.Builder.class); } - public static final int PROJECT_ID_FIELD_NUMBER = 1; - private volatile java.lang.Object projectId_; + public static final int NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object name_; /** *
-   * The GCP project ID. Not necessarily the same as the project_id for the
-   * config.
+   * A unique resource name for this InternalChecker. The format is:
+   *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+   * PROJECT_ID is the stackdriver workspace project for the
+   * uptime check config associated with the internal checker.
    * 
* - * string project_id = 1; + * string name = 1; */ - public java.lang.String getProjectId() { - java.lang.Object ref = projectId_; + public java.lang.String getName() { + java.lang.Object ref = name_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - projectId_ = s; + name_ = s; return s; } } /** *
-   * The GCP project ID. Not necessarily the same as the project_id for the
-   * config.
+   * A unique resource name for this InternalChecker. The format is:
+   *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+   * PROJECT_ID is the stackdriver workspace project for the
+   * uptime check config associated with the internal checker.
    * 
* - * string project_id = 1; + * string name = 1; */ public com.google.protobuf.ByteString - getProjectIdBytes() { - java.lang.Object ref = projectId_; + getNameBytes() { + java.lang.Object ref = name_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - projectId_ = b; + name_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int NETWORK_FIELD_NUMBER = 2; - private volatile java.lang.Object network_; + public static final int DISPLAY_NAME_FIELD_NUMBER = 2; + private volatile java.lang.Object displayName_; /** *
-   * The internal network to perform this uptime check on.
+   * The checker's human-readable name. The display name
+   * should be unique within a Stackdriver Workspace in order to make it easier
+   * to identify; however, uniqueness is not enforced.
    * 
* - * string network = 2; + * string display_name = 2; */ - public java.lang.String getNetwork() { - java.lang.Object ref = network_; + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - network_ = s; + displayName_ = s; return s; } } /** *
-   * The internal network to perform this uptime check on.
+   * The checker's human-readable name. The display name
+   * should be unique within a Stackdriver Workspace in order to make it easier
+   * to identify; however, uniqueness is not enforced.
    * 
* - * string network = 2; + * string display_name = 2; */ public com.google.protobuf.ByteString - getNetworkBytes() { - java.lang.Object ref = network_; + getDisplayNameBytes() { + java.lang.Object ref = displayName_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - network_ = b; + displayName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int GCP_ZONE_FIELD_NUMBER = 3; - private volatile java.lang.Object gcpZone_; + public static final int NETWORK_FIELD_NUMBER = 3; + private volatile java.lang.Object network_; /** *
-   * The GCP zone the uptime check should egress from. Only respected for
-   * internal uptime checks, where internal_network is specified.
+   * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+   * internal resource lives (ex: "default").
    * 
* - * string gcp_zone = 3; + * string network = 3; */ - public java.lang.String getGcpZone() { - java.lang.Object ref = gcpZone_; + public java.lang.String getNetwork() { + java.lang.Object ref = network_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gcpZone_ = s; + network_ = s; return s; } } /** *
-   * The GCP zone the uptime check should egress from. Only respected for
-   * internal uptime checks, where internal_network is specified.
+   * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+   * internal resource lives (ex: "default").
    * 
* - * string gcp_zone = 3; + * string network = 3; */ public com.google.protobuf.ByteString - getGcpZoneBytes() { - java.lang.Object ref = gcpZone_; + getNetworkBytes() { + java.lang.Object ref = network_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gcpZone_ = b; + network_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int CHECKER_ID_FIELD_NUMBER = 4; - private volatile java.lang.Object checkerId_; + public static final int GCP_ZONE_FIELD_NUMBER = 4; + private volatile java.lang.Object gcpZone_; /** *
-   * The checker ID.
+   * The GCP zone the uptime check should egress from. Only respected for
+   * internal uptime checks, where internal_network is specified.
    * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - public java.lang.String getCheckerId() { - java.lang.Object ref = checkerId_; + public java.lang.String getGcpZone() { + java.lang.Object ref = gcpZone_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - checkerId_ = s; + gcpZone_ = s; return s; } } /** *
-   * The checker ID.
+   * The GCP zone the uptime check should egress from. Only respected for
+   * internal uptime checks, where internal_network is specified.
    * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ public com.google.protobuf.ByteString - getCheckerIdBytes() { - java.lang.Object ref = checkerId_; + getGcpZoneBytes() { + java.lang.Object ref = gcpZone_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - checkerId_ = b; + gcpZone_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int DISPLAY_NAME_FIELD_NUMBER = 5; - private volatile java.lang.Object displayName_; + public static final int PEER_PROJECT_ID_FIELD_NUMBER = 6; + private volatile java.lang.Object peerProjectId_; /** *
-   * The checker's human-readable name.
+   * The GCP project_id where the internal checker lives. Not necessary
+   * the same as the workspace project.
    * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - public java.lang.String getDisplayName() { - java.lang.Object ref = displayName_; + public java.lang.String getPeerProjectId() { + java.lang.Object ref = peerProjectId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - displayName_ = s; + peerProjectId_ = s; return s; } } /** *
-   * The checker's human-readable name.
+   * The GCP project_id where the internal checker lives. Not necessary
+   * the same as the workspace project.
    * 
* - * string display_name = 5; + * string peer_project_id = 6; */ public com.google.protobuf.ByteString - getDisplayNameBytes() { - java.lang.Object ref = displayName_; + getPeerProjectIdBytes() { + java.lang.Object ref = peerProjectId_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - displayName_ = b; + peerProjectId_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -341,20 +354,20 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getProjectIdBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_); + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + } + if (!getDisplayNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_); } if (!getNetworkBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, network_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, network_); } if (!getGcpZoneBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, gcpZone_); - } - if (!getCheckerIdBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, checkerId_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, gcpZone_); } - if (!getDisplayNameBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_); + if (!getPeerProjectIdBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, peerProjectId_); } unknownFields.writeTo(output); } @@ -365,20 +378,20 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getProjectIdBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_); + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + } + if (!getDisplayNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_); } if (!getNetworkBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, network_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, network_); } if (!getGcpZoneBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, gcpZone_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, gcpZone_); } - if (!getCheckerIdBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, checkerId_); - } - if (!getDisplayNameBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_); + if (!getPeerProjectIdBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, peerProjectId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -396,16 +409,16 @@ public boolean equals(final java.lang.Object obj) { com.google.monitoring.v3.InternalChecker other = (com.google.monitoring.v3.InternalChecker) obj; boolean result = true; - result = result && getProjectId() - .equals(other.getProjectId()); + result = result && getName() + .equals(other.getName()); + result = result && getDisplayName() + .equals(other.getDisplayName()); result = result && getNetwork() .equals(other.getNetwork()); result = result && getGcpZone() .equals(other.getGcpZone()); - result = result && getCheckerId() - .equals(other.getCheckerId()); - result = result && getDisplayName() - .equals(other.getDisplayName()); + result = result && getPeerProjectId() + .equals(other.getPeerProjectId()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -417,16 +430,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; - hash = (53 * hash) + getProjectId().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; + hash = (53 * hash) + getDisplayName().hashCode(); hash = (37 * hash) + NETWORK_FIELD_NUMBER; hash = (53 * hash) + getNetwork().hashCode(); hash = (37 * hash) + GCP_ZONE_FIELD_NUMBER; hash = (53 * hash) + getGcpZone().hashCode(); - hash = (37 * hash) + CHECKER_ID_FIELD_NUMBER; - hash = (53 * hash) + getCheckerId().hashCode(); - hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; - hash = (53 * hash) + getDisplayName().hashCode(); + hash = (37 * hash) + PEER_PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPeerProjectId().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -524,7 +537,8 @@ protected Builder newBuilderForType( } /** *
-   * Nimbus InternalCheckers.
+   * An internal checker allows uptime checks to run on private/internal GCP
+   * resources.
    * 
* * Protobuf type {@code google.monitoring.v3.InternalChecker} @@ -564,15 +578,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - projectId_ = ""; + name_ = ""; + + displayName_ = ""; network_ = ""; gcpZone_ = ""; - checkerId_ = ""; - - displayName_ = ""; + peerProjectId_ = ""; return this; } @@ -600,11 +614,11 @@ public com.google.monitoring.v3.InternalChecker build() { @java.lang.Override public com.google.monitoring.v3.InternalChecker buildPartial() { com.google.monitoring.v3.InternalChecker result = new com.google.monitoring.v3.InternalChecker(this); - result.projectId_ = projectId_; + result.name_ = name_; + result.displayName_ = displayName_; result.network_ = network_; result.gcpZone_ = gcpZone_; - result.checkerId_ = checkerId_; - result.displayName_ = displayName_; + result.peerProjectId_ = peerProjectId_; onBuilt(); return result; } @@ -653,8 +667,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.monitoring.v3.InternalChecker other) { if (other == com.google.monitoring.v3.InternalChecker.getDefaultInstance()) return this; - if (!other.getProjectId().isEmpty()) { - projectId_ = other.projectId_; + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + if (!other.getDisplayName().isEmpty()) { + displayName_ = other.displayName_; onChanged(); } if (!other.getNetwork().isEmpty()) { @@ -665,12 +683,8 @@ public Builder mergeFrom(com.google.monitoring.v3.InternalChecker other) { gcpZone_ = other.gcpZone_; onChanged(); } - if (!other.getCheckerId().isEmpty()) { - checkerId_ = other.checkerId_; - onChanged(); - } - if (!other.getDisplayName().isEmpty()) { - displayName_ = other.displayName_; + if (!other.getPeerProjectId().isEmpty()) { + peerProjectId_ = other.peerProjectId_; onChanged(); } this.mergeUnknownFields(other.unknownFields); @@ -702,22 +716,24 @@ public Builder mergeFrom( return this; } - private java.lang.Object projectId_ = ""; + private java.lang.Object name_ = ""; /** *
-     * The GCP project ID. Not necessarily the same as the project_id for the
-     * config.
+     * A unique resource name for this InternalChecker. The format is:
+     *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+     * PROJECT_ID is the stackdriver workspace project for the
+     * uptime check config associated with the internal checker.
      * 
* - * string project_id = 1; + * string name = 1; */ - public java.lang.String getProjectId() { - java.lang.Object ref = projectId_; + public java.lang.String getName() { + java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - projectId_ = s; + name_ = s; return s; } else { return (java.lang.String) ref; @@ -725,20 +741,22 @@ public java.lang.String getProjectId() { } /** *
-     * The GCP project ID. Not necessarily the same as the project_id for the
-     * config.
+     * A unique resource name for this InternalChecker. The format is:
+     *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+     * PROJECT_ID is the stackdriver workspace project for the
+     * uptime check config associated with the internal checker.
      * 
* - * string project_id = 1; + * string name = 1; */ public com.google.protobuf.ByteString - getProjectIdBytes() { - java.lang.Object ref = projectId_; + getNameBytes() { + java.lang.Object ref = name_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - projectId_ = b; + name_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -746,71 +764,79 @@ public java.lang.String getProjectId() { } /** *
-     * The GCP project ID. Not necessarily the same as the project_id for the
-     * config.
+     * A unique resource name for this InternalChecker. The format is:
+     *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+     * PROJECT_ID is the stackdriver workspace project for the
+     * uptime check config associated with the internal checker.
      * 
* - * string project_id = 1; + * string name = 1; */ - public Builder setProjectId( + public Builder setName( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - projectId_ = value; + name_ = value; onChanged(); return this; } /** *
-     * The GCP project ID. Not necessarily the same as the project_id for the
-     * config.
+     * A unique resource name for this InternalChecker. The format is:
+     *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+     * PROJECT_ID is the stackdriver workspace project for the
+     * uptime check config associated with the internal checker.
      * 
* - * string project_id = 1; + * string name = 1; */ - public Builder clearProjectId() { + public Builder clearName() { - projectId_ = getDefaultInstance().getProjectId(); + name_ = getDefaultInstance().getName(); onChanged(); return this; } /** *
-     * The GCP project ID. Not necessarily the same as the project_id for the
-     * config.
+     * A unique resource name for this InternalChecker. The format is:
+     *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+     * PROJECT_ID is the stackdriver workspace project for the
+     * uptime check config associated with the internal checker.
      * 
* - * string project_id = 1; + * string name = 1; */ - public Builder setProjectIdBytes( + public Builder setNameBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - projectId_ = value; + name_ = value; onChanged(); return this; } - private java.lang.Object network_ = ""; + private java.lang.Object displayName_ = ""; /** *
-     * The internal network to perform this uptime check on.
+     * The checker's human-readable name. The display name
+     * should be unique within a Stackdriver Workspace in order to make it easier
+     * to identify; however, uniqueness is not enforced.
      * 
* - * string network = 2; + * string display_name = 2; */ - public java.lang.String getNetwork() { - java.lang.Object ref = network_; + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - network_ = s; + displayName_ = s; return s; } else { return (java.lang.String) ref; @@ -818,19 +844,21 @@ public java.lang.String getNetwork() { } /** *
-     * The internal network to perform this uptime check on.
+     * The checker's human-readable name. The display name
+     * should be unique within a Stackdriver Workspace in order to make it easier
+     * to identify; however, uniqueness is not enforced.
      * 
* - * string network = 2; + * string display_name = 2; */ public com.google.protobuf.ByteString - getNetworkBytes() { - java.lang.Object ref = network_; + getDisplayNameBytes() { + java.lang.Object ref = displayName_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - network_ = b; + displayName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -838,69 +866,75 @@ public java.lang.String getNetwork() { } /** *
-     * The internal network to perform this uptime check on.
+     * The checker's human-readable name. The display name
+     * should be unique within a Stackdriver Workspace in order to make it easier
+     * to identify; however, uniqueness is not enforced.
      * 
* - * string network = 2; + * string display_name = 2; */ - public Builder setNetwork( + public Builder setDisplayName( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - network_ = value; + displayName_ = value; onChanged(); return this; } /** *
-     * The internal network to perform this uptime check on.
+     * The checker's human-readable name. The display name
+     * should be unique within a Stackdriver Workspace in order to make it easier
+     * to identify; however, uniqueness is not enforced.
      * 
* - * string network = 2; + * string display_name = 2; */ - public Builder clearNetwork() { + public Builder clearDisplayName() { - network_ = getDefaultInstance().getNetwork(); + displayName_ = getDefaultInstance().getDisplayName(); onChanged(); return this; } /** *
-     * The internal network to perform this uptime check on.
+     * The checker's human-readable name. The display name
+     * should be unique within a Stackdriver Workspace in order to make it easier
+     * to identify; however, uniqueness is not enforced.
      * 
* - * string network = 2; + * string display_name = 2; */ - public Builder setNetworkBytes( + public Builder setDisplayNameBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - network_ = value; + displayName_ = value; onChanged(); return this; } - private java.lang.Object gcpZone_ = ""; + private java.lang.Object network_ = ""; /** *
-     * The GCP zone the uptime check should egress from. Only respected for
-     * internal uptime checks, where internal_network is specified.
+     * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+     * internal resource lives (ex: "default").
      * 
* - * string gcp_zone = 3; + * string network = 3; */ - public java.lang.String getGcpZone() { - java.lang.Object ref = gcpZone_; + public java.lang.String getNetwork() { + java.lang.Object ref = network_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gcpZone_ = s; + network_ = s; return s; } else { return (java.lang.String) ref; @@ -908,20 +942,20 @@ public java.lang.String getGcpZone() { } /** *
-     * The GCP zone the uptime check should egress from. Only respected for
-     * internal uptime checks, where internal_network is specified.
+     * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+     * internal resource lives (ex: "default").
      * 
* - * string gcp_zone = 3; + * string network = 3; */ public com.google.protobuf.ByteString - getGcpZoneBytes() { - java.lang.Object ref = gcpZone_; + getNetworkBytes() { + java.lang.Object ref = network_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gcpZone_ = b; + network_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -929,71 +963,72 @@ public java.lang.String getGcpZone() { } /** *
-     * The GCP zone the uptime check should egress from. Only respected for
-     * internal uptime checks, where internal_network is specified.
+     * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+     * internal resource lives (ex: "default").
      * 
* - * string gcp_zone = 3; + * string network = 3; */ - public Builder setGcpZone( + public Builder setNetwork( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gcpZone_ = value; + network_ = value; onChanged(); return this; } /** *
-     * The GCP zone the uptime check should egress from. Only respected for
-     * internal uptime checks, where internal_network is specified.
+     * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+     * internal resource lives (ex: "default").
      * 
* - * string gcp_zone = 3; + * string network = 3; */ - public Builder clearGcpZone() { + public Builder clearNetwork() { - gcpZone_ = getDefaultInstance().getGcpZone(); + network_ = getDefaultInstance().getNetwork(); onChanged(); return this; } /** *
-     * The GCP zone the uptime check should egress from. Only respected for
-     * internal uptime checks, where internal_network is specified.
+     * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+     * internal resource lives (ex: "default").
      * 
* - * string gcp_zone = 3; + * string network = 3; */ - public Builder setGcpZoneBytes( + public Builder setNetworkBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gcpZone_ = value; + network_ = value; onChanged(); return this; } - private java.lang.Object checkerId_ = ""; + private java.lang.Object gcpZone_ = ""; /** *
-     * The checker ID.
+     * The GCP zone the uptime check should egress from. Only respected for
+     * internal uptime checks, where internal_network is specified.
      * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - public java.lang.String getCheckerId() { - java.lang.Object ref = checkerId_; + public java.lang.String getGcpZone() { + java.lang.Object ref = gcpZone_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - checkerId_ = s; + gcpZone_ = s; return s; } else { return (java.lang.String) ref; @@ -1001,19 +1036,20 @@ public java.lang.String getCheckerId() { } /** *
-     * The checker ID.
+     * The GCP zone the uptime check should egress from. Only respected for
+     * internal uptime checks, where internal_network is specified.
      * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ public com.google.protobuf.ByteString - getCheckerIdBytes() { - java.lang.Object ref = checkerId_; + getGcpZoneBytes() { + java.lang.Object ref = gcpZone_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - checkerId_ = b; + gcpZone_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -1021,68 +1057,72 @@ public java.lang.String getCheckerId() { } /** *
-     * The checker ID.
+     * The GCP zone the uptime check should egress from. Only respected for
+     * internal uptime checks, where internal_network is specified.
      * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - public Builder setCheckerId( + public Builder setGcpZone( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - checkerId_ = value; + gcpZone_ = value; onChanged(); return this; } /** *
-     * The checker ID.
+     * The GCP zone the uptime check should egress from. Only respected for
+     * internal uptime checks, where internal_network is specified.
      * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - public Builder clearCheckerId() { + public Builder clearGcpZone() { - checkerId_ = getDefaultInstance().getCheckerId(); + gcpZone_ = getDefaultInstance().getGcpZone(); onChanged(); return this; } /** *
-     * The checker ID.
+     * The GCP zone the uptime check should egress from. Only respected for
+     * internal uptime checks, where internal_network is specified.
      * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - public Builder setCheckerIdBytes( + public Builder setGcpZoneBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - checkerId_ = value; + gcpZone_ = value; onChanged(); return this; } - private java.lang.Object displayName_ = ""; + private java.lang.Object peerProjectId_ = ""; /** *
-     * The checker's human-readable name.
+     * The GCP project_id where the internal checker lives. Not necessary
+     * the same as the workspace project.
      * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - public java.lang.String getDisplayName() { - java.lang.Object ref = displayName_; + public java.lang.String getPeerProjectId() { + java.lang.Object ref = peerProjectId_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - displayName_ = s; + peerProjectId_ = s; return s; } else { return (java.lang.String) ref; @@ -1090,19 +1130,20 @@ public java.lang.String getDisplayName() { } /** *
-     * The checker's human-readable name.
+     * The GCP project_id where the internal checker lives. Not necessary
+     * the same as the workspace project.
      * 
* - * string display_name = 5; + * string peer_project_id = 6; */ public com.google.protobuf.ByteString - getDisplayNameBytes() { - java.lang.Object ref = displayName_; + getPeerProjectIdBytes() { + java.lang.Object ref = peerProjectId_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - displayName_ = b; + peerProjectId_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -1110,49 +1151,52 @@ public java.lang.String getDisplayName() { } /** *
-     * The checker's human-readable name.
+     * The GCP project_id where the internal checker lives. Not necessary
+     * the same as the workspace project.
      * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - public Builder setDisplayName( + public Builder setPeerProjectId( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - displayName_ = value; + peerProjectId_ = value; onChanged(); return this; } /** *
-     * The checker's human-readable name.
+     * The GCP project_id where the internal checker lives. Not necessary
+     * the same as the workspace project.
      * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - public Builder clearDisplayName() { + public Builder clearPeerProjectId() { - displayName_ = getDefaultInstance().getDisplayName(); + peerProjectId_ = getDefaultInstance().getPeerProjectId(); onChanged(); return this; } /** *
-     * The checker's human-readable name.
+     * The GCP project_id where the internal checker lives. Not necessary
+     * the same as the workspace project.
      * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - public Builder setDisplayNameBytes( + public Builder setPeerProjectIdBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - displayName_ = value; + peerProjectId_ = value; onChanged(); return this; } diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalCheckerOrBuilder.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalCheckerOrBuilder.java index 03f2d8729869..a520d727d349 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalCheckerOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalCheckerOrBuilder.java @@ -9,95 +9,107 @@ public interface InternalCheckerOrBuilder extends /** *
-   * The GCP project ID. Not necessarily the same as the project_id for the
-   * config.
+   * A unique resource name for this InternalChecker. The format is:
+   *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+   * PROJECT_ID is the stackdriver workspace project for the
+   * uptime check config associated with the internal checker.
    * 
* - * string project_id = 1; + * string name = 1; */ - java.lang.String getProjectId(); + java.lang.String getName(); /** *
-   * The GCP project ID. Not necessarily the same as the project_id for the
-   * config.
+   * A unique resource name for this InternalChecker. The format is:
+   *   `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`.
+   * PROJECT_ID is the stackdriver workspace project for the
+   * uptime check config associated with the internal checker.
    * 
* - * string project_id = 1; + * string name = 1; */ com.google.protobuf.ByteString - getProjectIdBytes(); + getNameBytes(); /** *
-   * The internal network to perform this uptime check on.
+   * The checker's human-readable name. The display name
+   * should be unique within a Stackdriver Workspace in order to make it easier
+   * to identify; however, uniqueness is not enforced.
    * 
* - * string network = 2; + * string display_name = 2; */ - java.lang.String getNetwork(); + java.lang.String getDisplayName(); /** *
-   * The internal network to perform this uptime check on.
+   * The checker's human-readable name. The display name
+   * should be unique within a Stackdriver Workspace in order to make it easier
+   * to identify; however, uniqueness is not enforced.
    * 
* - * string network = 2; + * string display_name = 2; */ com.google.protobuf.ByteString - getNetworkBytes(); + getDisplayNameBytes(); /** *
-   * The GCP zone the uptime check should egress from. Only respected for
-   * internal uptime checks, where internal_network is specified.
+   * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+   * internal resource lives (ex: "default").
    * 
* - * string gcp_zone = 3; + * string network = 3; */ - java.lang.String getGcpZone(); + java.lang.String getNetwork(); /** *
-   * The GCP zone the uptime check should egress from. Only respected for
-   * internal uptime checks, where internal_network is specified.
+   * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the
+   * internal resource lives (ex: "default").
    * 
* - * string gcp_zone = 3; + * string network = 3; */ com.google.protobuf.ByteString - getGcpZoneBytes(); + getNetworkBytes(); /** *
-   * The checker ID.
+   * The GCP zone the uptime check should egress from. Only respected for
+   * internal uptime checks, where internal_network is specified.
    * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ - java.lang.String getCheckerId(); + java.lang.String getGcpZone(); /** *
-   * The checker ID.
+   * The GCP zone the uptime check should egress from. Only respected for
+   * internal uptime checks, where internal_network is specified.
    * 
* - * string checker_id = 4; + * string gcp_zone = 4; */ com.google.protobuf.ByteString - getCheckerIdBytes(); + getGcpZoneBytes(); /** *
-   * The checker's human-readable name.
+   * The GCP project_id where the internal checker lives. Not necessary
+   * the same as the workspace project.
    * 
* - * string display_name = 5; + * string peer_project_id = 6; */ - java.lang.String getDisplayName(); + java.lang.String getPeerProjectId(); /** *
-   * The checker's human-readable name.
+   * The GCP project_id where the internal checker lives. Not necessary
+   * the same as the workspace project.
    * 
* - * string display_name = 5; + * string peer_project_id = 6; */ com.google.protobuf.ByteString - getDisplayNameBytes(); + getPeerProjectIdBytes(); } diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java index c5441fe9a563..da50cecb3d07 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java @@ -93,98 +93,98 @@ public static void registerAllExtensions( "api/annotations.proto\032\'google/monitoring" + "/v3/notification.proto\032\033google/protobuf/" + "empty.proto\032 google/protobuf/field_mask." + - "proto\032\037google/protobuf/timestamp.proto\"`" + - "\n)ListNotificationChannelDescriptorsRequ" + - "est\022\014\n\004name\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\n" + - "page_token\030\003 \001(\t\"\227\001\n*ListNotificationCha" + - "nnelDescriptorsResponse\022P\n\023channel_descr" + - "iptors\030\001 \003(\01323.google.monitoring.v3.Noti" + - "ficationChannelDescriptor\022\027\n\017next_page_t" + - "oken\030\002 \001(\t\"7\n\'GetNotificationChannelDesc" + - "riptorRequest\022\014\n\004name\030\003 \001(\t\"y\n CreateNot" + - "ificationChannelRequest\022\014\n\004name\030\003 \001(\t\022G\n" + - "\024notification_channel\030\002 \001(\0132).google.mon" + - "itoring.v3.NotificationChannel\"x\n\037ListNo" + - "tificationChannelsRequest\022\014\n\004name\030\005 \001(\t\022" + - "\016\n\006filter\030\006 \001(\t\022\020\n\010order_by\030\007 \001(\t\022\021\n\tpag" + - "e_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n Lis" + - "tNotificationChannelsResponse\022H\n\025notific" + - "ation_channels\030\003 \003(\0132).google.monitoring" + - ".v3.NotificationChannel\022\027\n\017next_page_tok" + - "en\030\002 \001(\t\"-\n\035GetNotificationChannelReques" + - "t\022\014\n\004name\030\003 \001(\t\"\234\001\n UpdateNotificationCh" + - "annelRequest\022/\n\013update_mask\030\002 \001(\0132\032.goog" + - "le.protobuf.FieldMask\022G\n\024notification_ch" + - "annel\030\003 \001(\0132).google.monitoring.v3.Notif" + - "icationChannel\"?\n DeleteNotificationChan" + - "nelRequest\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\"" + - ">\n.SendNotificationChannelVerificationCo" + - "deRequest\022\014\n\004name\030\001 \001(\t\"n\n-GetNotificati" + - "onChannelVerificationCodeRequest\022\014\n\004name" + - "\030\001 \001(\t\022/\n\013expire_time\030\002 \001(\0132\032.google.pro" + - "tobuf.Timestamp\"o\n.GetNotificationChanne" + - "lVerificationCodeResponse\022\014\n\004code\030\001 \001(\t\022" + - "/\n\013expire_time\030\002 \001(\0132\032.google.protobuf.T" + - "imestamp\">\n VerifyNotificationChannelReq" + - "uest\022\014\n\004name\030\001 \001(\t\022\014\n\004code\030\002 \001(\t2\273\020\n\032Not" + - "ificationChannelService\022\345\001\n\"ListNotifica" + - "tionChannelDescriptors\022?.google.monitori" + - "ng.v3.ListNotificationChannelDescriptors" + - "Request\032@.google.monitoring.v3.ListNotif" + - "icationChannelDescriptorsResponse\"<\202\323\344\223\002" + - "6\0224/v3/{name=projects/*}/notificationCha" + - "nnelDescriptors\022\326\001\n GetNotificationChann" + - "elDescriptor\022=.google.monitoring.v3.GetN" + - "otificationChannelDescriptorRequest\0323.go" + - "ogle.monitoring.v3.NotificationChannelDe" + - "scriptor\">\202\323\344\223\0028\0226/v3/{name=projects/*/n" + - "otificationChannelDescriptors/*}\022\275\001\n\030Lis" + - "tNotificationChannels\0225.google.monitorin" + - "g.v3.ListNotificationChannelsRequest\0326.g" + - "oogle.monitoring.v3.ListNotificationChan" + - "nelsResponse\"2\202\323\344\223\002,\022*/v3/{name=projects" + - "/*}/notificationChannels\022\256\001\n\026GetNotifica" + - "tionChannel\0223.google.monitoring.v3.GetNo" + - "tificationChannelRequest\032).google.monito" + - "ring.v3.NotificationChannel\"4\202\323\344\223\002.\022,/v3" + - "/{name=projects/*/notificationChannels/*" + - "}\022\310\001\n\031CreateNotificationChannel\0226.google" + - ".monitoring.v3.CreateNotificationChannel" + - "Request\032).google.monitoring.v3.Notificat" + - "ionChannel\"H\202\323\344\223\002B\"*/v3/{name=projects/*" + - "}/notificationChannels:\024notification_cha" + - "nnel\022\337\001\n\031UpdateNotificationChannel\0226.goo" + - "gle.monitoring.v3.UpdateNotificationChan" + - "nelRequest\032).google.monitoring.v3.Notifi" + - "cationChannel\"_\202\323\344\223\002Y2A/v3/{notification" + - "_channel.name=projects/*/notificationCha" + - "nnels/*}:\024notification_channel\022\241\001\n\031Delet" + - "eNotificationChannel\0226.google.monitoring" + - ".v3.DeleteNotificationChannelRequest\032\026.g" + - "oogle.protobuf.Empty\"4\202\323\344\223\002.*,/v3/{name=" + - "projects/*/notificationChannels/*}\022\325\001\n\'S" + - "endNotificationChannelVerificationCode\022D" + - ".google.monitoring.v3.SendNotificationCh" + - "annelVerificationCodeRequest\032\026.google.pr" + - "otobuf.Empty\"L\202\323\344\223\002F\"A/v3/{name=projects" + - "/*/notificationChannels/*}:sendVerificat" + - "ionCode:\001*\022\200\002\n&GetNotificationChannelVer" + - "ificationCode\022C.google.monitoring.v3.Get" + - "NotificationChannelVerificationCodeReque" + - "st\032D.google.monitoring.v3.GetNotificatio" + - "nChannelVerificationCodeResponse\"K\202\323\344\223\002E" + - "\"@/v3/{name=projects/*/notificationChann" + - "els/*}:getVerificationCode:\001*\022\276\001\n\031Verify" + - "NotificationChannel\0226.google.monitoring." + - "v3.VerifyNotificationChannelRequest\032).go" + - "ogle.monitoring.v3.NotificationChannel\">" + - "\202\323\344\223\0028\"3/v3/{name=projects/*/notificatio" + - "nChannels/*}:verify:\001*B\260\001\n\030com.google.mo" + - "nitoring.v3B\030NotificationServiceProtoP\001Z" + - ">google.golang.org/genproto/googleapis/m" + - "onitoring/v3;monitoring\252\002\032Google.Cloud.M" + - "onitoring.V3\312\002\032Google\\Cloud\\Monitoring\\V" + - "3b\006proto3" + "proto\032\034google/protobuf/struct.proto\032\037goo" + + "gle/protobuf/timestamp.proto\"`\n)ListNoti" + + "ficationChannelDescriptorsRequest\022\014\n\004nam" + + "e\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token" + + "\030\003 \001(\t\"\227\001\n*ListNotificationChannelDescri" + + "ptorsResponse\022P\n\023channel_descriptors\030\001 \003" + + "(\01323.google.monitoring.v3.NotificationCh" + + "annelDescriptor\022\027\n\017next_page_token\030\002 \001(\t" + + "\"7\n\'GetNotificationChannelDescriptorRequ" + + "est\022\014\n\004name\030\003 \001(\t\"y\n CreateNotificationC" + + "hannelRequest\022\014\n\004name\030\003 \001(\t\022G\n\024notificat" + + "ion_channel\030\002 \001(\0132).google.monitoring.v3" + + ".NotificationChannel\"x\n\037ListNotification" + + "ChannelsRequest\022\014\n\004name\030\005 \001(\t\022\016\n\006filter\030" + + "\006 \001(\t\022\020\n\010order_by\030\007 \001(\t\022\021\n\tpage_size\030\003 \001" + + "(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n ListNotificat" + + "ionChannelsResponse\022H\n\025notification_chan" + + "nels\030\003 \003(\0132).google.monitoring.v3.Notifi" + + "cationChannel\022\027\n\017next_page_token\030\002 \001(\t\"-" + + "\n\035GetNotificationChannelRequest\022\014\n\004name\030" + + "\003 \001(\t\"\234\001\n UpdateNotificationChannelReque" + + "st\022/\n\013update_mask\030\002 \001(\0132\032.google.protobu" + + "f.FieldMask\022G\n\024notification_channel\030\003 \001(" + + "\0132).google.monitoring.v3.NotificationCha" + + "nnel\"?\n DeleteNotificationChannelRequest" + + "\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\">\n.SendNot" + + "ificationChannelVerificationCodeRequest\022" + + "\014\n\004name\030\001 \001(\t\"n\n-GetNotificationChannelV" + + "erificationCodeRequest\022\014\n\004name\030\001 \001(\t\022/\n\013" + + "expire_time\030\002 \001(\0132\032.google.protobuf.Time" + + "stamp\"o\n.GetNotificationChannelVerificat" + + "ionCodeResponse\022\014\n\004code\030\001 \001(\t\022/\n\013expire_" + + "time\030\002 \001(\0132\032.google.protobuf.Timestamp\">" + + "\n VerifyNotificationChannelRequest\022\014\n\004na" + + "me\030\001 \001(\t\022\014\n\004code\030\002 \001(\t2\273\020\n\032NotificationC" + + "hannelService\022\345\001\n\"ListNotificationChanne" + + "lDescriptors\022?.google.monitoring.v3.List" + + "NotificationChannelDescriptorsRequest\032@." + + "google.monitoring.v3.ListNotificationCha" + + "nnelDescriptorsResponse\"<\202\323\344\223\0026\0224/v3/{na" + + "me=projects/*}/notificationChannelDescri" + + "ptors\022\326\001\n GetNotificationChannelDescript" + + "or\022=.google.monitoring.v3.GetNotificatio" + + "nChannelDescriptorRequest\0323.google.monit" + + "oring.v3.NotificationChannelDescriptor\">" + + "\202\323\344\223\0028\0226/v3/{name=projects/*/notificatio" + + "nChannelDescriptors/*}\022\275\001\n\030ListNotificat" + + "ionChannels\0225.google.monitoring.v3.ListN" + + "otificationChannelsRequest\0326.google.moni" + + "toring.v3.ListNotificationChannelsRespon" + + "se\"2\202\323\344\223\002,\022*/v3/{name=projects/*}/notifi" + + "cationChannels\022\256\001\n\026GetNotificationChanne" + + "l\0223.google.monitoring.v3.GetNotification" + + "ChannelRequest\032).google.monitoring.v3.No" + + "tificationChannel\"4\202\323\344\223\002.\022,/v3/{name=pro" + + "jects/*/notificationChannels/*}\022\310\001\n\031Crea" + + "teNotificationChannel\0226.google.monitorin" + + "g.v3.CreateNotificationChannelRequest\032)." + + "google.monitoring.v3.NotificationChannel" + + "\"H\202\323\344\223\002B\"*/v3/{name=projects/*}/notifica" + + "tionChannels:\024notification_channel\022\337\001\n\031U" + + "pdateNotificationChannel\0226.google.monito" + + "ring.v3.UpdateNotificationChannelRequest" + + "\032).google.monitoring.v3.NotificationChan" + + "nel\"_\202\323\344\223\002Y2A/v3/{notification_channel.n" + + "ame=projects/*/notificationChannels/*}:\024" + + "notification_channel\022\241\001\n\031DeleteNotificat" + + "ionChannel\0226.google.monitoring.v3.Delete" + + "NotificationChannelRequest\032\026.google.prot" + + "obuf.Empty\"4\202\323\344\223\002.*,/v3/{name=projects/*" + + "/notificationChannels/*}\022\325\001\n\'SendNotific" + + "ationChannelVerificationCode\022D.google.mo" + + "nitoring.v3.SendNotificationChannelVerif" + + "icationCodeRequest\032\026.google.protobuf.Emp" + + "ty\"L\202\323\344\223\002F\"A/v3/{name=projects/*/notific" + + "ationChannels/*}:sendVerificationCode:\001*" + + "\022\200\002\n&GetNotificationChannelVerificationC" + + "ode\022C.google.monitoring.v3.GetNotificati" + + "onChannelVerificationCodeRequest\032D.googl" + + "e.monitoring.v3.GetNotificationChannelVe" + + "rificationCodeResponse\"K\202\323\344\223\002E\"@/v3/{nam" + + "e=projects/*/notificationChannels/*}:get" + + "VerificationCode:\001*\022\276\001\n\031VerifyNotificati" + + "onChannel\0226.google.monitoring.v3.VerifyN" + + "otificationChannelRequest\032).google.monit" + + "oring.v3.NotificationChannel\">\202\323\344\223\0028\"3/v" + + "3/{name=projects/*/notificationChannels/" + + "*}:verify:\001*B\260\001\n\030com.google.monitoring.v" + + "3B\030NotificationServiceProtoP\001Z>google.go" + + "lang.org/genproto/googleapis/monitoring/" + + "v3;monitoring\252\002\032Google.Cloud.Monitoring." + + "V3\312\002\032Google\\Cloud\\Monitoring\\V3b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -201,6 +201,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.monitoring.v3.NotificationProto.getDescriptor(), com.google.protobuf.EmptyProto.getDescriptor(), com.google.protobuf.FieldMaskProto.getDescriptor(), + com.google.protobuf.StructProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), }, assigner); internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_descriptor = @@ -290,6 +291,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.monitoring.v3.NotificationProto.getDescriptor(); com.google.protobuf.EmptyProto.getDescriptor(); com.google.protobuf.FieldMaskProto.getDescriptor(); + com.google.protobuf.StructProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); } diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ServiceTier.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ServiceTier.java index e60b19390cc9..1760c93d2933 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ServiceTier.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ServiceTier.java @@ -5,8 +5,8 @@ /** *
- * The tier of service for a Stackdriver account. Please see the
- * [service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers)
+ * The tier of service for a Workspace. Please see the
+ * [service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers)
  * for more details.
  * 
* @@ -28,7 +28,7 @@ public enum ServiceTier * The Stackdriver Basic tier, a free tier of service that provides basic * features, a moderate allotment of logs, and access to built-in metrics. * A number of features are not available in this tier. For more details, - * see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + * see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). * * * SERVICE_TIER_BASIC = 1; @@ -39,7 +39,7 @@ public enum ServiceTier * The Stackdriver Premium tier, a higher, more expensive tier of service * that provides access to all Stackdriver features, lets you use Stackdriver * with AWS accounts, and has a larger allotments for logs and metrics. For - * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). * * * SERVICE_TIER_PREMIUM = 2; @@ -62,7 +62,7 @@ public enum ServiceTier * The Stackdriver Basic tier, a free tier of service that provides basic * features, a moderate allotment of logs, and access to built-in metrics. * A number of features are not available in this tier. For more details, - * see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + * see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). * * * SERVICE_TIER_BASIC = 1; @@ -73,7 +73,7 @@ public enum ServiceTier * The Stackdriver Premium tier, a higher, more expensive tier of service * that provides access to all Stackdriver features, lets you use Stackdriver * with AWS accounts, and has a larger allotments for logs and metrics. For - * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). * * * SERVICE_TIER_PREMIUM = 2; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java index 661ec9729c13..fba7f8624738 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java @@ -3915,7 +3915,7 @@ public interface ContentMatcherOrBuilder extends /** *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -3923,7 +3923,7 @@ public interface ContentMatcherOrBuilder extends java.lang.String getContent(); /** *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -3933,9 +3933,8 @@ public interface ContentMatcherOrBuilder extends } /** *
-   * Used to perform string matching. Currently, this matches on the exact
-   * content. In the future, it can be expanded to allow for regular expressions
-   * and more complex matching.
+   * Used to perform string matching. It allows substring and regular
+   * expressions, together with their negations.
    * 
* * Protobuf type {@code google.monitoring.v3.UptimeCheckConfig.ContentMatcher} @@ -4019,7 +4018,7 @@ private ContentMatcher( private volatile java.lang.Object content_; /** *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -4038,7 +4037,7 @@ public java.lang.String getContent() { } /** *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -4214,9 +4213,8 @@ protected Builder newBuilderForType( } /** *
-     * Used to perform string matching. Currently, this matches on the exact
-     * content. In the future, it can be expanded to allow for regular expressions
-     * and more complex matching.
+     * Used to perform string matching. It allows substring and regular
+     * expressions, together with their negations.
      * 
* * Protobuf type {@code google.monitoring.v3.UptimeCheckConfig.ContentMatcher} @@ -4369,7 +4367,7 @@ public Builder mergeFrom( private java.lang.Object content_ = ""; /** *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4388,7 +4386,7 @@ public java.lang.String getContent() { } /** *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4408,7 +4406,7 @@ public java.lang.String getContent() { } /** *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4425,7 +4423,7 @@ public Builder setContent( } /** *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4438,7 +4436,7 @@ public Builder clearContent() { } /** *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4639,7 +4637,7 @@ public java.lang.String getName() { /** *
    * A human-friendly name for the uptime check configuration. The display name
-   * should be unique within a Stackdriver Account in order to make it easier
+   * should be unique within a Stackdriver Workspace in order to make it easier
    * to identify; however, uniqueness is not enforced. Required.
    * 
* @@ -4660,7 +4658,7 @@ public java.lang.String getDisplayName() { /** *
    * A human-friendly name for the uptime check configuration. The display name
-   * should be unique within a Stackdriver Account in order to make it easier
+   * should be unique within a Stackdriver Workspace in order to make it easier
    * to identify; however, uniqueness is not enforced. Required.
    * 
* @@ -5024,6 +5022,7 @@ public com.google.monitoring.v3.UptimeCheckRegion convert(java.lang.Integer from /** *
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -5039,6 +5038,7 @@ public java.util.List getSelectedReg
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -5053,6 +5053,7 @@ public int getSelectedRegionsCount() {
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -5067,6 +5068,7 @@ public com.google.monitoring.v3.UptimeCheckRegion getSelectedRegions(int index)
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -5082,6 +5084,7 @@ public com.google.monitoring.v3.UptimeCheckRegion getSelectedRegions(int index)
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -5099,7 +5102,10 @@ public int getSelectedRegionsValue(int index) {
   private boolean isInternal_;
   /**
    * 
-   * Denotes whether this is a check that egresses from InternalCheckers.
+   * If this is true, then checks are made only from the 'internal_checkers'.
+   * If it is false, then checks are made only from the 'selected_regions'.
+   * It is an error to provide 'selected_regions' when is_internal is true,
+   * or to provide 'internal_checkers' when is_internal is false.
    * 
* * bool is_internal = 15; @@ -5113,7 +5119,7 @@ public boolean getIsInternal() { /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -5125,7 +5131,7 @@ public java.util.List getInternalCheck /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -5138,7 +5144,7 @@ public java.util.List getInternalCheck /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -5150,7 +5156,7 @@ public int getInternalCheckersCount() { /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -5162,7 +5168,7 @@ public com.google.monitoring.v3.InternalChecker getInternalCheckers(int index) { /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -6017,7 +6023,7 @@ public Builder setNameBytes( /** *
      * A human-friendly name for the uptime check configuration. The display name
-     * should be unique within a Stackdriver Account in order to make it easier
+     * should be unique within a Stackdriver Workspace in order to make it easier
      * to identify; however, uniqueness is not enforced. Required.
      * 
* @@ -6038,7 +6044,7 @@ public java.lang.String getDisplayName() { /** *
      * A human-friendly name for the uptime check configuration. The display name
-     * should be unique within a Stackdriver Account in order to make it easier
+     * should be unique within a Stackdriver Workspace in order to make it easier
      * to identify; however, uniqueness is not enforced. Required.
      * 
* @@ -6060,7 +6066,7 @@ public java.lang.String getDisplayName() { /** *
      * A human-friendly name for the uptime check configuration. The display name
-     * should be unique within a Stackdriver Account in order to make it easier
+     * should be unique within a Stackdriver Workspace in order to make it easier
      * to identify; however, uniqueness is not enforced. Required.
      * 
* @@ -6079,7 +6085,7 @@ public Builder setDisplayName( /** *
      * A human-friendly name for the uptime check configuration. The display name
-     * should be unique within a Stackdriver Account in order to make it easier
+     * should be unique within a Stackdriver Workspace in order to make it easier
      * to identify; however, uniqueness is not enforced. Required.
      * 
* @@ -6094,7 +6100,7 @@ public Builder clearDisplayName() { /** *
      * A human-friendly name for the uptime check configuration. The display name
-     * should be unique within a Stackdriver Account in order to make it easier
+     * should be unique within a Stackdriver Workspace in order to make it easier
      * to identify; however, uniqueness is not enforced. Required.
      * 
* @@ -7609,6 +7615,7 @@ private void ensureSelectedRegionsIsMutable() { /** *
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7624,6 +7631,7 @@ public java.util.List getSelectedReg
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7638,6 +7646,7 @@ public int getSelectedRegionsCount() {
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7652,6 +7661,7 @@ public com.google.monitoring.v3.UptimeCheckRegion getSelectedRegions(int index)
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7673,6 +7683,7 @@ public Builder setSelectedRegions(
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7693,6 +7704,7 @@ public Builder addSelectedRegions(com.google.monitoring.v3.UptimeCheckRegion val
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7713,6 +7725,7 @@ public Builder addAllSelectedRegions(
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7730,6 +7743,7 @@ public Builder clearSelectedRegions() {
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7745,6 +7759,7 @@ public Builder clearSelectedRegions() {
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7759,6 +7774,7 @@ public int getSelectedRegionsValue(int index) {
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7777,6 +7793,7 @@ public Builder setSelectedRegionsValue(
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7794,6 +7811,7 @@ public Builder addSelectedRegionsValue(int value) {
     /**
      * 
      * The list of regions from which the check will be run.
+     * Some regions contain one location, and others contain more than one.
      * If this field is specified, enough regions to include a minimum of
      * 3 locations must be provided, or an error message is returned.
      * Not specifying this field will result in uptime checks running from all
@@ -7815,7 +7833,10 @@ public Builder addAllSelectedRegionsValue(
     private boolean isInternal_ ;
     /**
      * 
-     * Denotes whether this is a check that egresses from InternalCheckers.
+     * If this is true, then checks are made only from the 'internal_checkers'.
+     * If it is false, then checks are made only from the 'selected_regions'.
+     * It is an error to provide 'selected_regions' when is_internal is true,
+     * or to provide 'internal_checkers' when is_internal is false.
      * 
* * bool is_internal = 15; @@ -7825,7 +7846,10 @@ public boolean getIsInternal() { } /** *
-     * Denotes whether this is a check that egresses from InternalCheckers.
+     * If this is true, then checks are made only from the 'internal_checkers'.
+     * If it is false, then checks are made only from the 'selected_regions'.
+     * It is an error to provide 'selected_regions' when is_internal is true,
+     * or to provide 'internal_checkers' when is_internal is false.
      * 
* * bool is_internal = 15; @@ -7838,7 +7862,10 @@ public Builder setIsInternal(boolean value) { } /** *
-     * Denotes whether this is a check that egresses from InternalCheckers.
+     * If this is true, then checks are made only from the 'internal_checkers'.
+     * If it is false, then checks are made only from the 'selected_regions'.
+     * It is an error to provide 'selected_regions' when is_internal is true,
+     * or to provide 'internal_checkers' when is_internal is false.
      * 
* * bool is_internal = 15; @@ -7865,7 +7892,7 @@ private void ensureInternalCheckersIsMutable() { /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7881,7 +7908,7 @@ public java.util.List getInternalCheck /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7897,7 +7924,7 @@ public int getInternalCheckersCount() { /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7913,7 +7940,7 @@ public com.google.monitoring.v3.InternalChecker getInternalCheckers(int index) { /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7936,7 +7963,7 @@ public Builder setInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7956,7 +7983,7 @@ public Builder setInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -7978,7 +8005,7 @@ public Builder addInternalCheckers(com.google.monitoring.v3.InternalChecker valu /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8001,7 +8028,7 @@ public Builder addInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8021,7 +8048,7 @@ public Builder addInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8041,7 +8068,7 @@ public Builder addInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8062,7 +8089,7 @@ public Builder addAllInternalCheckers( /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8081,7 +8108,7 @@ public Builder clearInternalCheckers() { /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8100,7 +8127,7 @@ public Builder removeInternalCheckers(int index) { /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8113,7 +8140,7 @@ public com.google.monitoring.v3.InternalChecker.Builder getInternalCheckersBuild /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8129,7 +8156,7 @@ public com.google.monitoring.v3.InternalCheckerOrBuilder getInternalCheckersOrBu /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8146,7 +8173,7 @@ public com.google.monitoring.v3.InternalCheckerOrBuilder getInternalCheckersOrBu /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8159,7 +8186,7 @@ public com.google.monitoring.v3.InternalChecker.Builder addInternalCheckersBuild /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* @@ -8173,7 +8200,7 @@ public com.google.monitoring.v3.InternalChecker.Builder addInternalCheckersBuild /** *
      * The internal checkers that this check will egress from. If `is_internal` is
-     * true and this list is empty, the check will egress from all
+     * true and this list is empty, the check will egress from all the
      * InternalCheckers configured for the project that owns this CheckConfig.
      * 
* diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigOrBuilder.java index 3c8606ca4375..0fe84272bcab 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigOrBuilder.java @@ -36,7 +36,7 @@ public interface UptimeCheckConfigOrBuilder extends /** *
    * A human-friendly name for the uptime check configuration. The display name
-   * should be unique within a Stackdriver Account in order to make it easier
+   * should be unique within a Stackdriver Workspace in order to make it easier
    * to identify; however, uniqueness is not enforced. Required.
    * 
* @@ -46,7 +46,7 @@ public interface UptimeCheckConfigOrBuilder extends /** *
    * A human-friendly name for the uptime check configuration. The display name
-   * should be unique within a Stackdriver Account in order to make it easier
+   * should be unique within a Stackdriver Workspace in order to make it easier
    * to identify; however, uniqueness is not enforced. Required.
    * 
* @@ -308,6 +308,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -320,6 +321,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -332,6 +334,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -344,6 +347,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -357,6 +361,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat
   /**
    * 
    * The list of regions from which the check will be run.
+   * Some regions contain one location, and others contain more than one.
    * If this field is specified, enough regions to include a minimum of
    * 3 locations must be provided, or an error message is returned.
    * Not specifying this field will result in uptime checks running from all
@@ -369,7 +374,10 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat
 
   /**
    * 
-   * Denotes whether this is a check that egresses from InternalCheckers.
+   * If this is true, then checks are made only from the 'internal_checkers'.
+   * If it is false, then checks are made only from the 'selected_regions'.
+   * It is an error to provide 'selected_regions' when is_internal is true,
+   * or to provide 'internal_checkers' when is_internal is false.
    * 
* * bool is_internal = 15; @@ -379,7 +387,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -390,7 +398,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -400,7 +408,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -410,7 +418,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* @@ -421,7 +429,7 @@ com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getContentMat /** *
    * The internal checkers that this check will egress from. If `is_internal` is
-   * true and this list is empty, the check will egress from all
+   * true and this list is empty, the check will egress from all the
    * InternalCheckers configured for the project that owns this CheckConfig.
    * 
* diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java index 07a8dc8133e4..8e6ca5f44c1c 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java @@ -71,52 +71,52 @@ public static void registerAllExtensions( "\n!google/monitoring/v3/uptime.proto\022\024goo" + "gle.monitoring.v3\032#google/api/monitored_" + "resource.proto\032\036google/protobuf/duration" + - ".proto\"r\n\017InternalChecker\022\022\n\nproject_id\030" + - "\001 \001(\t\022\017\n\007network\030\002 \001(\t\022\020\n\010gcp_zone\030\003 \001(\t" + - "\022\022\n\nchecker_id\030\004 \001(\t\022\024\n\014display_name\030\005 \001" + - "(\t\"\301\t\n\021UptimeCheckConfig\022\014\n\004name\030\001 \001(\t\022\024" + - "\n\014display_name\030\002 \001(\t\022;\n\022monitored_resour" + - "ce\030\003 \001(\0132\035.google.api.MonitoredResourceH" + - "\000\022O\n\016resource_group\030\004 \001(\01325.google.monit" + - "oring.v3.UptimeCheckConfig.ResourceGroup" + - "H\000\022G\n\nhttp_check\030\005 \001(\01321.google.monitori" + - "ng.v3.UptimeCheckConfig.HttpCheckH\001\022E\n\tt" + - "cp_check\030\006 \001(\01320.google.monitoring.v3.Up" + - "timeCheckConfig.TcpCheckH\001\022)\n\006period\030\007 \001" + - "(\0132\031.google.protobuf.Duration\022*\n\007timeout" + - "\030\010 \001(\0132\031.google.protobuf.Duration\022P\n\020con" + - "tent_matchers\030\t \003(\01326.google.monitoring." + - "v3.UptimeCheckConfig.ContentMatcher\022A\n\020s" + - "elected_regions\030\n \003(\0162\'.google.monitorin" + - "g.v3.UptimeCheckRegion\022\023\n\013is_internal\030\017 " + - "\001(\010\022@\n\021internal_checkers\030\016 \003(\0132%.google." + - "monitoring.v3.InternalChecker\032a\n\rResourc" + - "eGroup\022\020\n\010group_id\030\001 \001(\t\022>\n\rresource_typ" + - "e\030\002 \001(\0162\'.google.monitoring.v3.GroupReso" + - "urceType\032\344\002\n\tHttpCheck\022\017\n\007use_ssl\030\001 \001(\010\022" + - "\014\n\004path\030\002 \001(\t\022\014\n\004port\030\003 \001(\005\022X\n\tauth_info" + - "\030\004 \001(\0132E.google.monitoring.v3.UptimeChec" + - "kConfig.HttpCheck.BasicAuthentication\022\024\n" + - "\014mask_headers\030\005 \001(\010\022O\n\007headers\030\006 \003(\0132>.g" + - "oogle.monitoring.v3.UptimeCheckConfig.Ht" + - "tpCheck.HeadersEntry\0329\n\023BasicAuthenticat" + - "ion\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032" + - ".\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " + - "\001(\t:\0028\001\032\030\n\010TcpCheck\022\014\n\004port\030\001 \001(\005\032!\n\016Con" + - "tentMatcher\022\017\n\007content\030\001 \001(\tB\n\n\010resource" + - "B\024\n\022check_request_type\"n\n\rUptimeCheckIp\022" + - "7\n\006region\030\001 \001(\0162\'.google.monitoring.v3.U" + - "ptimeCheckRegion\022\020\n\010location\030\002 \001(\t\022\022\n\nip" + - "_address\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022R" + - "EGION_UNSPECIFIED\020\000\022\007\n\003USA\020\001\022\n\n\006EUROPE\020\002" + - "\022\021\n\rSOUTH_AMERICA\020\003\022\020\n\014ASIA_PACIFIC\020\004*[\n" + - "\021GroupResourceType\022\035\n\031RESOURCE_TYPE_UNSP" + - "ECIFIED\020\000\022\014\n\010INSTANCE\020\001\022\031\n\025AWS_ELB_LOAD_" + - "BALANCER\020\002B\243\001\n\030com.google.monitoring.v3B" + - "\013UptimeProtoP\001Z>google.golang.org/genpro" + - "to/googleapis/monitoring/v3;monitoring\252\002" + - "\032Google.Cloud.Monitoring.V3\312\002\032Google\\Clo" + - "ud\\Monitoring\\V3b\006proto3" + ".proto\"q\n\017InternalChecker\022\014\n\004name\030\001 \001(\t\022" + + "\024\n\014display_name\030\002 \001(\t\022\017\n\007network\030\003 \001(\t\022\020" + + "\n\010gcp_zone\030\004 \001(\t\022\027\n\017peer_project_id\030\006 \001(" + + "\t\"\301\t\n\021UptimeCheckConfig\022\014\n\004name\030\001 \001(\t\022\024\n" + + "\014display_name\030\002 \001(\t\022;\n\022monitored_resourc" + + "e\030\003 \001(\0132\035.google.api.MonitoredResourceH\000" + + "\022O\n\016resource_group\030\004 \001(\01325.google.monito" + + "ring.v3.UptimeCheckConfig.ResourceGroupH" + + "\000\022G\n\nhttp_check\030\005 \001(\01321.google.monitorin" + + "g.v3.UptimeCheckConfig.HttpCheckH\001\022E\n\ttc" + + "p_check\030\006 \001(\01320.google.monitoring.v3.Upt" + + "imeCheckConfig.TcpCheckH\001\022)\n\006period\030\007 \001(" + + "\0132\031.google.protobuf.Duration\022*\n\007timeout\030" + + "\010 \001(\0132\031.google.protobuf.Duration\022P\n\020cont" + + "ent_matchers\030\t \003(\01326.google.monitoring.v" + + "3.UptimeCheckConfig.ContentMatcher\022A\n\020se" + + "lected_regions\030\n \003(\0162\'.google.monitoring" + + ".v3.UptimeCheckRegion\022\023\n\013is_internal\030\017 \001" + + "(\010\022@\n\021internal_checkers\030\016 \003(\0132%.google.m" + + "onitoring.v3.InternalChecker\032a\n\rResource" + + "Group\022\020\n\010group_id\030\001 \001(\t\022>\n\rresource_type" + + "\030\002 \001(\0162\'.google.monitoring.v3.GroupResou" + + "rceType\032\344\002\n\tHttpCheck\022\017\n\007use_ssl\030\001 \001(\010\022\014" + + "\n\004path\030\002 \001(\t\022\014\n\004port\030\003 \001(\005\022X\n\tauth_info\030" + + "\004 \001(\0132E.google.monitoring.v3.UptimeCheck" + + "Config.HttpCheck.BasicAuthentication\022\024\n\014" + + "mask_headers\030\005 \001(\010\022O\n\007headers\030\006 \003(\0132>.go" + + "ogle.monitoring.v3.UptimeCheckConfig.Htt" + + "pCheck.HeadersEntry\0329\n\023BasicAuthenticati" + + "on\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032." + + "\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" + + "(\t:\0028\001\032\030\n\010TcpCheck\022\014\n\004port\030\001 \001(\005\032!\n\016Cont" + + "entMatcher\022\017\n\007content\030\001 \001(\tB\n\n\010resourceB" + + "\024\n\022check_request_type\"n\n\rUptimeCheckIp\0227" + + "\n\006region\030\001 \001(\0162\'.google.monitoring.v3.Up" + + "timeCheckRegion\022\020\n\010location\030\002 \001(\t\022\022\n\nip_" + + "address\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022RE" + + "GION_UNSPECIFIED\020\000\022\007\n\003USA\020\001\022\n\n\006EUROPE\020\002\022" + + "\021\n\rSOUTH_AMERICA\020\003\022\020\n\014ASIA_PACIFIC\020\004*[\n\021" + + "GroupResourceType\022\035\n\031RESOURCE_TYPE_UNSPE" + + "CIFIED\020\000\022\014\n\010INSTANCE\020\001\022\031\n\025AWS_ELB_LOAD_B" + + "ALANCER\020\002B\243\001\n\030com.google.monitoring.v3B\013" + + "UptimeProtoP\001Z>google.golang.org/genprot" + + "o/googleapis/monitoring/v3;monitoring\252\002\032" + + "Google.Cloud.Monitoring.V3\312\002\032Google\\Clou" + + "d\\Monitoring\\V3b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -137,7 +137,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_google_monitoring_v3_InternalChecker_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_monitoring_v3_InternalChecker_descriptor, - new java.lang.String[] { "ProjectId", "Network", "GcpZone", "CheckerId", "DisplayName", }); + new java.lang.String[] { "Name", "DisplayName", "Network", "GcpZone", "PeerProjectId", }); internal_static_google_monitoring_v3_UptimeCheckConfig_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_google_monitoring_v3_UptimeCheckConfig_fieldAccessorTable = new diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert.proto index 4c995b13bcc5..1e22e61c7941 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert_service.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert_service.proto index 4bcb9d36e862..c97e3dc0585f 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert_service.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/alert_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/common.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/common.proto index 3e9653a8588d..f33af523bd2c 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/common.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/common.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -391,8 +392,8 @@ enum ComparisonType { COMPARISON_NE = 6; } -// The tier of service for a Stackdriver account. Please see the -// [service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers) +// The tier of service for a Workspace. Please see the +// [service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers) // for more details. enum ServiceTier { option deprecated = true; @@ -404,12 +405,12 @@ enum ServiceTier { // The Stackdriver Basic tier, a free tier of service that provides basic // features, a moderate allotment of logs, and access to built-in metrics. // A number of features are not available in this tier. For more details, - // see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + // see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). SERVICE_TIER_BASIC = 1; // The Stackdriver Premium tier, a higher, more expensive tier of service // that provides access to all Stackdriver features, lets you use Stackdriver // with AWS accounts, and has a larger allotments for logs and metrics. For - // more details, see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). + // more details, see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). SERVICE_TIER_PREMIUM = 2; } diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/dropped_labels.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/dropped_labels.proto index bc3b8545b925..11287062e811 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/dropped_labels.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/dropped_labels.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group.proto index bad5016c199e..f7f49615bd74 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group_service.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group_service.proto index 7cfae976940a..4af7e3719a10 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group_service.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/group_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric.proto index 9d2d8d72e00d..570313229cc9 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric_service.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric_service.proto index 170c4eae2a96..faf758e14a38 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric_service.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/metric_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -236,7 +237,6 @@ message ListTimeSeriesRequest { // // metric.type = "compute.googleapis.com/instance/cpu/usage_time" AND // metric.label.instance_name = "my-instance-name" - // string filter = 2; // The time interval for which results should be returned. Only time series diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/mutation_record.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/mutation_record.proto index 3c979a179813..5f85864fe494 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/mutation_record.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/mutation_record.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification.proto index ed6a56f78869..ac042762d3d1 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification_service.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification_service.proto index 745e3984ce39..e2c6a0ea7234 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification_service.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/notification_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -20,6 +21,7 @@ import "google/api/annotations.proto"; import "google/monitoring/v3/notification.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.Monitoring.V3"; @@ -68,7 +70,7 @@ service NotificationChannelService { } // Creates a new notification channel, representing a single notification - // endpoint such as an email address, SMS number, or pagerduty service. + // endpoint such as an email address, SMS number, or PagerDuty service. rpc CreateNotificationChannel(CreateNotificationChannelRequest) returns (NotificationChannel) { option (google.api.http) = { post: "/v3/{name=projects/*}/notificationChannels" diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/span_context.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/span_context.proto index c099bbb618e1..e870d8f669cc 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/span_context.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/span_context.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime.proto index 4c280e9b8d88..4f1b7aaa114e 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -27,24 +28,34 @@ option java_package = "com.google.monitoring.v3"; option php_namespace = "Google\\Cloud\\Monitoring\\V3"; -// Nimbus InternalCheckers. +// An internal checker allows uptime checks to run on private/internal GCP +// resources. message InternalChecker { - // The GCP project ID. Not necessarily the same as the project_id for the - // config. - string project_id = 1; + // A unique resource name for this InternalChecker. The format is: + // + // + // `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`. + // + // PROJECT_ID is the stackdriver workspace project for the + // uptime check config associated with the internal checker. + string name = 1; + + // The checker's human-readable name. The display name + // should be unique within a Stackdriver Workspace in order to make it easier + // to identify; however, uniqueness is not enforced. + string display_name = 2; - // The internal network to perform this uptime check on. - string network = 2; + // The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the + // internal resource lives (ex: "default"). + string network = 3; // The GCP zone the uptime check should egress from. Only respected for // internal uptime checks, where internal_network is specified. - string gcp_zone = 3; - - // The checker ID. - string checker_id = 4; + string gcp_zone = 4; - // The checker's human-readable name. - string display_name = 5; + // The GCP project_id where the internal checker lives. Not necessary + // the same as the workspace project. + string peer_project_id = 6; } // This message configures which resources and services to monitor for @@ -118,11 +129,10 @@ message UptimeCheckConfig { int32 port = 1; } - // Used to perform string matching. Currently, this matches on the exact - // content. In the future, it can be expanded to allow for regular expressions - // and more complex matching. + // Used to perform string matching. It allows substring and regular + // expressions, together with their negations. message ContentMatcher { - // String content to match (max 1024 bytes) + // String or regex content to match (max 1024 bytes) string content = 1; } @@ -137,7 +147,7 @@ message UptimeCheckConfig { string name = 1; // A human-friendly name for the uptime check configuration. The display name - // should be unique within a Stackdriver Account in order to make it easier + // should be unique within a Stackdriver Workspace in order to make it easier // to identify; however, uniqueness is not enforced. Required. string display_name = 2; @@ -185,17 +195,21 @@ message UptimeCheckConfig { repeated ContentMatcher content_matchers = 9; // The list of regions from which the check will be run. + // Some regions contain one location, and others contain more than one. // If this field is specified, enough regions to include a minimum of // 3 locations must be provided, or an error message is returned. // Not specifying this field will result in uptime checks running from all // regions. repeated UptimeCheckRegion selected_regions = 10; - // Denotes whether this is a check that egresses from InternalCheckers. + // If this is true, then checks are made only from the 'internal_checkers'. + // If it is false, then checks are made only from the 'selected_regions'. + // It is an error to provide 'selected_regions' when is_internal is true, + // or to provide 'internal_checkers' when is_internal is false. bool is_internal = 15; // The internal checkers that this check will egress from. If `is_internal` is - // true and this list is empty, the check will egress from all + // true and this list is empty, the check will egress from all the // InternalCheckers configured for the project that owns this CheckConfig. repeated InternalChecker internal_checkers = 14; } diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime_service.proto b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime_service.proto index 3293edaef15f..e79488332fdd 100644 --- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime_service.proto +++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/proto/google/monitoring/v3/uptime_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java index e880c059746b..f573b6176987 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java @@ -680,7 +680,7 @@ public final NotificationChannel getNotificationChannel(GetNotificationChannelRe // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Creates a new notification channel, representing a single notification endpoint such as an - * email address, SMS number, or pagerduty service. + * email address, SMS number, or PagerDuty service. * *

Sample code: * @@ -715,7 +715,7 @@ public final NotificationChannel createNotificationChannel( // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Creates a new notification channel, representing a single notification endpoint such as an - * email address, SMS number, or pagerduty service. + * email address, SMS number, or PagerDuty service. * *

Sample code: * @@ -750,7 +750,7 @@ public final NotificationChannel createNotificationChannel( // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Creates a new notification channel, representing a single notification endpoint such as an - * email address, SMS number, or pagerduty service. + * email address, SMS number, or PagerDuty service. * *

Sample code: * @@ -777,7 +777,7 @@ public final NotificationChannel createNotificationChannel( // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Creates a new notification channel, representing a single notification endpoint such as an - * email address, SMS number, or pagerduty service. + * email address, SMS number, or PagerDuty service. * *

Sample code: *