Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

fix: Use value of cluster-location in GKE for tagging location #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 9, 2024
Merged

fix: Use value of cluster-location in GKE for tagging location #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81fd8b7
fix: Use value of cluster-location in GKE for tagging location
gkevinzheng Dec 13, 2023
5428d18
Merge branch 'main' into gke-location
gkevinzheng Dec 13, 2023
af7e81c
Merge branch 'main' into gke-location
gkevinzheng Jan 8, 2024
715b8f3
Merge branch 'main' into gke-location
gkevinzheng Jan 9, 2024
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
7 changes: 5 additions & 2 deletions 7 google/cloud/logging_v2/handlers/_monitored_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
_GKE_CLUSTER_NAME = "instance/attributes/cluster-name"
"""Attribute in metadata server when in GKE environment."""

_GKE_CLUSTER_LOCATION = "instance/attributes/cluster-location"
"""Attribute in metadata server when in GKE environment."""

_PROJECT_NAME = "project/project-id"
"""Attribute in metadata server when in GKE environment."""

Expand Down Expand Up @@ -94,15 +97,15 @@ def _create_kubernetes_resource():
Returns:
google.cloud.logging.Resource
"""
zone = retrieve_metadata_server(_ZONE_ID)
location = retrieve_metadata_server(_GKE_CLUSTER_LOCATION)
cluster_name = retrieve_metadata_server(_GKE_CLUSTER_NAME)
project = retrieve_metadata_server(_PROJECT_NAME)

resource = Resource(
type="k8s_container",
labels={
"project_id": project if project else "",
"location": zone if zone else "",
"location": location if location else "",
"cluster_name": cluster_name if cluster_name else "",
},
)
Expand Down
1 change: 1 addition & 0 deletions 1 tests/unit/handlers/test__monitored_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def _mock_metadata(self, endpoint):
if (
endpoint == _monitored_resources._ZONE_ID
or endpoint == _monitored_resources._REGION_ID
or endpoint == _monitored_resources._GKE_CLUSTER_LOCATION
):
return self.LOCATION
elif (
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.