Add database to database identifier template variables (#20301)

* Add database to database identifier template variables

* Changelog

* None check

* Add azure_name to SQL server variables

* Docs

* Validate

Author: sethsamuel

sqlserver/assets/configuration/spec.yaml

@@ -98,6 +98,9 @@ files:
             - resolved_hostname: The resolved hostname of the instance, which respects the `reported_hostname` option.
             - host: The provided host of the instance.
             - port: The port number of the instance.
+            - azure_name: The resolved hostname of the instance, which respects the `reported_hostname` option,
+              but removes `.database.windows.net`
+            - database: The connection database.
             - server_name: The resolved server name of the instance.
             - instance_name: The resolved instance name of the instance.
             In addition, you can use any key from the `tags` section of the configuration.

sqlserver/changelog.d/20301.added

@@ -0,0 +1 @@
+Add database and Azure name to SQL Server database identifier template variables

sqlserver/datadog_checks/sqlserver/const.py

@@ -38,6 +38,8 @@
     "managed_instance": "azure_sql_server_managed_instance",
     "virtual_machine": "azure_virtual_machine_instance",
 }
+AZURE_SERVER_SUFFIX = ".database.windows.net"
+
 
 # Metric discovery queries
 COUNTER_TYPE_QUERY = """select distinct cntr_type

sqlserver/datadog_checks/sqlserver/data/conf.yaml.example

@@ -100,6 +100,9 @@ instances:
         ## - resolved_hostname: The resolved hostname of the instance, which respects the `reported_hostname` option.
         ## - host: The provided host of the instance.
         ## - port: The port number of the instance.
+        ## - azure_name: The resolved hostname of the instance, which respects the `reported_hostname` option,
+        ##   but removes `.database.windows.net`
+        ## - database: The connection database.
         ## - server_name: The resolved server name of the instance.
         ## - instance_name: The resolved instance name of the instance.
         ## In addition, you can use any key from the `tags` section of the configuration.

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -67,6 +67,7 @@
     AUTODISCOVERY_QUERY,
     AWS_RDS_HOSTNAME_SUFFIX,
     AZURE_DEPLOYMENT_TYPE_TO_RESOURCE_TYPES,
+    AZURE_SERVER_SUFFIX,
     BASE_NAME_QUERY,
     COUNTER_TYPE_QUERY,
     DATABASE_SERVICE_CHECK_NAME,
@@ -330,7 +331,11 @@ def database_identifier(self):
             tag_dict['resolved_hostname'] = self.resolved_hostname
             tag_dict['host'] = str(self.host)
             tag_dict['port'] = str(self.port)
-            print(self.static_info_cache)
+            tag_dict['database'] = str(
+                self.instance.get('database', self.connection.DEFAULT_DATABASE if self.connection else None)
+            )
+            if self.resolved_hostname.endswith(AZURE_SERVER_SUFFIX):
+                tag_dict['azure_name'] = self.resolved_hostname[: -len(AZURE_SERVER_SUFFIX)]
             if self.static_info_cache.get(STATIC_INFO_SERVERNAME) is not None:
                 tag_dict['server_name'] = self.static_info_cache.get(STATIC_INFO_SERVERNAME)
             if self.static_info_cache.get(STATIC_INFO_INSTANCENAME) is not None: