New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support fort Zabbix 7.2 #981

Open

Safranil wants to merge 1 commit into voxpupuli:master from capsi-informatique:master

Contributor

Safranil commented Dec 14, 2024 •

edited

Loading

Pull Request (PR) description

Zabbix 7.2 was published some day ago and some structural change was made by Zabbix Team:

The repository base URL changed to https://repo.zabbix.com/zabbix/7.2/release/<os> ;
The PHP UI directory change to /usr/share/zabbix/ui ;
The SQL script directory change to /usr/share/zabbix/sql-scripts.

This Pull Request (PR) fixes the following issues

No issue was opened.

Safranil force-pushed the master branch from cccfd21 to bf31470 Compare

December 14, 2024 22:46

Safranil marked this pull request as draft

December 14, 2024 23:08

Safranil force-pushed the master branch 2 times, most recently from f104712 to e5147c9 Compare

December 14, 2024 23:36

Safranil changed the title ~~Repository URL change since Zabbix 7.2~~ Support fort Zabbix 7.2

Safranil force-pushed the master branch 2 times, most recently from 08a00e2 to 2496d29 Compare

December 15, 2024 00:03


          Support for Zabbix 7.2

3924c9b

Safranil force-pushed the master branch from 2496d29 to 3924c9b Compare

December 15, 2024 00:14

Safranil marked this pull request as ready for review

December 15, 2024 00:30

Contributor

Valantin commented Jan 27, 2025

Hi, actually the module test supports only LTS release of zabbix, due to the short release schedule of that standard one.
I suggest you to change the PR to add parameter to support 7.2 without add explicit check for it.

Valantin requested changes

View reviewed changes

Contributor

Valantin left a comment

use the variable instead add new complexity for standar release every 6 month

manifests/database/mysql.pp

@@ @@ -24,7 +24,9 @@ @@
                 assert_private()
                 if ($database_schema_path == false) or ($database_schema_path == '') {
-                  if versioncmp($zabbix_version, '6.0') >= 0 {
+                  if versioncmp($zabbix_version, '7.2') >= 0 {

Contributor

Valantin Jan 27, 2025

why not just use $database_schema_path?

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/database/postgresql.pp

@@ @@ -25,7 +25,9 @@ @@
                 if $database_schema_path != false and $database_schema_path != '' {
                   $schema_path = $database_schema_path
-                } elsif versioncmp($zabbix_version, '6.0') >= 0 {
+                } elsif versioncmp($zabbix_version, '7.2') >= 0 {

Contributor

Valantin Jan 27, 2025

same as for mysql

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/repo.pp

@@ @@ -37,7 +37,12 @@ @@
                       }
                       $_repo_location = $repo_location ? {
-                        undef   => "https://repo.zabbix.com/zabbix/${zabbix_version}/rhel/${majorrelease}/\$basearch/",
+                        undef   => versioncmp($zabbix_version, '7.2') ? {

Contributor

Valantin Jan 27, 2025

You can specify $repo_location

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/web.pp

@@ @@ -258,6 +258,13 @@ @@
                 # Is set to true, it will create the apache vhost.
                 if $manage_vhost {
+                  $zabbix_ui_dir = versioncmp($zabbix_version, '7.2') ? {

Contributor

Valantin Jan 27, 2025

set zabbix_ui_dir as a parameter with the default as /usr/share/zabbix

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/database_mysql_spec.rb

@@ @@ -23,7 +23,9 @@ @@
                     supported_versions.each do |zabbix_version|
                       # path to sql files on Debian and RedHat
-                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0

Contributor

Valantin Jan 27, 2025

no test for standard release

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/database_postgresql_spec.rb

@@ @@ -28,7 +28,9 @@ @@
                     end
                     supported_versions.each do |zabbix_version|
-                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0

Contributor

Valantin Jan 27, 2025

no test for standard release

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/repo_spec.rb

@@ @@ -137,6 +137,22 @@ @@
                         it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') } if facts[:os]['release']['major'].to_i < 9
                         it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') } if facts[:os]['release']['major'].to_i >= 9
                       end

Contributor

Valantin Jan 27, 2025

no test for standard release

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/support/acceptance/supported_versions.rb

@@ @@ -1,7 +1,7 @@ @@
               # frozen_string_literal: true
               def supported_versions
-                supported_versions = %w[5.0 6.0 7.0]
+                supported_versions = %w[5.0 6.0 7.0 7.2]

Contributor

Valantin Jan 27, 2025

remove 7.2 because we only test LTS release

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

bartjackbakker reviewed

View reviewed changes

bartjackbakker left a comment

This change is a good preparation for the LTS version 8.0.

manifests/database/mysql.pp

@@ @@ -24,7 +24,9 @@ @@
                 assert_private()
                 if ($database_schema_path == false) or ($database_schema_path == '') {
-                  if versioncmp($zabbix_version, '6.0') >= 0 {
+                  if versioncmp($zabbix_version, '7.2') >= 0 {

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/database/postgresql.pp

@@ @@ -25,7 +25,9 @@ @@
                 if $database_schema_path != false and $database_schema_path != '' {
                   $schema_path = $database_schema_path
-                } elsif versioncmp($zabbix_version, '6.0') >= 0 {
+                } elsif versioncmp($zabbix_version, '7.2') >= 0 {

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/repo.pp

@@ @@ -37,7 +37,12 @@ @@
                       }
                       $_repo_location = $repo_location ? {
-                        undef   => "https://repo.zabbix.com/zabbix/${zabbix_version}/rhel/${majorrelease}/\$basearch/",
+                        undef   => versioncmp($zabbix_version, '7.2') ? {

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

manifests/web.pp

@@ @@ -258,6 +258,13 @@ @@
                 # Is set to true, it will create the apache vhost.
                 if $manage_vhost {
+                  $zabbix_ui_dir = versioncmp($zabbix_version, '7.2') ? {

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/database_mysql_spec.rb

@@ @@ -23,7 +23,9 @@ @@
                     supported_versions.each do |zabbix_version|
                       # path to sql files on Debian and RedHat
-                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/database_postgresql_spec.rb

@@ @@ -28,7 +28,9 @@ @@
                     end
                     supported_versions.each do |zabbix_version|
-                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+                      path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/classes/repo_spec.rb

@@ @@ -137,6 +137,22 @@ @@
                         it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') } if facts[:os]['release']['major'].to_i < 9
                         it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') } if facts[:os]['release']['major'].to_i >= 9
                       end

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

spec/support/acceptance/supported_versions.rb

@@ @@ -1,7 +1,7 @@ @@
               # frozen_string_literal: true
               def supported_versions
-                supported_versions = %w[5.0 6.0 7.0]
+                supported_versions = %w[5.0 6.0 7.0 7.2]

bartjackbakker Feb 20, 2025

This change is a good preparation for the LTS version 8.0.

Contributor

Heidistein commented Feb 27, 2025

Hi.
Yes, I agree with @bartjackbakker . Allthough you dont want to support normal releases (fair enough, I guess), all these changes are comming to 8.0. The moment 8.0 will be released the 7.2 tests can be changes to 8.0. In my opinion.

And, yes, this is in my own interest, because I'd like 7.2 deployed. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet