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 3c30d141c5a2..41db3176c409 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 @@ -768,7 +768,7 @@ public void getNotificationChannel( * *
      * 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( @@ -1054,7 +1054,7 @@ public void getNotificationChannel( * *
      * 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( @@ -1272,7 +1272,7 @@ public com.google.monitoring.v3.NotificationChannel getNotificationChannel( * *
      * 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( @@ -1475,7 +1475,7 @@ protected NotificationChannelServiceFutureStub build( * *
      * 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< 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 866195d648d4..72ce1d9ffb9f 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 @@ -7,7 +7,8 @@ * * *
- * Nimbus InternalCheckers.
+ * An internal checker allows uptime checks to run on private/internal GCP
+ * resources.
  * 
* * Protobuf type {@code google.monitoring.v3.InternalChecker} @@ -23,11 +24,11 @@ private InternalChecker(com.google.protobuf.GeneratedMessageV3.Builder builde } private InternalChecker() { - projectId_ = ""; + name_ = ""; + displayName_ = ""; network_ = ""; gcpZone_ = ""; - checkerId_ = ""; - displayName_ = ""; + peerProjectId_ = ""; } @java.lang.Override @@ -58,35 +59,35 @@ private InternalChecker( { 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: @@ -123,26 +124,28 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { 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; } } @@ -150,43 +153,47 @@ 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_; + public com.google.protobuf.ByteString 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; } } @@ -194,43 +201,45 @@ 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_; + public com.google.protobuf.ByteString 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; } } @@ -238,43 +247,44 @@ 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_; + public com.google.protobuf.ByteString 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; } } @@ -282,42 +292,44 @@ 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_; + public com.google.protobuf.ByteString 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; } } @@ -325,17 +337,18 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -356,20 +369,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); } @@ -380,20 +393,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; @@ -411,11 +424,11 @@ 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; } @@ -427,16 +440,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; @@ -541,7 +554,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
-   * Nimbus InternalCheckers.
+   * An internal checker allows uptime checks to run on private/internal GCP
+   * resources.
    * 
