Upgrading the metrics query to the latest version (GoogleCloudPlatform#1674)

billyjacobson · web-flow · commit f820f6dae6e4 · 2018-09-04T10:43:06.000-04:00
* Upgrading the metrics query to the latest version

* fix lint issues

* Importing module not class
diff --git a/bigtable/metricscaler/metricscaler.py b/bigtable/metricscaler/metricscaler.py
@@ -16,10 +16,14 @@
 programmatically scale a Google Cloud Bigtable cluster."""
 
 import argparse
+import os
 import time
 
 from google.cloud import bigtable
-from google.cloud import monitoring
+from google.cloud import monitoring_v3
+from google.cloud.monitoring_v3 import query
+
+PROJECT = os.environ['GCLOUD_PROJECT']
 
 
 def get_cpu_load():
@@ -29,11 +33,15 @@ def get_cpu_load():
           float: The most recent Cloud Bigtable CPU usage metric
     """
     # [START bigtable_cpu]
-    client = monitoring.Client()
-    query = client.query('bigtable.googleapis.com/cluster/cpu_load', minutes=5)
-    time_series = list(query)
+    client = monitoring_v3.MetricServiceClient()
+    cpu_query = query.Query(client,
+                            project=PROJECT,
+                            metric_type='bigtable.googleapis.com/'
+                                        'cluster/cpu_load',
+                            minutes=5)
+    time_series = list(cpu_query)
     recent_time_series = time_series[0]
-    return recent_time_series.points[0].value
+    return recent_time_series.points[0].value.double_value
     # [END bigtable_cpu]
 
 
diff --git a/bigtable/metricscaler/metricscaler_test.py b/bigtable/metricscaler/metricscaler_test.py
@@ -32,7 +32,7 @@
 
 
 def test_get_cpu_load():
-    assert get_cpu_load() > 0.0
+    assert float(get_cpu_load()) > 0.0
 
 
 def test_scale_bigtable():
diff --git a/bigtable/metricscaler/requirements.txt b/bigtable/metricscaler/requirements.txt
@@ -1,2 +1,2 @@
 google-cloud-bigtable==0.29.0
-google-cloud-monitoring==0.28.1
+google-cloud-monitoring==0.30.1

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`google-cloud-bigtable==0.29.0`
`2`		`-google-cloud-monitoring==0.28.1`
	`2`	`+google-cloud-monitoring==0.30.1`