sqlexpress: Adjust code to collect SQLExpress metrics

netdata · Nov 12, 2024 · 48083c0 · 48083c0
1 parent ffd702f
commit 48083c0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/collectors/windows.plugin/perflib-mssql.c b/src/collectors/windows.plugin/perflib-mssql.c
@@ -7,6 +7,8 @@
 #define NETDATA_MAX_INSTANCE_NAME 32
 #define NETDATA_MAX_INSTANCE_OBJECT 128
 
+BOOL is_sqlexpress = FALSE;
+
 enum netdata_mssql_metrics {
     NETDATA_MSSQL_GENERAL_STATS,
     NETDATA_MSSQL_SQL_ERRORS,
@@ -146,8 +148,11 @@ static void initialize_mssql_objects(struct mssql_instance *p, const char *insta
     char prefix[NETDATA_MAX_INSTANCE_NAME];
     if (!strcmp(instance, "MSSQLSERVER")) {
         strncpyz(prefix, "SQLServer:", sizeof(prefix) -1);
+    } else if (!strcmp(instance, "SQLEXPRESS")) {
+        strncpyz(prefix, "MSSQL$SQLEXPRESS:", sizeof(prefix) -1);
     } else {
-        snprintfz(prefix, sizeof(prefix) -1, "MSSQL$:%s:", instance);
+        char *express = (!is_sqlexpress) ? "" : "SQLEXPRESS" ;
+        snprintfz(prefix, sizeof(prefix) -1, "MSSQL$%s:%s:", express, instance);
     }
 
     size_t length = strlen(prefix);
@@ -287,6 +292,10 @@ static int mssql_fill_dictionary() {
         if (ret != ERROR_SUCCESS)
             continue;
 
+        if (!strcmp(avalue, "SQLEXPRESS")) {
+            is_sqlexpress = TRUE;
+        }
+
         struct mssql_instance *p = dictionary_set(mssql_instances, avalue, NULL, sizeof(*p));
     }