mk-sql: correct sql script to get backups in "clustered" setup

SUP-21423 SUP-20138 Change-Id: Ia035be14cbfa5d22023612e0a5e4b7645c390c52
Checkmk · Jan 2, 2025 · bcd5e0f · bcd5e0f
1 parent 2ec6399
commit bcd5e0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/host/mk-sql/src/ms_sql/instance.rs b/packages/host/mk-sql/src/ms_sql/instance.rs
@@ -1727,7 +1727,7 @@ fn to_backup_entry(
         .get_value_by_name("is_primary_replica")
         .trim()
         .to_string();
-    if replica_id.is_empty() || is_primary_replica == "True" {
+    if replica_id.is_empty() || is_primary_replica == "True" || is_primary_replica == "1" {
         format!(
             "{}{sep}{}{sep}{}+00:00{sep}{}\n",
             instance_name,
@@ -1769,7 +1769,7 @@ fn to_backup_entry_odbc(
         .get_value_by_name(row, "is_primary_replica")
         .trim()
         .to_string();
-    if replica_id.is_empty() || is_primary_replica == "True" {
+    if replica_id.is_empty() || is_primary_replica == "True" || is_primary_replica == "1" {
         format!(
             "{}{sep}{}{sep}{}+00:00{sep}{}\n",
             instance_name,

diff --git a/packages/host/mk-sql/src/ms_sql/sqls.rs b/packages/host/mk-sql/src/ms_sql/sqls.rs
@@ -215,8 +215,8 @@ BEGIN
                      (CASE WHEN time_zone IS NOT NULL AND time_zone <> 127 THEN 60 * 15 * time_zone ELSE 0 END)), ''19700101''), 120)
                      AS last_backup_date,
       cast(b.type as nvarchar(max)) as type,
-      cast(b.machine_name as nvarchar(max)),
-      isnull(rep.is_primary_replica,0) as is_primary_replica,
+      cast(b.machine_name as nvarchar(max)) as machine_name,
+      isnull(convert(nvarchar(40), rep.is_primary_replica), '''') as is_primary_replica,
       rep.is_local,
       isnull(convert(nvarchar(40), rep.replica_id), '''') AS replica_id,
       cast(db.name as nvarchar(max)) AS database_name