diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 45a5cf6..c957a74 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -9,7 +9,6 @@ variables: SALSA_CI_DISABLE_BLHC: 1 SALSA_CI_DISABLE_LINTIAN: 0 SALSA_CI_DISABLE_PIUPARTS: 0 - SALSA_CI_DISABLE_REPROTEST: 0 + SALSA_CI_DISABLE_DEBREBUILD: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 - SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 diff --git a/debian/patches/27_check_mysql_fix_replica b/debian/patches/27_check_mysql_fix_replica new file mode 100644 index 0000000..3cce88f --- /dev/null +++ b/debian/patches/27_check_mysql_fix_replica @@ -0,0 +1,51 @@ +Backport of https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2184.patch + +--- a/plugins/check_mysql.c ++++ b/plugins/check_mysql.c +@@ -300,32 +300,20 @@ + num_fields = mysql_num_fields(res); + fields = mysql_fetch_fields(res); + for(i = 0; i < num_fields; i++) { +- if (use_deprecated_slave_status) { +- if (strcmp(fields[i].name, "Slave_IO_Running") == 0) { +- slave_io_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) { +- slave_sql_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) { +- seconds_behind_field = i; +- continue; +- } +- } else { +- if (strcmp(fields[i].name, "Replica_IO_Running") == 0) { +- slave_io_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Replica_SQL_Running") == 0) { +- slave_sql_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Seconds_Behind_Source") == 0) { +- seconds_behind_field = i; +- continue; +- } ++ if ((strcmp(fields[i].name, "Slave_IO_Running") == 0) || ++ (strcmp(fields[i].name, "Replica_IO_Running") == 0)) { ++ slave_io_field = i; ++ continue; ++ } ++ if ((strcmp(fields[i].name, "Slave_SQL_Running") == 0) || ++ (strcmp(fields[i].name, "Replica_SQL_Running") == 0)) { ++ slave_sql_field = i; ++ continue; ++ } ++ if ((strcmp(fields[i].name, "Seconds_Behind_Master") == 0) || ++ (strcmp(fields[i].name, "Seconds_Behind_Source") == 0)) { ++ seconds_behind_field = i; ++ continue; + } + } + diff --git a/debian/patches/series b/debian/patches/series index f540ae3..d3f523d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ 25_check_users_sd_get_uids 26_check_mysql_replica # feature patches +27_check_mysql_fix_replica