From d33fa4be026b17926ee09c5ba0bc7bc49ed7de01 Mon Sep 17 00:00:00 2001 From: John Pedrie Date: Mon, 12 Nov 2018 12:59:29 -0500 Subject: [PATCH] Revert "[CHANGE ME] Re-generated Monitoring to pick up changes in the API or client library generator. (#1409)" This reverts commit c93d10f29c81baa34d2177db01a6231616325f11. --- .../metadata/V3/NotificationService.php | 6 +- Monitoring/metadata/V3/Uptime.php | 122 ++++++------- .../src/V3/AlertPolicyServiceGrpcClient.php | 3 +- .../NotificationChannelServiceGapicClient.php | 2 +- Monitoring/src/V3/GroupServiceGrpcClient.php | 3 +- Monitoring/src/V3/InternalChecker.php | 163 ++++++++---------- Monitoring/src/V3/MetricServiceGrpcClient.php | 3 +- .../NotificationChannelServiceGrpcClient.php | 5 +- Monitoring/src/V3/ServiceTier.php | 8 +- Monitoring/src/V3/UptimeCheckConfig.php | 40 ++--- .../V3/UptimeCheckConfig/ContentMatcher.php | 13 +- .../src/V3/UptimeCheckServiceGrpcClient.php | 3 +- 12 files changed, 162 insertions(+), 209 deletions(-) diff --git a/Monitoring/metadata/V3/NotificationService.php b/Monitoring/metadata/V3/NotificationService.php index 6a117d25403b..d242ffa46029 100644 --- a/Monitoring/metadata/V3/NotificationService.php +++ b/Monitoring/metadata/V3/NotificationService.php @@ -18,16 +18,14 @@ public static function initOnce() { \GPBMetadata\Google\Monitoring\V3\Notification::initOnce(); \GPBMetadata\Google\Protobuf\GPBEmpty::initOnce(); \GPBMetadata\Google\Protobuf\FieldMask::initOnce(); - \GPBMetadata\Google\Protobuf\Struct::initOnce(); \GPBMetadata\Google\Protobuf\Timestamp::initOnce(); $pool->internalAddGeneratedFile(hex2bin( - "0a891e0a2f676f6f676c652f6d6f6e69746f72696e672f76332f6e6f7469" . + "0aeb1d0a2f676f6f676c652f6d6f6e69746f72696e672f76332f6e6f7469" . "6669636174696f6e5f736572766963652e70726f746f1214676f6f676c65" . "2e6d6f6e69746f72696e672e76331a27676f6f676c652f6d6f6e69746f72" . "696e672f76332f6e6f74696669636174696f6e2e70726f746f1a1b676f6f" . "676c652f70726f746f6275662f656d7074792e70726f746f1a20676f6f67" . - "6c652f70726f746f6275662f6669656c645f6d61736b2e70726f746f1a1c" . - "676f6f676c652f70726f746f6275662f7374727563742e70726f746f1a1f" . + "6c652f70726f746f6275662f6669656c645f6d61736b2e70726f746f1a1f" . "676f6f676c652f70726f746f6275662f74696d657374616d702e70726f74" . "6f22600a294c6973744e6f74696669636174696f6e4368616e6e656c4465" . "7363726970746f727352657175657374120c0a046e616d65180420012809" . diff --git a/Monitoring/metadata/V3/Uptime.php b/Monitoring/metadata/V3/Uptime.php index 6fa0eeda1e15..b22e51f139d3 100644 --- a/Monitoring/metadata/V3/Uptime.php +++ b/Monitoring/metadata/V3/Uptime.php @@ -17,70 +17,70 @@ public static function initOnce() { \GPBMetadata\Google\Api\MonitoredResource::initOnce(); \GPBMetadata\Google\Protobuf\Duration::initOnce(); $pool->internalAddGeneratedFile(hex2bin( - "0af20e0a21676f6f676c652f6d6f6e69746f72696e672f76332f75707469" . + "0af30e0a21676f6f676c652f6d6f6e69746f72696e672f76332f75707469" . "6d652e70726f746f1214676f6f676c652e6d6f6e69746f72696e672e7633" . "1a1e676f6f676c652f70726f746f6275662f6475726174696f6e2e70726f" . - "746f22710a0f496e7465726e616c436865636b6572120c0a046e616d6518" . - "012001280912140a0c646973706c61795f6e616d65180220012809120f0a" . - "076e6574776f726b18032001280912100a086763705f7a6f6e6518042001" . - "280912170a0f706565725f70726f6a6563745f696418062001280922c109" . - "0a11557074696d65436865636b436f6e666967120c0a046e616d65180120" . - "01280912140a0c646973706c61795f6e616d65180220012809123b0a126d" . - "6f6e69746f7265645f7265736f7572636518032001280b321d2e676f6f67" . - "6c652e6170692e4d6f6e69746f7265645265736f757263654800124f0a0e" . - "7265736f757263655f67726f757018042001280b32352e676f6f676c652e" . - "6d6f6e69746f72696e672e76332e557074696d65436865636b436f6e6669" . - "672e5265736f7572636547726f7570480012470a0a687474705f63686563" . - "6b18052001280b32312e676f6f676c652e6d6f6e69746f72696e672e7633" . - "2e557074696d65436865636b436f6e6669672e48747470436865636b4801" . - "12450a097463705f636865636b18062001280b32302e676f6f676c652e6d" . - "6f6e69746f72696e672e76332e557074696d65436865636b436f6e666967" . - "2e546370436865636b480112290a06706572696f6418072001280b32192e" . - "676f6f676c652e70726f746f6275662e4475726174696f6e122a0a077469" . - "6d656f757418082001280b32192e676f6f676c652e70726f746f6275662e" . - "4475726174696f6e12500a10636f6e74656e745f6d617463686572731809" . - "2003280b32362e676f6f676c652e6d6f6e69746f72696e672e76332e5570" . - "74696d65436865636b436f6e6669672e436f6e74656e744d617463686572" . - "12410a1073656c65637465645f726567696f6e73180a2003280e32272e67" . - "6f6f676c652e6d6f6e69746f72696e672e76332e557074696d6543686563" . - "6b526567696f6e12130a0b69735f696e7465726e616c180f200128081240" . - "0a11696e7465726e616c5f636865636b657273180e2003280b32252e676f" . - "6f676c652e6d6f6e69746f72696e672e76332e496e7465726e616c436865" . - "636b65721a610a0d5265736f7572636547726f757012100a0867726f7570" . - "5f6964180120012809123e0a0d7265736f757263655f7479706518022001" . - "280e32272e676f6f676c652e6d6f6e69746f72696e672e76332e47726f75" . - "705265736f75726365547970651ae4020a0948747470436865636b120f0a" . - "077573655f73736c180120012808120c0a0470617468180220012809120c" . - "0a04706f727418032001280512580a09617574685f696e666f1804200128" . - "0b32452e676f6f676c652e6d6f6e69746f72696e672e76332e557074696d" . - "65436865636b436f6e6669672e48747470436865636b2e42617369634175" . - "7468656e7469636174696f6e12140a0c6d61736b5f686561646572731805" . - "20012808124f0a076865616465727318062003280b323e2e676f6f676c65" . + "746f22720a0f496e7465726e616c436865636b657212120a0a70726f6a65" . + "63745f6964180120012809120f0a076e6574776f726b1802200128091210" . + "0a086763705f7a6f6e6518032001280912120a0a636865636b65725f6964" . + "18042001280912140a0c646973706c61795f6e616d6518052001280922c1" . + "090a11557074696d65436865636b436f6e666967120c0a046e616d651801" . + "2001280912140a0c646973706c61795f6e616d65180220012809123b0a12" . + "6d6f6e69746f7265645f7265736f7572636518032001280b321d2e676f6f" . + "676c652e6170692e4d6f6e69746f7265645265736f757263654800124f0a" . + "0e7265736f757263655f67726f757018042001280b32352e676f6f676c65" . "2e6d6f6e69746f72696e672e76332e557074696d65436865636b436f6e66" . - "69672e48747470436865636b2e48656164657273456e7472791a390a1342" . - "6173696341757468656e7469636174696f6e12100a08757365726e616d65" . - "18012001280912100a0870617373776f72641802200128091a2e0a0c4865" . - "6164657273456e747279120b0a036b6579180120012809120d0a0576616c" . - "75651802200128093a0238011a180a08546370436865636b120c0a04706f" . - "72741801200128051a210a0e436f6e74656e744d617463686572120f0a07" . - "636f6e74656e74180120012809420a0a087265736f7572636542140a1263" . - "6865636b5f726571756573745f74797065226e0a0d557074696d65436865" . - "636b497012370a06726567696f6e18012001280e32272e676f6f676c652e" . - "6d6f6e69746f72696e672e76332e557074696d65436865636b526567696f" . - "6e12100a086c6f636174696f6e18022001280912120a0a69705f61646472" . - "6573731803200128092a650a11557074696d65436865636b526567696f6e" . - "12160a12524547494f4e5f554e535045434946494544100012070a035553" . - "411001120a0a064555524f5045100212110a0d534f5554485f414d455249" . - "4341100312100a0c415349415f5041434946494310042a5b0a1147726f75" . - "705265736f7572636554797065121d0a195245534f555243455f54595045" . - "5f554e5350454349464945441000120c0a08494e5354414e434510011219" . - "0a154157535f454c425f4c4f41445f42414c414e434552100242a3010a18" . - "636f6d2e676f6f676c652e6d6f6e69746f72696e672e7633420b55707469" . - "6d6550726f746f50015a3e676f6f676c652e676f6c616e672e6f72672f67" . - "656e70726f746f2f676f6f676c65617069732f6d6f6e69746f72696e672f" . - "76333b6d6f6e69746f72696e67aa021a476f6f676c652e436c6f75642e4d" . - "6f6e69746f72696e672e5633ca021a476f6f676c655c436c6f75645c4d6f" . - "6e69746f72696e675c5633620670726f746f33" + "69672e5265736f7572636547726f7570480012470a0a687474705f636865" . + "636b18052001280b32312e676f6f676c652e6d6f6e69746f72696e672e76" . + "332e557074696d65436865636b436f6e6669672e48747470436865636b48" . + "0112450a097463705f636865636b18062001280b32302e676f6f676c652e" . + "6d6f6e69746f72696e672e76332e557074696d65436865636b436f6e6669" . + "672e546370436865636b480112290a06706572696f6418072001280b3219" . + "2e676f6f676c652e70726f746f6275662e4475726174696f6e122a0a0774" . + "696d656f757418082001280b32192e676f6f676c652e70726f746f627566" . + "2e4475726174696f6e12500a10636f6e74656e745f6d6174636865727318" . + "092003280b32362e676f6f676c652e6d6f6e69746f72696e672e76332e55" . + "7074696d65436865636b436f6e6669672e436f6e74656e744d6174636865" . + "7212410a1073656c65637465645f726567696f6e73180a2003280e32272e" . + "676f6f676c652e6d6f6e69746f72696e672e76332e557074696d65436865" . + "636b526567696f6e12130a0b69735f696e7465726e616c180f2001280812" . + "400a11696e7465726e616c5f636865636b657273180e2003280b32252e67" . + "6f6f676c652e6d6f6e69746f72696e672e76332e496e7465726e616c4368" . + "65636b65721a610a0d5265736f7572636547726f757012100a0867726f75" . + "705f6964180120012809123e0a0d7265736f757263655f74797065180220" . + "01280e32272e676f6f676c652e6d6f6e69746f72696e672e76332e47726f" . + "75705265736f75726365547970651ae4020a0948747470436865636b120f" . + "0a077573655f73736c180120012808120c0a047061746818022001280912" . + "0c0a04706f727418032001280512580a09617574685f696e666f18042001" . + "280b32452e676f6f676c652e6d6f6e69746f72696e672e76332e55707469" . + "6d65436865636b436f6e6669672e48747470436865636b2e426173696341" . + "757468656e7469636174696f6e12140a0c6d61736b5f6865616465727318" . + "0520012808124f0a076865616465727318062003280b323e2e676f6f676c" . + "652e6d6f6e69746f72696e672e76332e557074696d65436865636b436f6e" . + "6669672e48747470436865636b2e48656164657273456e7472791a390a13" . + "426173696341757468656e7469636174696f6e12100a08757365726e616d" . + "6518012001280912100a0870617373776f72641802200128091a2e0a0c48" . + "656164657273456e747279120b0a036b6579180120012809120d0a057661" . + "6c75651802200128093a0238011a180a08546370436865636b120c0a0470" . + "6f72741801200128051a210a0e436f6e74656e744d617463686572120f0a" . + "07636f6e74656e74180120012809420a0a087265736f7572636542140a12" . + "636865636b5f726571756573745f74797065226e0a0d557074696d654368" . + "65636b497012370a06726567696f6e18012001280e32272e676f6f676c65" . + "2e6d6f6e69746f72696e672e76332e557074696d65436865636b52656769" . + "6f6e12100a086c6f636174696f6e18022001280912120a0a69705f616464" . + "726573731803200128092a650a11557074696d65436865636b526567696f" . + "6e12160a12524547494f4e5f554e535045434946494544100012070a0355" . + "53411001120a0a064555524f5045100212110a0d534f5554485f414d4552" . + "494341100312100a0c415349415f5041434946494310042a5b0a1147726f" . + "75705265736f7572636554797065121d0a195245534f555243455f545950" . + "455f554e5350454349464945441000120c0a08494e5354414e4345100112" . + "190a154157535f454c425f4c4f41445f42414c414e434552100242a3010a" . + "18636f6d2e676f6f676c652e6d6f6e69746f72696e672e7633420b557074" . + "696d6550726f746f50015a3e676f6f676c652e676f6c616e672e6f72672f" . + "67656e70726f746f2f676f6f676c65617069732f6d6f6e69746f72696e67" . + "2f76333b6d6f6e69746f72696e67aa021a476f6f676c652e436c6f75642e" . + "4d6f6e69746f72696e672e5633ca021a476f6f676c655c436c6f75645c4d" . + "6f6e69746f72696e675c5633620670726f746f33" )); static::$is_initialized = true; diff --git a/Monitoring/src/V3/AlertPolicyServiceGrpcClient.php b/Monitoring/src/V3/AlertPolicyServiceGrpcClient.php index 349afc1c7268..ed7675a57204 100644 --- a/Monitoring/src/V3/AlertPolicyServiceGrpcClient.php +++ b/Monitoring/src/V3/AlertPolicyServiceGrpcClient.php @@ -2,7 +2,7 @@ // GENERATED CODE -- DO NOT EDIT! // Original file comments: -// 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. @@ -16,7 +16,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// namespace Google\Cloud\Monitoring\V3; /** diff --git a/Monitoring/src/V3/Gapic/NotificationChannelServiceGapicClient.php b/Monitoring/src/V3/Gapic/NotificationChannelServiceGapicClient.php index 5e5881f89d9d..0aa419f9473c 100644 --- a/Monitoring/src/V3/Gapic/NotificationChannelServiceGapicClient.php +++ b/Monitoring/src/V3/Gapic/NotificationChannelServiceGapicClient.php @@ -611,7 +611,7 @@ public function getNotificationChannel($name, array $optionalArgs = []) /** * 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. * * Sample code: * ``` diff --git a/Monitoring/src/V3/GroupServiceGrpcClient.php b/Monitoring/src/V3/GroupServiceGrpcClient.php index fad9cea8b483..fd4712ea87ef 100644 --- a/Monitoring/src/V3/GroupServiceGrpcClient.php +++ b/Monitoring/src/V3/GroupServiceGrpcClient.php @@ -2,7 +2,7 @@ // GENERATED CODE -- DO NOT EDIT! // Original file comments: -// 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. @@ -16,7 +16,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// namespace Google\Cloud\Monitoring\V3; /** diff --git a/Monitoring/src/V3/InternalChecker.php b/Monitoring/src/V3/InternalChecker.php index 29e76c8ba49e..50d2c72cd882 100644 --- a/Monitoring/src/V3/InternalChecker.php +++ b/Monitoring/src/V3/InternalChecker.php @@ -9,51 +9,44 @@ use Google\Protobuf\Internal\GPBUtil; /** - * An internal checker allows uptime checks to run on private/internal GCP - * resources. + * Nimbus InternalCheckers. * * Generated from protobuf message google.monitoring.v3.InternalChecker */ class InternalChecker extends \Google\Protobuf\Internal\Message { /** - * 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. + * The GCP project ID. Not necessarily the same as the project_id for the + * config. * - * Generated from protobuf field string name = 1; + * Generated from protobuf field string project_id = 1; */ - private $name = ''; + private $project_id = ''; /** - * 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. + * The internal network to perform this uptime check on. * - * Generated from protobuf field string display_name = 2; - */ - private $display_name = ''; - /** - * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the - * internal resource lives (ex: "default"). - * - * Generated from protobuf field string network = 3; + * Generated from protobuf field string network = 2; */ private $network = ''; /** * The GCP zone the uptime check should egress from. Only respected for * internal uptime checks, where internal_network is specified. * - * Generated from protobuf field string gcp_zone = 4; + * Generated from protobuf field string gcp_zone = 3; */ private $gcp_zone = ''; /** - * The GCP project_id where the internal checker lives. Not necessary - * the same as the workspace project. + * The checker ID. * - * Generated from protobuf field string peer_project_id = 6; + * Generated from protobuf field string checker_id = 4; */ - private $peer_project_id = ''; + private $checker_id = ''; + /** + * The checker's human-readable name. + * + * Generated from protobuf field string display_name = 5; + */ + private $display_name = ''; /** * Constructor. @@ -61,24 +54,18 @@ class InternalChecker extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @type string $name - * 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. - * @type string $display_name - * 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. + * @type string $project_id + * The GCP project ID. Not necessarily the same as the project_id for the + * config. * @type string $network - * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the - * internal resource lives (ex: "default"). + * The internal network to perform this uptime check on. * @type string $gcp_zone * The GCP zone the uptime check should egress from. Only respected for * internal uptime checks, where internal_network is specified. - * @type string $peer_project_id - * The GCP project_id where the internal checker lives. Not necessary - * the same as the workspace project. + * @type string $checker_id + * The checker ID. + * @type string $display_name + * The checker's human-readable name. * } */ public function __construct($data = NULL) { @@ -87,147 +74,135 @@ public function __construct($data = NULL) { } /** - * 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. + * The GCP project ID. Not necessarily the same as the project_id for the + * config. * - * Generated from protobuf field string name = 1; + * Generated from protobuf field string project_id = 1; * @return string */ - public function getName() + public function getProjectId() { - return $this->name; + return $this->project_id; } /** - * 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. + * The GCP project ID. Not necessarily the same as the project_id for the + * config. * - * Generated from protobuf field string name = 1; + * Generated from protobuf field string project_id = 1; * @param string $var * @return $this */ - public function setName($var) + public function setProjectId($var) { GPBUtil::checkString($var, True); - $this->name = $var; + $this->project_id = $var; return $this; } /** - * 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. + * The internal network to perform this uptime check on. * - * Generated from protobuf field string display_name = 2; + * Generated from protobuf field string network = 2; * @return string */ - public function getDisplayName() + public function getNetwork() { - return $this->display_name; + return $this->network; } /** - * 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. + * The internal network to perform this uptime check on. * - * Generated from protobuf field string display_name = 2; + * Generated from protobuf field string network = 2; * @param string $var * @return $this */ - public function setDisplayName($var) + public function setNetwork($var) { GPBUtil::checkString($var, True); - $this->display_name = $var; + $this->network = $var; return $this; } /** - * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the - * internal resource lives (ex: "default"). + * The GCP zone the uptime check should egress from. Only respected for + * internal uptime checks, where internal_network is specified. * - * Generated from protobuf field string network = 3; + * Generated from protobuf field string gcp_zone = 3; * @return string */ - public function getNetwork() + public function getGcpZone() { - return $this->network; + return $this->gcp_zone; } /** - * The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the - * internal resource lives (ex: "default"). + * The GCP zone the uptime check should egress from. Only respected for + * internal uptime checks, where internal_network is specified. * - * Generated from protobuf field string network = 3; + * Generated from protobuf field string gcp_zone = 3; * @param string $var * @return $this */ - public function setNetwork($var) + public function setGcpZone($var) { GPBUtil::checkString($var, True); - $this->network = $var; + $this->gcp_zone = $var; return $this; } /** - * The GCP zone the uptime check should egress from. Only respected for - * internal uptime checks, where internal_network is specified. + * The checker ID. * - * Generated from protobuf field string gcp_zone = 4; + * Generated from protobuf field string checker_id = 4; * @return string */ - public function getGcpZone() + public function getCheckerId() { - return $this->gcp_zone; + return $this->checker_id; } /** - * The GCP zone the uptime check should egress from. Only respected for - * internal uptime checks, where internal_network is specified. + * The checker ID. * - * Generated from protobuf field string gcp_zone = 4; + * Generated from protobuf field string checker_id = 4; * @param string $var * @return $this */ - public function setGcpZone($var) + public function setCheckerId($var) { GPBUtil::checkString($var, True); - $this->gcp_zone = $var; + $this->checker_id = $var; return $this; } /** - * The GCP project_id where the internal checker lives. Not necessary - * the same as the workspace project. + * The checker's human-readable name. * - * Generated from protobuf field string peer_project_id = 6; + * Generated from protobuf field string display_name = 5; * @return string */ - public function getPeerProjectId() + public function getDisplayName() { - return $this->peer_project_id; + return $this->display_name; } /** - * The GCP project_id where the internal checker lives. Not necessary - * the same as the workspace project. + * The checker's human-readable name. * - * Generated from protobuf field string peer_project_id = 6; + * Generated from protobuf field string display_name = 5; * @param string $var * @return $this */ - public function setPeerProjectId($var) + public function setDisplayName($var) { GPBUtil::checkString($var, True); - $this->peer_project_id = $var; + $this->display_name = $var; return $this; } diff --git a/Monitoring/src/V3/MetricServiceGrpcClient.php b/Monitoring/src/V3/MetricServiceGrpcClient.php index c2c2531688b3..1fdfef59a85b 100644 --- a/Monitoring/src/V3/MetricServiceGrpcClient.php +++ b/Monitoring/src/V3/MetricServiceGrpcClient.php @@ -2,7 +2,7 @@ // GENERATED CODE -- DO NOT EDIT! // Original file comments: -// 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. @@ -16,7 +16,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// namespace Google\Cloud\Monitoring\V3; /** diff --git a/Monitoring/src/V3/NotificationChannelServiceGrpcClient.php b/Monitoring/src/V3/NotificationChannelServiceGrpcClient.php index 6ec26d4d0143..06284abb1b1c 100644 --- a/Monitoring/src/V3/NotificationChannelServiceGrpcClient.php +++ b/Monitoring/src/V3/NotificationChannelServiceGrpcClient.php @@ -2,7 +2,7 @@ // GENERATED CODE -- DO NOT EDIT! // Original file comments: -// 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. @@ -16,7 +16,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// namespace Google\Cloud\Monitoring\V3; /** @@ -98,7 +97,7 @@ public function GetNotificationChannel(\Google\Cloud\Monitoring\V3\GetNotificati /** * 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. * @param \Google\Cloud\Monitoring\V3\CreateNotificationChannelRequest $argument input argument * @param array $metadata metadata * @param array $options call options diff --git a/Monitoring/src/V3/ServiceTier.php b/Monitoring/src/V3/ServiceTier.php index 456819f8eb58..93a10cba6dc4 100644 --- a/Monitoring/src/V3/ServiceTier.php +++ b/Monitoring/src/V3/ServiceTier.php @@ -5,8 +5,8 @@ namespace Google\Cloud\Monitoring\V3; /** - * The tier of service for a Workspace. Please see the - * [service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers) + * The tier of service for a Stackdriver account. Please see the + * [service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers) * for more details. * * Protobuf type google.monitoring.v3.ServiceTier @@ -24,7 +24,7 @@ class 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/workspaces/tiers). + * see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). * * Generated from protobuf enum SERVICE_TIER_BASIC = 1; */ @@ -33,7 +33,7 @@ class ServiceTier * The Stackdriver Premium tier, a higher, more expensive tier of service * that provides access to all Stackdriver features, lets you use Stackdriver * with AWS accounts, and has a larger allotments for logs and metrics. For - * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). + * more details, see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers). * * Generated from protobuf enum SERVICE_TIER_PREMIUM = 2; */ diff --git a/Monitoring/src/V3/UptimeCheckConfig.php b/Monitoring/src/V3/UptimeCheckConfig.php index 63e9ee8f310f..20b47dc99122 100644 --- a/Monitoring/src/V3/UptimeCheckConfig.php +++ b/Monitoring/src/V3/UptimeCheckConfig.php @@ -28,7 +28,7 @@ class UptimeCheckConfig extends \Google\Protobuf\Internal\Message private $name = ''; /** * A human-friendly name for the uptime check configuration. The display name - * should be unique within a Stackdriver Workspace in order to make it easier + * should be unique within a Stackdriver Account in order to make it easier * to identify; however, uniqueness is not enforced. Required. * * Generated from protobuf field string display_name = 2; @@ -62,7 +62,6 @@ class UptimeCheckConfig extends \Google\Protobuf\Internal\Message private $content_matchers; /** * 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 @@ -72,17 +71,14 @@ class UptimeCheckConfig extends \Google\Protobuf\Internal\Message */ private $selected_regions; /** - * 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. + * Denotes whether this is a check that egresses from InternalCheckers. * * Generated from protobuf field bool is_internal = 15; */ private $is_internal = false; /** * 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 the + * true and this list is empty, the check will egress from all * InternalCheckers configured for the project that owns this CheckConfig. * * Generated from protobuf field repeated .google.monitoring.v3.InternalChecker internal_checkers = 14; @@ -105,7 +101,7 @@ class UptimeCheckConfig extends \Google\Protobuf\Internal\Message * response. * @type string $display_name * A human-friendly name for the uptime check configuration. The display name - * should be unique within a Stackdriver Workspace in order to make it easier + * should be unique within a Stackdriver Account in order to make it easier * to identify; however, uniqueness is not enforced. Required. * @type \Google\Api\MonitoredResource $monitored_resource * The [monitored @@ -139,19 +135,15 @@ class UptimeCheckConfig extends \Google\Protobuf\Internal\Message * specified if a content match is required. * @type int[]|\Google\Protobuf\Internal\RepeatedField $selected_regions * 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. * @type bool $is_internal - * 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. + * Denotes whether this is a check that egresses from InternalCheckers. * @type \Google\Cloud\Monitoring\V3\InternalChecker[]|\Google\Protobuf\Internal\RepeatedField $internal_checkers * 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 the + * true and this list is empty, the check will egress from all * InternalCheckers configured for the project that owns this CheckConfig. * } */ @@ -196,7 +188,7 @@ public function setName($var) /** * A human-friendly name for the uptime check configuration. The display name - * should be unique within a Stackdriver Workspace in order to make it easier + * should be unique within a Stackdriver Account in order to make it easier * to identify; however, uniqueness is not enforced. Required. * * Generated from protobuf field string display_name = 2; @@ -209,7 +201,7 @@ public function getDisplayName() /** * A human-friendly name for the uptime check configuration. The display name - * should be unique within a Stackdriver Workspace in order to make it easier + * should be unique within a Stackdriver Account in order to make it easier * to identify; however, uniqueness is not enforced. Required. * * Generated from protobuf field string display_name = 2; @@ -440,7 +432,6 @@ public function setContentMatchers($var) /** * 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 @@ -456,7 +447,6 @@ public function getSelectedRegions() /** * 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 @@ -475,10 +465,7 @@ public function setSelectedRegions($var) } /** - * 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. + * Denotes whether this is a check that egresses from InternalCheckers. * * Generated from protobuf field bool is_internal = 15; * @return bool @@ -489,10 +476,7 @@ public function getIsInternal() } /** - * 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. + * Denotes whether this is a check that egresses from InternalCheckers. * * Generated from protobuf field bool is_internal = 15; * @param bool $var @@ -508,7 +492,7 @@ public function setIsInternal($var) /** * 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 the + * true and this list is empty, the check will egress from all * InternalCheckers configured for the project that owns this CheckConfig. * * Generated from protobuf field repeated .google.monitoring.v3.InternalChecker internal_checkers = 14; @@ -521,7 +505,7 @@ public function getInternalCheckers() /** * 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 the + * true and this list is empty, the check will egress from all * InternalCheckers configured for the project that owns this CheckConfig. * * Generated from protobuf field repeated .google.monitoring.v3.InternalChecker internal_checkers = 14; diff --git a/Monitoring/src/V3/UptimeCheckConfig/ContentMatcher.php b/Monitoring/src/V3/UptimeCheckConfig/ContentMatcher.php index 74d91a8fe6c5..397067e0f4c4 100644 --- a/Monitoring/src/V3/UptimeCheckConfig/ContentMatcher.php +++ b/Monitoring/src/V3/UptimeCheckConfig/ContentMatcher.php @@ -9,15 +9,16 @@ use Google\Protobuf\Internal\GPBUtil; /** - * Used to perform string matching. It allows substring and regular - * expressions, together with their negations. + * 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. * * Generated from protobuf message google.monitoring.v3.UptimeCheckConfig.ContentMatcher */ class ContentMatcher extends \Google\Protobuf\Internal\Message { /** - * String or regex content to match (max 1024 bytes) + * String content to match (max 1024 bytes) * * Generated from protobuf field string content = 1; */ @@ -30,7 +31,7 @@ class ContentMatcher extends \Google\Protobuf\Internal\Message * Optional. Data for populating the Message object. * * @type string $content - * String or regex content to match (max 1024 bytes) + * String content to match (max 1024 bytes) * } */ public function __construct($data = NULL) { @@ -39,7 +40,7 @@ public function __construct($data = NULL) { } /** - * String or regex content to match (max 1024 bytes) + * String content to match (max 1024 bytes) * * Generated from protobuf field string content = 1; * @return string @@ -50,7 +51,7 @@ public function getContent() } /** - * String or regex content to match (max 1024 bytes) + * String content to match (max 1024 bytes) * * Generated from protobuf field string content = 1; * @param string $var diff --git a/Monitoring/src/V3/UptimeCheckServiceGrpcClient.php b/Monitoring/src/V3/UptimeCheckServiceGrpcClient.php index 97b7ee551fa5..e5de553e1579 100644 --- a/Monitoring/src/V3/UptimeCheckServiceGrpcClient.php +++ b/Monitoring/src/V3/UptimeCheckServiceGrpcClient.php @@ -2,7 +2,7 @@ // GENERATED CODE -- DO NOT EDIT! // Original file comments: -// 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. @@ -16,7 +16,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// namespace Google\Cloud\Monitoring\V3; /**