Bug fixes for GCP modules (#64587)

This commit is contained in:
The Magician 2019-11-11 11:08:19 -08:00 committed by ansibot
parent b1849d1a3e
commit ee50c3b3cf
2 changed files with 27 additions and 0 deletions

View file

@ -130,6 +130,14 @@ options:
required: false required: false
default: STRING default: STRING
type: str type: str
display_name:
description:
- A concise name for the metric, which can be displayed in user interfaces.
Use sentence case without an ending period, for example "Request count".
This field is optional but it is recommended to be set for any metrics associated
with user-visible concepts, such as Quota.
required: false
type: str
label_extractors: label_extractors:
description: description:
- A map from a label key string to an extractor expression which is used to extract - A map from a label key string to an extractor expression which is used to extract
@ -371,6 +379,14 @@ metricDescriptor:
- The type of data that can be assigned to the label. - The type of data that can be assigned to the label.
returned: success returned: success
type: str type: str
displayName:
description:
- A concise name for the metric, which can be displayed in user interfaces.
Use sentence case without an ending period, for example "Request count". This
field is optional but it is recommended to be set for any metrics associated
with user-visible concepts, such as Quota.
returned: success
type: str
labelExtractors: labelExtractors:
description: description:
- A map from a label key string to an extractor expression which is used to extract - A map from a label key string to an extractor expression which is used to extract
@ -492,6 +508,7 @@ def main():
elements='dict', elements='dict',
options=dict(key=dict(required=True, type='str'), description=dict(type='str'), value_type=dict(default='STRING', type='str')), options=dict(key=dict(required=True, type='str'), description=dict(type='str'), value_type=dict(default='STRING', type='str')),
), ),
display_name=dict(type='str'),
), ),
), ),
label_extractors=dict(type='dict'), label_extractors=dict(type='dict'),
@ -653,6 +670,7 @@ class MetricMetricdescriptor(object):
u'valueType': self.request.get('value_type'), u'valueType': self.request.get('value_type'),
u'metricKind': self.request.get('metric_kind'), u'metricKind': self.request.get('metric_kind'),
u'labels': MetricLabelsArray(self.request.get('labels', []), self.module).to_request(), u'labels': MetricLabelsArray(self.request.get('labels', []), self.module).to_request(),
u'displayName': self.request.get('display_name'),
} }
) )
@ -663,6 +681,7 @@ class MetricMetricdescriptor(object):
u'valueType': self.request.get(u'valueType'), u'valueType': self.request.get(u'valueType'),
u'metricKind': self.request.get(u'metricKind'), u'metricKind': self.request.get(u'metricKind'),
u'labels': MetricLabelsArray(self.request.get(u'labels', []), self.module).from_response(), u'labels': MetricLabelsArray(self.request.get(u'labels', []), self.module).from_response(),
u'displayName': self.request.get(u'displayName'),
} }
) )

View file

@ -178,6 +178,14 @@ resources:
- The type of data that can be assigned to the label. - The type of data that can be assigned to the label.
returned: success returned: success
type: str type: str
displayName:
description:
- A concise name for the metric, which can be displayed in user interfaces.
Use sentence case without an ending period, for example "Request count".
This field is optional but it is recommended to be set for any metrics
associated with user-visible concepts, such as Quota.
returned: success
type: str
labelExtractors: labelExtractors:
description: description:
- A map from a label key string to an extractor expression which is used to - A map from a label key string to an extractor expression which is used to