From 801e2716876cc417ca09a5398f0a41fe44ef9676 Mon Sep 17 00:00:00 2001 From: Ian Bucad Date: Wed, 24 Nov 2021 04:09:20 +1100 Subject: [PATCH 1/2] Change MQ Connection widget to cluster check (#10673) * Change MQ Connection widget to cluster check Widget is currently not showing any data regardless of values chosen in template variables * missing comma Co-authored-by: Fanny Jiang Co-authored-by: Fanny Jiang --- ibm_mq/assets/dashboards/overview.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ibm_mq/assets/dashboards/overview.json b/ibm_mq/assets/dashboards/overview.json index 2f7a05baf3971..496f4448688d4 100644 --- a/ibm_mq/assets/dashboards/overview.json +++ b/ibm_mq/assets/dashboards/overview.json @@ -242,10 +242,16 @@ "title_size": "16", "title_align": "center", "check": "ibm_mq.can_connect", - "grouping": "check", - "group": "channel:dev.admin.svrconn,host:localhost,port:1414,queue_manager:qm1,host:mq.sahni.info", - "group_by": [], - "tags": [] + "grouping": "cluster", + "group_by": [ + "mq_host", + "host" + ], + "tags": [ + "$queue_manager", + "$channel", + "$host" + ] }, "layout": { "x": 1, From 1f32928d8e610fcfc53b64938b61235e03d5341f Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Tue, 23 Nov 2021 16:30:00 -0500 Subject: [PATCH 2/2] Allow keywords as defaults (#10715) --- .../dev/tooling/configuration/consumers/model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model.py b/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model.py index 6700bef1b458a..f0fc890c3be54 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model.py @@ -8,6 +8,7 @@ from datamodel_code_generator.format import CodeFormatter, PythonVersion from datamodel_code_generator.parser import LiteralType from datamodel_code_generator.parser.openapi import OpenAPIParser +from pydantic import BaseModel from ..constants import OPENAPI_SCHEMA_PROPERTIES from ..utils import sanitize_openapi_object_properties @@ -23,7 +24,7 @@ def normalize_option_name(option_name): # https://github.com/koxudaxi/datamodel-code-generator/blob/0.8.3/datamodel_code_generator/model/base.py#L82-L84 - if iskeyword(option_name): + if iskeyword(option_name) or hasattr(BaseModel, option_name): option_name += '_' return option_name.replace('-', '_')