From e5134dff2d0ffd30ea7cb44dfa8fb77ce0d29957 Mon Sep 17 00:00:00 2001 From: Nicolas Fidel Date: Tue, 18 Jun 2024 17:16:21 +0200 Subject: [PATCH 1/2] cloudwatch: add queryMode attribute --- CHANGELOG.rst | 4 ++-- grafanalib/cloudwatch.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cc53f617..c974148e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,10 +2,10 @@ Changelog ========= -x.x.x ? +0.7.2 ? ================== -* Added ... +* Add `QueryMode` parameter in CloudwatchMetricsTarget 0.7.1 2024-01-12 ================== diff --git a/grafanalib/cloudwatch.py b/grafanalib/cloudwatch.py index a9a22248..76d8fed2 100644 --- a/grafanalib/cloudwatch.py +++ b/grafanalib/cloudwatch.py @@ -32,6 +32,7 @@ class CloudwatchMetricsTarget(Target): :param hide: controls if given metric is displayed on visualization :param datasource: Grafana datasource name """ + alias = attr.ib(default="") dimensions = attr.ib(factory=dict, validator=instance_of(dict)) expression = attr.ib(default="") @@ -46,9 +47,9 @@ class CloudwatchMetricsTarget(Target): statistic = attr.ib(default="Average") hide = attr.ib(default=False, validator=instance_of(bool)) datasource = attr.ib(default=None) + queryMode = attr.ib(default="") def to_json_data(self): - return { "alias": self.alias, "dimensions": self.dimensions, @@ -64,6 +65,7 @@ def to_json_data(self): "statistic": self.statistic, "hide": self.hide, "datasource": self.datasource, + "queryMode": self.queryMode, } @@ -88,6 +90,7 @@ class CloudwatchLogsInsightsTarget(Target): :param hide: controls if given metric is displayed on visualization :param datasource: Grafana datasource name """ + expression = attr.ib(default="") id = attr.ib(default="") logGroupNames = attr.ib(factory=list, validator=instance_of(list)) @@ -99,7 +102,6 @@ class CloudwatchLogsInsightsTarget(Target): datasource = attr.ib(default=None) def to_json_data(self): - return { "expression": self.expression, "id": self.id, From 3630f8e6fc78987846d90d3bf2edbc48f5aaf83a Mon Sep 17 00:00:00 2001 From: Nicolas Fidel Date: Tue, 16 Jul 2024 15:01:55 +0200 Subject: [PATCH 2/2] cloudwatch: add doc for queryMode --- grafanalib/cloudwatch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/grafanalib/cloudwatch.py b/grafanalib/cloudwatch.py index 76d8fed2..97fa0f40 100644 --- a/grafanalib/cloudwatch.py +++ b/grafanalib/cloudwatch.py @@ -31,6 +31,7 @@ class CloudwatchMetricsTarget(Target): :param statistic: Cloudwatch mathematic statistic :param hide: controls if given metric is displayed on visualization :param datasource: Grafana datasource name + :param queryMode: queryMode for cloudwatch metric request """ alias = attr.ib(default="")