fix: Use value of cluster-location in GKE for tagging location (#830) · googleapis/google-cloud-python@fcad04e · GitHub

googleapis / google-cloud-python Public

• Notifications You must be signed in to change notification settings
• Fork 1.8k
• Star 5.4k

• Code
• Issues 442
• Pull requests 96
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit fcad04e

Browse filesBrowse the repository at this point in the historyBrowse files

gkevinzheng

authored

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

1 parent 871d4da commit fcad04e
Copy full SHA for fcad04e

2 files changed

+6-2Lines changed: 6 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/google-cloud-logging
  • google/cloud/logging_v2/handlers
    • _monitored_resources.py
  • tests/unit/handlers
    • test__monitored_resources.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/google-cloud-logging/google/cloud/logging_v2/handlers/_monitored_resources.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-logging/google/cloud/logging_v2/handlers/_monitored_resources.py

+5-2Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -61,6 +61,9 @@
61	61	_GKE_CLUSTER_NAME = "instance/attributes/cluster-name"
62	62	"""Attribute in metadata server when in GKE environment."""
63	63
	64	+ _GKE_CLUSTER_LOCATION = "instance/attributes/cluster-location"
	65	+ """Attribute in metadata server when in GKE environment."""
	66	+
64	67	_PROJECT_NAME = "project/project-id"
65	68	"""Attribute in metadata server when in GKE environment."""
66	69
@@ -94,15 +97,15 @@ def _create_kubernetes_resource():
94	97	Returns:
95	98	google.cloud.logging.Resource
96	99	"""
97		- zone = retrieve_metadata_server(_ZONE_ID)
	100	+ location = retrieve_metadata_server(_GKE_CLUSTER_LOCATION)
98	101	cluster_name = retrieve_metadata_server(_GKE_CLUSTER_NAME)
99	102	project = retrieve_metadata_server(_PROJECT_NAME)
100	103
101	104	resource = Resource(
102	105	type="k8s_container",
103	106	labels={
104	107	"project_id": project if project else "",
105		- "location": zone if zone else "",
	108	+ "location": location if location else "",
106	109	"cluster_name": cluster_name if cluster_name else "",
107	110	},
108	111	)

Collapse file

‎packages/google-cloud-logging/tests/unit/handlers/test__monitored_resources.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-logging/tests/unit/handlers/test__monitored_resources.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -56,6 +56,7 @@ def _mock_metadata(self, endpoint):
56	56	if (
57	57	endpoint == _monitored_resources._ZONE_ID
58	58	or endpoint == _monitored_resources._REGION_ID
	59	+ or endpoint == _monitored_resources._GKE_CLUSTER_LOCATION
59	60	):
60	61	return self.LOCATION
61	62	elif (

0 commit comments

Comments

0 (0)