Skip to content

Commit efeb29a

Browse files
author
dongyo
committed
update for stackdriver
- remove metric_info.json - update stackdriver as interface
1 parent 39eaa77 commit efeb29a

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

bin/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/bash
22
# Build a docker image
33
cd ..
4-
docker build -t pyengine/aws-cloudwatch . --no-cache
5-
docker tag pyengine/aws-cloudwatch pyengine/google-cloud-stackdriver:1.0
6-
docker tag pyengine/aws-cloudwatch spaceone/google-cloud-stackdriver:1.0
4+
docker build -t pyengine/google-cloud-stackdriver . --no-cache
5+
docker tag pyengine/google-cloud-stackdriver pyengine/google-cloud-stackdriver:1.0
6+
docker tag pyengine/google-cloud-stackdriver spaceone/google-cloud-stackdriver:1.0

src/spaceone/monitoring/connector/google_cloud_connector/stackdriver.py

+16-1
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ def get_metric_data(self, resource, metric, start, end, period, stat):
6262
interval = metric_point.get('interval', {})
6363
value = metric_point.get('value', {})
6464
time_stamps.append(self._get_time_stamps(interval))
65-
values.append(value.get('doubleValue', 0))
65+
values.append(self._get_value(value))
6666

6767
metric_data_info['labels'] = list(map(self._convert_timestamp, time_stamps))
6868
metric_data_info['values'] = values
6969

70+
pprint(metric_data_info)
71+
7072
return metric_data_info
7173

7274
def list_metric_descriptors(self, resource, **query):
@@ -202,6 +204,19 @@ def _get_metric_data_filter(metric: str, resource: dict):
202204
def _get_chart_info(namespace):
203205
return 'line', {}
204206

207+
@staticmethod
208+
def _get_value(value):
209+
metric_value = 0
210+
double = value.get('doubleValue', None)
211+
int_64 = value.get('int64Value', None)
212+
if double is not None:
213+
metric_value = double
214+
elif int_64 is not None:
215+
metric_value = int_64
216+
217+
return metric_value
218+
219+
205220
@staticmethod
206221
def _get_metric_unit(unit):
207222
unit_name = unit

src/spaceone/monitoring/manager/google_cloud_manager.py

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def list_metrics(self, schema, options, secret_data, resource):
3838
return self.google_cloud_connector.list_metrics(filters)
3939

4040
def get_metric_data(self, schema, options, secret_data, resource, metric, start, end, period, stat):
41-
resource_type, filters = self._get_metric_filters(resource)
42-
4341
if period is None:
4442
period = self._make_period_from_time_range(start, end)
4543

0 commit comments

Comments
 (0)