Skip to content
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.

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

Fix monitoring ent detection #9590

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

mcalmer
Copy link
Contributor

@mcalmer mcalmer commented Dec 20, 2024

What does this PR change?

On Oracle Linux the OS Release is a 2 digit number. Our isRedHatX detection uses the family but expected only a single number.
Now we use a startsWith() to also detect sub releases.

This PR simplify also the OS release detection. We simply use what the grains will report to us instead of trying to stay compatible with the traditional stack.

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed: only internal and user invisible changes

  • DONE

Test coverage

  • Unit tests were adapted

  • DONE

Links

Port(s): https://github.com/SUSE/spacewalk/pull/26108

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

@mcalmer mcalmer requested a review from a team as a code owner December 20, 2024 11:47
@mcalmer mcalmer requested review from nadvornik and removed request for a team December 20, 2024 11:47
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take some time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/9590/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/9590/checks.

If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code.

Reference tests:

KNOWN ISSUES

Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience.

For more tips on troubleshooting, see the troubleshooting guide.

Happy hacking!
⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Copy link
Contributor

Suggested tests to cover this Pull Request
  • sle_ssh_minion
  • min_salt_migration
  • min_salt_install_with_staging
  • proxy_register_as_minion_with_script
  • min_deblike_salt
  • allcli_overview_systems_details
  • min_salt_formulas
  • min_project_lotus
  • srv_docker_cve_audit
  • minssh_move_from_and_to_proxy
  • min_salt_install_package
  • min_deblike_remote_command
  • srv_monitoring
  • srv_datepicker
  • min_salt_openscap_audit
  • minkvm_guests
  • min_monitoring
  • min_recurring_action
  • min_salt_minion_details
  • srv_restart
  • min_rhlike_openscap_audit
  • srv_distro_cobbler
  • srv_custom_system_info
  • min_salt_minions_page
  • min_deblike_salt_install_package
  • min_empty_system_profiles
  • min_cve_id_new_syntax
  • min_ssh_tunnel
  • allcli_sanity
  • min_move_from_and_to_proxy
  • min_ansible_control_node
  • srv_power_management_redfish
  • min_bootstrap_script
  • min_rhlike_monitoring
  • srv_menu
  • allcli_software_channels_dependencies
  • min_cve_audit
  • min_salt_mgrcompat_state
  • min_config_state_channel
  • srv_reportdb
  • buildhost_bootstrap
  • minssh_salt_install_package
  • allcli_reboot
  • minssh_bootstrap_api
  • proxy_retail_pxeboot_and_mass_import
  • min_rhlike_salt_install_package_and_patch
  • min_deblike_monitoring
  • min_deblike_salt_install_with_staging
  • min_check_patches_install
  • srv_user_configuration_salt_states
  • srv_scc_user_credentials
  • srv_cobbler_distro
  • min_rhlike_salt
  • min_salt_lock_packages
  • srv_rename_hostname
  • proxy_branch_network
  • min_bootstrap_api
  • srv_group_union_intersection
  • minssh_ansible_control_node
  • srv_virtual_host_manager
  • allcli_action_chain
  • min_salt_formulas_advanced
  • min_config_state_channel_api
  • srv_cobbler_profile
  • srv_power_management
  • min_salt_user_states
  • allcli_config_channel
  • min_virthost
  • min_deblike_openscap_audit
  • srv_power_management_api
  • min_action_chain
  • min_config_state_channel_subscriptions
  • buildhost_docker_auth_registry
  • min_timezone
  • min_bootstrap_negative
  • buildhost_osimage_build_image
  • srv_manage_activationkey
  • srv_advanced_search
  • min_activationkey
  • allcli_software_channels
  • min_bootstrap_reactivation
  • min_rhlike_remote_command
  • srv_maintenance_windows
  • min_salt_pkgset_beacon
  • proxy_as_pod_basic_tests
  • buildhost_docker_build_image
  • sle_minion
  • min_deblike_ssh
  • min_salt_software_states
  • min_rhlike_ssh
  • minssh_action_chain
  • min_custom_pkg_download_endpoint
  • allcli_system_group
  • proxy_cobbler_pxeboot
  • srv_manage_channels_page
  • min_bootstrap_ssh_key
  • min_retracted_patches
  • min_change_software_channel
  • proxy_container
  • proxy_container_branch_network
  • srv_handle_software_channels_with_ISS_v2
  • minssh_tunnel
  • proxy_traditional_cobbler_pxeboot
  • proxy_container_cobbler_pxeboot
  • srv_push_package
  • srv_task_status_engine
  • srv_errata_api
  • proxy_container_retail_pxeboot
  • proxy_container_retail_mass_import
  • srv_dist_channel_mapping

@@ -1003,98 +1002,6 @@ private Map<String, List<String>> parseRHELReleseQuery(String result) {
private String getOsRelease(String minionId, ValueMap grains) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this method is only use in the places you have removed the call. Can this method be removed at all?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, and there are more unused functions now. I will adapt this

@mcalmer mcalmer force-pushed the fix-monitoring-ent-detection branch from 2d92f2e to 1077d49 Compare December 20, 2024 13:22
Copy link
Member

@rjmateus rjmateus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

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

Successfully merging this pull request may close these issues.

2 participants