* * Protobuf type {@code google.monitoring.v3.InternalChecker} @@ -582,15 +596,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - projectId_ = ""; + name_ = ""; + + displayName_ = ""; network_ = ""; gcpZone_ = ""; - checkerId_ = ""; - - displayName_ = ""; + peerProjectId_ = ""; return this; } @@ -619,11 +633,11 @@ public com.google.monitoring.v3.InternalChecker build() { 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; } @@ -673,8 +687,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()) { @@ -685,12 +703,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); @@ -722,23 +736,25 @@ 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; @@ -748,18 +764,20 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -769,18 +787,20 @@ public com.google.protobuf.ByteString getProjectIdBytes() { * * *
-     * 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(java.lang.String value) { + public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - projectId_ = value; + name_ = value; onChanged(); return this; } @@ -788,15 +808,17 @@ public Builder setProjectId(java.lang.String value) { * * *
-     * 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; } @@ -804,39 +826,43 @@ public Builder clearProjectId() { * * *
-     * 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(com.google.protobuf.ByteString value) { + 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; @@ -846,17 +872,19 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -866,17 +894,19 @@ public com.google.protobuf.ByteString getNetworkBytes() { * * *
-     * 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(java.lang.String value) { + public Builder setDisplayName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - network_ = value; + displayName_ = value; onChanged(); return this; } @@ -884,14 +914,16 @@ public Builder setNetwork(java.lang.String value) { * * *
-     * 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; } @@ -899,39 +931,41 @@ public Builder clearNetwork() { * * *
-     * 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(com.google.protobuf.ByteString value) { + 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; @@ -941,18 +975,18 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -962,18 +996,18 @@ public com.google.protobuf.ByteString getGcpZoneBytes() { * * *
-     * 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(java.lang.String value) { + public Builder setNetwork(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gcpZone_ = value; + network_ = value; onChanged(); return this; } @@ -981,15 +1015,15 @@ public Builder setGcpZone(java.lang.String value) { * * *
-     * 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; } @@ -997,39 +1031,40 @@ public Builder clearGcpZone() { * * *
-     * 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(com.google.protobuf.ByteString value) { + 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; @@ -1039,17 +1074,18 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -1059,17 +1095,18 @@ public com.google.protobuf.ByteString getCheckerIdBytes() { * * *
-     * 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(java.lang.String value) { + public Builder setGcpZone(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - checkerId_ = value; + gcpZone_ = value; onChanged(); return this; } @@ -1077,14 +1114,15 @@ public Builder setCheckerId(java.lang.String value) { * * *
-     * 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; } @@ -1092,38 +1130,40 @@ public Builder clearCheckerId() { * * *
-     * 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(com.google.protobuf.ByteString value) { + 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; @@ -1133,17 +1173,18 @@ 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_; + public com.google.protobuf.ByteString 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; @@ -1153,17 +1194,18 @@ public com.google.protobuf.ByteString getDisplayNameBytes() { * * *
-     * 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(java.lang.String value) { + public Builder setPeerProjectId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - displayName_ = value; + peerProjectId_ = value; onChanged(); return this; } @@ -1171,14 +1213,15 @@ public Builder setDisplayName(java.lang.String value) { * * *
-     * 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; } @@ -1186,18 +1229,19 @@ public Builder clearDisplayName() { * * *
-     * 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(com.google.protobuf.ByteString value) { + 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 a3d5cd6c4ede..35eb02a052ab 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 @@ -12,108 +12,120 @@ public interface InternalCheckerOrBuilder * * *
-   * 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(); + com.google.protobuf.ByteString 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(); + com.google.protobuf.ByteString 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(); + com.google.protobuf.ByteString 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(); + com.google.protobuf.ByteString 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(); + com.google.protobuf.ByteString 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 67591cb858bc..962ca9e05a5d 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 @@ -78,98 +78,98 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "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() { @@ -186,6 +186,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); @@ -302,6 +303,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 67f265d22d04..6adcff24a682 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 @@ -7,8 +7,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.
  * 
* @@ -33,7 +33,7 @@ public enum ServiceTier implements com.google.protobuf.ProtocolMessageEnum { * 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; @@ -46,7 +46,7 @@ public enum ServiceTier implements com.google.protobuf.ProtocolMessageEnum { * 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; @@ -73,7 +73,7 @@ public enum ServiceTier implements com.google.protobuf.ProtocolMessageEnum { * 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; @@ -86,7 +86,7 @@ public enum ServiceTier implements com.google.protobuf.ProtocolMessageEnum { * 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 1da2640803f2..cf8bce63ce91 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 @@ -4243,7 +4243,7 @@ public interface ContentMatcherOrBuilder * * *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -4253,7 +4253,7 @@ public interface ContentMatcherOrBuilder * * *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -4264,9 +4264,8 @@ public interface ContentMatcherOrBuilder * * *
-   * 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} @@ -4356,7 +4355,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * *
-     * String content to match (max 1024 bytes)
+     * String or regex content to match (max 1024 bytes)
      * 
* * string content = 1; @@ -4376,7 +4375,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; @@ -4559,9 +4558,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} @@ -4724,7 +4722,7 @@ public Builder mergeFrom( * * *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4744,7 +4742,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; @@ -4764,7 +4762,7 @@ public com.google.protobuf.ByteString getContentBytes() { * * *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4782,7 +4780,7 @@ public Builder setContent(java.lang.String value) { * * *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -4797,7 +4795,7 @@ public Builder clearContent() { * * *
-       * String content to match (max 1024 bytes)
+       * String or regex content to match (max 1024 bytes)
        * 
* * string content = 1; @@ -5004,7 +5002,7 @@ public com.google.protobuf.ByteString getNameBytes() { * *
    * 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.
    * 
* @@ -5026,7 +5024,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.
    * 
* @@ -5449,6 +5447,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
@@ -5467,6 +5466,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
@@ -5483,6 +5483,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
@@ -5499,6 +5500,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
@@ -5515,6 +5517,7 @@ public java.util.List getSelectedRegionsValueList() {
    *
    * 
    * 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
@@ -5535,7 +5538,10 @@ public int getSelectedRegionsValue(int index) {
    *
    *
    * 
-   * 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; @@ -5551,7 +5557,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.
    * 
* @@ -5565,7 +5571,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.
    * 
* @@ -5580,7 +5586,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.
    * 
* @@ -5594,7 +5600,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.
    * 
* @@ -5608,7 +5614,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.
    * 
* @@ -6477,7 +6483,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * *
      * 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.
      * 
* @@ -6499,7 +6505,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.
      * 
* @@ -6521,7 +6527,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() { * *
      * 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.
      * 
* @@ -6541,7 +6547,7 @@ public Builder setDisplayName(java.lang.String value) { * *
      * 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.
      * 
* @@ -6558,7 +6564,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.
      * 
* @@ -8320,6 +8326,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
@@ -8338,6 +8345,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
@@ -8354,6 +8362,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
@@ -8370,6 +8379,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
@@ -8392,6 +8402,7 @@ public Builder setSelectedRegions(int index, com.google.monitoring.v3.UptimeChec
      *
      * 
      * 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
@@ -8414,6 +8425,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
@@ -8436,6 +8448,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
@@ -8455,6 +8468,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
@@ -8471,6 +8485,7 @@ public java.util.List getSelectedRegionsValueList() {
      *
      * 
      * 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
@@ -8487,6 +8502,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
@@ -8506,6 +8522,7 @@ public Builder setSelectedRegionsValue(int index, 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
@@ -8525,6 +8542,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
@@ -8547,7 +8565,10 @@ public Builder addAllSelectedRegionsValue(java.lang.Iterable
      *
      *
      * 
-     * 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; @@ -8559,7 +8580,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; @@ -8574,7 +8598,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; @@ -8608,7 +8635,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.
      * 
* @@ -8626,7 +8653,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.
      * 
* @@ -8644,7 +8671,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.
      * 
* @@ -8662,7 +8689,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.
      * 
* @@ -8686,7 +8713,7 @@ public Builder setInternalCheckers(int index, com.google.monitoring.v3.InternalC * *
      * 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.
      * 
* @@ -8708,7 +8735,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.
      * 
* @@ -8732,7 +8759,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.
      * 
* @@ -8756,7 +8783,7 @@ public Builder addInternalCheckers(int index, com.google.monitoring.v3.InternalC * *
      * 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.
      * 
* @@ -8778,7 +8805,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.
      * 
* @@ -8800,7 +8827,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.
      * 
* @@ -8822,7 +8849,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.
      * 
* @@ -8843,7 +8870,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.
      * 
* @@ -8864,7 +8891,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.
      * 
* @@ -8878,7 +8905,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.
      * 
* @@ -8897,7 +8924,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.
      * 
* @@ -8916,7 +8943,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.
      * 
* @@ -8931,7 +8958,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.
      * 
* @@ -8946,7 +8973,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 49a8c138f887..9adf4cd39d16 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 @@ -42,7 +42,7 @@ public interface UptimeCheckConfigOrBuilder * *
    * 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.
    * 
* @@ -54,7 +54,7 @@ public interface UptimeCheckConfigOrBuilder * *
    * 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.
    * 
* @@ -368,6 +368,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
@@ -382,6 +383,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
@@ -396,6 +398,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
@@ -410,6 +413,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
@@ -424,6 +428,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
@@ -438,7 +443,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; @@ -450,7 +458,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.
    * 
* @@ -462,7 +470,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.
    * 
* @@ -474,7 +482,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.
    * 
* @@ -486,7 +494,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.
    * 
* @@ -499,7 +507,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 dae55fc4b1e0..a4e10049c734 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 @@ -60,52 +60,52 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "\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() { @@ -128,7 +128,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_monitoring_v3_InternalChecker_descriptor, new java.lang.String[] { - "ProjectId", "Network", "GcpZone", "CheckerId", "DisplayName", + "Name", "DisplayName", "Network", "GcpZone", "PeerProjectId", }); internal_static_google_monitoring_v3_UptimeCheckConfig_descriptor = getDescriptor().getMessageTypes().get(1); 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 008078bf6f88..a5631ca108c5 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: * diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java index ffb949448e63..def0eaef4971 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java @@ -237,7 +237,9 @@ public String extractNextToken(ListAlertPoliciesResponse payload) { @Override public Iterable extractResources(ListAlertPoliciesResponse payload) { - return payload.getAlertPoliciesList(); + return payload.getAlertPoliciesList() != null + ? payload.getAlertPoliciesList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java index dafa9cf5b9c0..76f0df286f37 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java @@ -246,7 +246,9 @@ public String extractNextToken(ListGroupsResponse payload) { @Override public Iterable extractResources(ListGroupsResponse payload) { - return payload.getGroupList(); + return payload.getGroupList() != null + ? payload.getGroupList() + : ImmutableList.of(); } }; @@ -284,7 +286,9 @@ public String extractNextToken(ListGroupMembersResponse payload) { @Override public Iterable extractResources(ListGroupMembersResponse payload) { - return payload.getMembersList(); + return payload.getMembersList() != null + ? payload.getMembersList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java index 4c9511c2f56d..494a442f33cc 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java @@ -302,7 +302,9 @@ public String extractNextToken(ListMonitoredResourceDescriptorsResponse payload) @Override public Iterable extractResources( ListMonitoredResourceDescriptorsResponse payload) { - return payload.getResourceDescriptorsList(); + return payload.getResourceDescriptorsList() != null + ? payload.getResourceDescriptorsList() + : ImmutableList.of(); } }; @@ -341,7 +343,9 @@ public String extractNextToken(ListMetricDescriptorsResponse payload) { @Override public Iterable extractResources( ListMetricDescriptorsResponse payload) { - return payload.getMetricDescriptorsList(); + return payload.getMetricDescriptorsList() != null + ? payload.getMetricDescriptorsList() + : ImmutableList.of(); } }; @@ -377,7 +381,9 @@ public String extractNextToken(ListTimeSeriesResponse payload) { @Override public Iterable extractResources(ListTimeSeriesResponse payload) { - return payload.getTimeSeriesList(); + return payload.getTimeSeriesList() != null + ? payload.getTimeSeriesList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java index 5044bb9e15fd..19a9dc80ed74 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java @@ -291,7 +291,9 @@ public String extractNextToken(ListNotificationChannelDescriptorsResponse payloa @Override public Iterable extractResources( ListNotificationChannelDescriptorsResponse payload) { - return payload.getChannelDescriptorsList(); + return payload.getChannelDescriptorsList() != null + ? payload.getChannelDescriptorsList() + : ImmutableList.of(); } }; @@ -336,7 +338,9 @@ public String extractNextToken(ListNotificationChannelsResponse payload) { @Override public Iterable extractResources( ListNotificationChannelsResponse payload) { - return payload.getNotificationChannelsList(); + return payload.getNotificationChannelsList() != null + ? payload.getNotificationChannelsList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java index 7500374c3cf5..b9bd5ca75dc7 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java @@ -267,7 +267,9 @@ public String extractNextToken(ListUptimeCheckConfigsResponse payload) { @Override public Iterable extractResources( ListUptimeCheckConfigsResponse payload) { - return payload.getUptimeCheckConfigsList(); + return payload.getUptimeCheckConfigsList() != null + ? payload.getUptimeCheckConfigsList() + : ImmutableList.of(); } }; @@ -305,7 +307,9 @@ public String extractNextToken(ListUptimeCheckIpsResponse payload) { @Override public Iterable extractResources(ListUptimeCheckIpsResponse payload) { - return payload.getUptimeCheckIpsList(); + return payload.getUptimeCheckIpsList() != null + ? payload.getUptimeCheckIpsList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-monitoring/synth.metadata b/google-cloud-clients/google-cloud-monitoring/synth.metadata new file mode 100644 index 000000000000..3664c7a48fb1 --- /dev/null +++ b/google-cloud-clients/google-cloud-monitoring/synth.metadata @@ -0,0 +1,32 @@ +{ + "updateTime": "2019-01-10T00:28:17.515488Z", + "sources": [ + { + "generator": { + "name": "artman", + "version": "0.16.5", + "dockerImage": "googleapis/artman@sha256:5a96c2c5c6f9570cc9556b63dc9ce1838777fd9166b5b64e43ad8e0ecee2fe2c" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "5125f9790658c36519a23d4c2106bcfb1de7b070", + "internalRef": "228534685" + } + } + ], + "destinations": [ + { + "client": { + "source": "googleapis", + "apiName": "monitoring", + "apiVersion": "v3", + "language": "java", + "generator": "gapic", + "config": "google/monitoring/artman_monitoring.yaml" + } + } + ] +} \ No newline at end of file