Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ This client supports the following Google Cloud Platform services:
- `Google Cloud Pub/Sub`_
- `Google BigQuery`_
- `Google Cloud Resource Manager`_
- `Google Cloud Logging`_
- `Google Stackdriver Logging`_

This comment was marked as spam.


.. _Google Cloud Datastore: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-datastore
.. _Google Cloud Storage: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-storage
.. _Google Cloud Pub/Sub: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-pubsub
.. _Google BigQuery: https://github.com/GoogleCloudPlatform/gcloud-python#google-bigquery
.. _Google Cloud Resource Manager: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-resource-manager
.. _Google Cloud Logging: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-logging
.. _Google Stackdriver Logging: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-logging

If you need support for other Google APIs, check out the
`Google APIs Python Client library`_.
Expand Down Expand Up @@ -239,7 +239,7 @@ manage projects using this Client Library.

.. _Resource Manager documentation: https://googlecloudplatform.github.io/gcloud-python/stable/resource-manager-api.html

Google Cloud Logging
Google Stackdriver Logging
--------------------

This comment was marked as spam.


`Stackdriver Logging`_ API (`Logging API docs`_) allows you to store, search,
Expand All @@ -264,7 +264,7 @@ Example of fetching entries:
print entry.payload

See the ``gcloud-python`` API `logging documentation`_ to learn how to connect
to Cloud logging using this Client Library.
to Stackdriver Logging using this Client Library.

.. _logging documentation: https://googlecloudplatform.github.io/gcloud-python/stable/logging-usage.html

Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
.. toctree::
:maxdepth: 0
:hidden:
:caption: Cloud Logging
:caption: Stackdriver Logging

logging-usage
Client <logging-client>
Expand Down
3 changes: 1 addition & 2 deletions docs/logging-client.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Logging Client
Stackdriver Logging Client
==============

This comment was marked as spam.


.. automodule:: gcloud.logging.client
Expand All @@ -11,4 +11,3 @@ Connection
.. automodule:: gcloud.logging.connection
:members:
:show-inheritance:

2 changes: 1 addition & 1 deletion gcloud/logging/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Google Cloud Logging API wrapper."""
"""Google Stackdriver Logging API wrapper."""

from gcloud.logging.client import Client
from gcloud.logging.connection import Connection
Expand Down
2 changes: 1 addition & 1 deletion gcloud/logging/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Client for interacting with the Google Cloud Logging API."""
"""Client for interacting with the Google Stackdriver Logging API."""

import os

Expand Down
6 changes: 3 additions & 3 deletions gcloud/logging/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Create / interact with gcloud logging connections."""
"""Create / interact with Stackdriver Logging connections."""

from gcloud import connection as base_connection


class Connection(base_connection.JSONConnection):
"""A connection to Google Cloud Logging via the JSON REST API.
"""A connection to Google Stackdriver Logging via the JSON REST API.

:type credentials: :class:`oauth2client.client.OAuth2Credentials`
:param credentials: (Optional) The OAuth2 Credentials to use for this
Expand All @@ -45,7 +45,7 @@ class Connection(base_connection.JSONConnection):
'https://www.googleapis.com/auth/logging.write',
'https://www.googleapis.com/auth/logging.admin',
'https://www.googleapis.com/auth/cloud-platform')
"""The scopes required for authenticating as a Cloud Logging consumer."""
"""The scopes required for authenticating as a Stackdriver Logging consumer."""


class _LoggingAPI(object):
Expand Down
2 changes: 1 addition & 1 deletion gcloud/logging/entries.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Log entries within the Google Cloud Logging API."""
"""Log entries within the Google Stackdriver Logging API."""

import json
import re
Expand Down
2 changes: 1 addition & 1 deletion gcloud/logging/metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Define Logging API Metrics."""
"""Define Stackdriver Logging API Metrics."""

from gcloud.exceptions import NotFound

Expand Down
2 changes: 1 addition & 1 deletion gcloud/logging/sink.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Define Logging API Sinks."""
"""Define Stackdriver Logging API Sinks."""

from gcloud.exceptions import NotFound

Expand Down
6 changes: 3 additions & 3 deletions system_tests/logging_.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def _init_storage_bucket(self):
BUCKET_URI = 'storage.googleapis.com/%s' % (BUCKET_NAME,)

# Create the destination bucket, and set up the ACL to allow
# Cloud Logging to write into it.
# Stackdriver Logging to write into it.
storage_client = storage.Client()
bucket = storage_client.create_bucket(BUCKET_NAME)
self.to_delete.append(bucket)
Expand All @@ -231,7 +231,7 @@ def test_create_sink_pubsub_topic(self):
from gcloud import pubsub

# Create the destination topic, and set up the IAM policy to allow
# Cloud Logging to write into it.
# Stackdriver Logging to write into it.
pubsub_client = pubsub.Client()
topic = pubsub_client.topic(TOPIC_NAME)
topic.create()
Expand All @@ -256,7 +256,7 @@ def _init_bigquery_dataset(self):
Config.CLIENT.project, DATASET_NAME,)

# Create the destination dataset, and set up the ACL to allow
# Cloud Logging to write into it.
# Stackdriver Logging to write into it.
bigquery_client = bigquery.Client()
dataset = bigquery_client.dataset(DATASET_NAME)
dataset.create()
Expand Down