Merge remote-tracking branch 'origin/master' into sarah/fix-snowflake…

…-default
DataDog · Nov 23, 2021 · c6f101c · c6f101c
2 parents 0ec992e + 1f32928
commit c6f101c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
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
@@ -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('-', '_')

diff --git 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,