Rename Google things to say "Google", update telemetry (#4267)

website/redirects.txt

@@ -103,7 +103,7 @@
 /guides/configuration/lease.html                   /guides/identity/lease.html
 /guides/configuration/generate-root.html           /guides/operations/generate-root.html
 /guides/configuration/rekeying-and-rotating.html   /guides/operations/rekeying-and-rotating.html
-/guides/configuration/plugin-backends.html         /guides/operations/plugin-backends.html 
+/guides/configuration/plugin-backends.html         /guides/operations/plugin-backends.html
 
 /docs/vault-enterprise/index.html               /docs/enterprise/index.html
 /docs/vault-enterprise/replication/index.html   /docs/enterprise/replication/index.html
@@ -124,3 +124,5 @@
 /docs/commands/help.html               /docs/commands/path-help.html
 
 /docs/enterprise/hsm/configuration.html /docs/configuration/seal/pkcs11.html
+/docs/configuration/storage/google-cloud.html /docs/configuration/storage/google-cloud-storage.html
+/docs/configuration/storage/spanner.html /docs/configuration/storage/google-cloud-spanner.html

website/source/docs/configuration/storage/google-cloud-spanner.html.md

@@ -8,7 +8,7 @@ description: |-
   offers transactional consistency at global scale.
 ---
 
-# Spanner Storage Backend
+# Google Cloud Spanner Storage Backend
 
 The Google Cloud Spanner storage backend is used to persist Vault's data in
 [Spanner][spanner-docs], a fully managed, mission-critical, relational database
@@ -84,7 +84,7 @@ To use this storage backend, the service account must have the following
 minimum scope(s):
 
 ```text
-https://www.googleapis.com/auth/spanner.data
+https://www.googleapis.com/auth/google-cloud-spanner.data
 ```
 
 ## `spanner` Parameters

website/source/docs/configuration/storage/google-cloud-storage.html.md

@@ -7,7 +7,7 @@ description: |-
   Google Cloud Storage.
 ---
 
-# Google Cloud Storage Backend
+# Google Cloud Storage Storage Backend
 
 The Google Cloud Storage storage backend is used to persist Vault's data in
 [Google Cloud Storage][gcs-docs].

website/source/docs/internals/telemetry.html.md

@@ -576,6 +576,18 @@ These metrics relate to the supported [storage backends][storage-backends].
 
 **[S]** Summary (Milliseconds):  Duration of a LIST operation against the [Google Cloud Storage storage backend][gcs-storage-backend]
 
+### vault.gcs.lock.unlock
+
+**[S]** Summary (Milliseconds): Duration of an UNLOCK operation against the [Google Cloud Storage storage backend][gcs-storage-backend] in HA mode
+
+### vault.gcs.lock.lock
+
+**[S]** Summary (Milliseconds): Duration of a LOCK operation against the [Google Cloud Storage storage backend][gcs-storage-backend] in HA mode
+
+### vault.gcs.lock.value
+
+**[S]** Summary (Milliseconds): Duration of a VALUE operation against the [Google Cloud Storage storage backend][gcs-storage-backend] in HA mode
+
 ### vault.mssql.put
 
 **[S]** Summary (Milliseconds): Duration of a PUT operation against the [MS-SQL storage backend][mssql-storage-backend]
@@ -640,6 +652,34 @@ These metrics relate to the supported [storage backends][storage-backends].
 
 **[S]** Summary (Milliseconds):  Duration of a LIST operation against the [Amazon S3 storage backend][s3-storage-backend]
 
+### vault.spanner.put
+
+**[S]** Summary (Milliseconds): Duration of a PUT operation against the [Google Cloud Spanner storage backend][spanner-storage-backend]
+
+### vault.spanner.get
+
+**[S]** Summary (Milliseconds): Duration of a GET operation against the [Google Cloud Spanner storage backend][spanner-storage-backend]
+
+### vault.spanner.delete
+
+**[S]** Summary (Milliseconds):  Duration of a DELETE operation against the [Google Cloud Spanner storage backend][spanner-storage-backend]
+
+### vault.spanner.list
+
+**[S]** Summary (Milliseconds):  Duration of a LIST operation against the [Google Cloud Spanner storage backend][spanner-storage-backend]
+
+### vault.spanner.lock.unlock
+
+**[S]** Summary (Milliseconds): Duration of an UNLOCK operation against the [Google Cloud Spanner storage backend][spanner-storage-backend] in HA mode
+
+### vault.spanner.lock.lock
+
+**[S]** Summary (Milliseconds): Duration of a LOCK operation against the [Google Cloud Spanner storage backend][spanner-storage-backend] in HA mode
+
+### vault.spanner.lock.value
+
+**[S]** Summary (Milliseconds): Duration of a VALUE operation against the [Google Cloud Spanner storage backend][gcs-storage-backend] in HA mode
+
 ### vault.swift.put
 
 **[S]** Summary (Milliseconds): Duration of a PUT operation against the [Swift storage backend][swift-storage-backend]
@@ -686,7 +726,8 @@ These metrics relate to the supported [storage backends][storage-backends].
 [couchdb-storage-backend]: /docs/configuration/storage/couchdb.html
 [dynamodb-storage-backend]: /docs/configuration/storage/dynamodb.html
 [etcd-storage-backend]: /docs/configuration/storage/etcd.html
-[gcs-storage-backend]: /docs/configuration/storage/google-cloud.html
+[gcs-storage-backend]: /docs/configuration/storage/google-cloud-storage.html
+[spanner-storage-backend]: /docs/configuration/storage/google-cloud-spanner.html
 [mssql-storage-backend]: /docs/configuration/storage/mssql.html
 [mysql-storage-backend]: /docs/configuration/storage/mysql.html
 [postgresql-storage-backend]: /docs/configuration/storage/postgresql.html

website/source/layouts/docs.erb

@@ -133,7 +133,10 @@
                 <a href="/docs/configuration/storage/filesystem.html">Filesystem</a>
               </li>
               <li<%= sidebar_current("docs-configuration-storage-google-cloud")%>>
-                <a href="/docs/configuration/storage/google-cloud.html">Google Cloud</a>
+                <a href="/docs/configuration/storage/google-cloud-storage.html">Google Cloud Storage</a>
+              </li>
+              <li<%= sidebar_current("docs-configuration-storage-spanner")%>>
+                <a href="/docs/configuration/storage/google-cloud-spanner.html">Google Cloud Spanner</a>
               </li>
               <li<%= sidebar_current("docs-configuration-storage-in-memory")%>>
                 <a href="/docs/configuration/storage/in-memory.html">In-Memory</a>
@@ -147,9 +150,6 @@
               <li<%= sidebar_current("docs-configuration-storage-postgresql")%>>
                 <a href="/docs/configuration/storage/postgresql.html">PostgreSQL</a>
               </li>
-              <li<%= sidebar_current("docs-configuration-storage-spanner")%>>
-                <a href="/docs/configuration/storage/spanner.html">Spanner</a>
-              </li>
               <li<%= sidebar_current("docs-configuration-storage-cassandra")%>>
                 <a href="/docs/configuration/storage/cassandra.html">Cassandra</a>
               </li>