Skip to content

Commit 4f68c4d

Browse files
authored
Fix the DAG related to Node Pool Status. (GoogleCloudPlatform#1053)
This change fixes the following main file: - dags/tpu_observability/utils/node_pool_util.py Affected DAGs: - dags/tpu_observability/multi_host_nodepool_rollback_dag.py - dags/tpu_observability/node_pool_status.py - dags/tpu_observability/update_node_pool_label.py
1 parent 554454f commit 4f68c4d

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

dags/tpu_observability/multi_host_nodepool_rollback_dag.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"CLUSTER_NAME", default_var="tpu-observability-automation"
6060
),
6161
node_pool_name=Variable.get(
62-
"NODE_POOL_NAME", default_var="multi_host_nodepool_rollback_auto"
62+
"NODE_POOL_NAME", default_var="multi-host-nodepool-rollback-auto"
6363
),
6464
location=Variable.get("LOCATION", default_var=Region.US_CENTRAL1.value),
6565
node_locations=Variable.get(

dags/tpu_observability/utils/node_pool_util.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ def _query_status_metric(node_pool: Info) -> Status:
232232
start_time = TimeUtil.from_datetime(start_time_datetime)
233233
end_time = TimeUtil.from_datetime(now)
234234

235-
filter_string = (
236-
'metric.type="kubernetes.io/node_pool/status" '
237-
f'resource.labels.project_id = "{node_pool.project_id}" '
238-
f'resource.labels.cluster_name = "{node_pool.cluster_name}" '
239-
f'resource.labels.node_pool_name = "{node_pool.node_pool_name}"'
240-
)
235+
filter_string = [
236+
'metric.type="kubernetes.io/node_pool/status"',
237+
f'resource.labels.project_id = "{node_pool.project_id}"',
238+
f'resource.labels.cluster_name = "{node_pool.cluster_name}"',
239+
f'resource.labels.node_pool_name = "{node_pool.node_pool_name}"',
240+
]
241241

242242
# A single query to the Monitoring API can return multiple TimeSeries objects,
243243
# especially if the 'status' label changed within the time window (e.g., from
@@ -355,12 +355,12 @@ def wait_for_availability(
355355
start_time = TimeUtil.from_datetime(start_time_datetime)
356356
end_time = TimeUtil.from_datetime(now)
357357

358-
filter_string = (
359-
'metric.type="kubernetes.io/node_pool/multi_host/available" '
360-
f'resource.labels.project_id = "{node_pool.project_id}" '
361-
f'resource.labels.cluster_name="{node_pool.cluster_name}" '
362-
f'resource.labels.node_pool_name="{node_pool.node_pool_name}"'
363-
)
358+
filter_string = [
359+
'metric.type="kubernetes.io/node_pool/multi_host/available"',
360+
f'resource.labels.project_id = "{node_pool.project_id}"',
361+
f'resource.labels.cluster_name="{node_pool.cluster_name}"',
362+
f'resource.labels.node_pool_name="{node_pool.node_pool_name}"',
363+
]
364364

365365
page_result = query_time_series(
366366
project_id=node_pool.project_id,

0 commit comments

Comments
 (0)