From f6042af0b8e01f00bc8e8a58d6b71395e91d6e42 Mon Sep 17 00:00:00 2001 From: Satellite Automation Date: Thu, 5 Mar 2026 15:07:49 +0000 Subject: [PATCH 1/5] Update TOC file from downstream --- test/fixtures/toc.json | 89 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/test/fixtures/toc.json b/test/fixtures/toc.json index f2d378f8..28223e31 100644 --- a/test/fixtures/toc.json +++ b/test/fixtures/toc.json @@ -162,6 +162,7 @@ ], "increasing-logging-levels-of-satellite-components": [ "increasing-the-logging-level-for-foreman", + "increasing-the-logging-level-for-red-hat-lightspeed-in-satellite", "increasing-the-logging-level-for-hammer", "increasing-the-logging-level-for-capsule", "increasing-the-logging-level-for-candlepin", @@ -307,9 +308,6 @@ ], "resetting-external-authentication-configuration-for-kerberos-sso": [ - ], - "resetting-external-authentication-configuration-for-kerberos-sso": [ - ] }, "installing_capsule_server": { @@ -460,6 +458,7 @@ "Overriding_Ansible_Variables_in_satellite_ansible", "adding-rhel-system-roles_ansible", "synchronizing-ansible-collections_ansible", + "consuming-content-from-an-ansible-collection-repository", "customizing-ansible-configuration_ansible", "using-ansible-vault-with-satellite_ansible" ], @@ -529,19 +528,24 @@ "providing-feedback-on-red-hat-documentation_managing-configurations-puppet": [ ], - "introducing-configuration-management-by-using-puppet": [ + "configuration-management-with-puppet-in-satellite": [ "How_Puppet_Integrates_With_Project_managing-configurations-puppet", - "supported-puppet-versions-and-system-requirements_managing-configurations-puppet", - "Enabling_Puppet_Integration_managing-configurations-puppet", + "high-level-steps-for-puppet-integration-with-satellite", + "high-level-steps-for-configuration-management-with-puppet", + "supported-puppet-versions-and-system-requirements_managing-configurations-puppet" + ], + "enabling-puppet-integration-with-satellite": [ + "installing-puppet-server-on-satellite-server-and-capsule-servers", "Installing_and_Configuring_Puppet_Agent_during_Host_Provisioning_managing-configurations-puppet", "installing-and-configuring-puppet-agent-during-host-registration_managing-configurations-puppet", - "Installing_and_Configuring_Puppet_Agent_Manually_managing-configurations-puppet", - "performing-configuration-management_managing-configurations-puppet", - "Disabling_Puppet_Integration_managing-configurations-puppet" + "Installing_and_Configuring_Puppet_Agent_Manually_managing-configurations-puppet" + ], + "disabling-puppet-integration-with-satellite": [ + ], "managing-puppet-modules_managing-configurations-puppet": [ "installing_a_puppet_module_managing-configurations-puppet", - "updating-a-puppet-module" + "updating-a-puppet-module-on-your-satellite-server" ], "importing_puppet_classes_and_environments_managing-configurations-puppet": [ @@ -567,10 +571,7 @@ ], "enforcing-puppet-configuration-on-hosts_managing-configurations-puppet": [ "running-puppet-once-using-ssh_managing-configurations-puppet", - "understanding-intervals-of-automatic-enforcement_managing-configurations-puppet", - "setting-the-puppet-agent-run-interval_managing-configurations-puppet", - "setting-the-global-out-of-sync-interval_managing-configurations-puppet", - "setting-the-puppet-out-of-sync-interval_managing-configurations-puppet", + "configuring-puppet-intervals-of-automatic-enforcement", "overriding-out-of-sync-interval-for-a-host-group_managing-configurations-puppet", "overriding-out-of-sync-interval-for-an-individual-host_managing-configurations-puppet" ], @@ -711,8 +712,10 @@ "content-view-environments-overview", "content-view-environment-categories", "content-view-environment-ordering-and-priority", - "assigning-content-view-environments-to-hosts", - "assigning-content-view-environments-to-hosts-by-using-subscription-manager", + "assigning-content-view-environments-to-hosts-in-bulk", + "assigning-content-view-environments-to-a-host-by-using-web-ui", + "assigning-content-view-environments-to-a-host-by-using-cli", + "assigning-content-view-environments-to-a-host-by-using-subscription-manager", "comparison-of-content-view-environments-and-composite-content-views" ], "synchronizing_content_between_servers_content-management": [ @@ -747,7 +750,8 @@ "setting-the-service-level-by-using-cli", "enabling-and-disabling-repositories-on-activation-key_content-management", "multiple-activation-keys-and-content-view-environments", - "assigning-content-view-environments-to-activation-keys", + "assigning-content-view-environments-to-an-activation-key-by-using-web-ui", + "assigning-content-view-environments-to-an-activation-key-by-using-cli", "removing-all-content-view-environments-from-an-activation-key" ], "managing_errata_content-management": [ @@ -794,7 +798,8 @@ "importing-an-iso-image-by-using-cli" ], "managing_ansible_content_content-management": [ - "synchronizing-ansible-collections_content-management" + "synchronizing-ansible-collections_content-management", + "consuming-content-from-an-ansible-collection-repository" ], "managing-custom-file-type-content": [ "creating-a-local-source-for-a-custom-file-type-repository", @@ -901,7 +906,11 @@ "deploying-insights-client-on-registered-hosts_insights-in-satellite", "examining-recommendations-for-hosts_insights-in-satellite", "remediating-issues-based-on-red-hat-lightspeed-recommendations_insights-in-satellite", + "disabling-recommendations", + "enabling-recommendations", "examining-vulnerability-of-hosts", + "disabling-vulnerability-analysis-on-hosts", + "enabling-vulnerability-analysis-on-hosts", "exclusion-of-hosts-from-red-hat-lightspeed-analytics_insights-in-satellite" ], "connecting-ai-applications-to-the-mcp-server-for-satellite": [ @@ -1026,26 +1035,17 @@ "enabling-openscap": [ ], - "configuring-compliance-policy-deployment-methods_security-compliance": [ - "compliance-policy-deployment-options_security-compliance", - "configuring-satellite-for-ansible-compliance-policy-deployment", - "configuring-satellite-for-puppet-compliance-policy-deployment" - ], - "listing-available-scap-contents-using-web-ui": [ - - ], - "listing-available-scap-contents-using-cli": [ - - ], - "configuring_scap_contents_security-compliance": [ + "configuring-scap-contents-for-compliance-policies-in-satellite": [ + "listing-available-scap-contents-using-web-ui", + "listing-available-scap-contents-using-cli", "Loading_the_Default_SCAP_Contents_security-compliance", "getting-supported-scap-contents-for-rhel_security-compliance", "uploading-additional-scap-content-using-web-ui", "uploading-additional-scap-content-using-cli", - "tailoring-xccdf-profiles_security-compliance", - "Uploading_a_Tailoring_File_security-compliance" + "customizing-xccdf-profiles-with-tailoring-files" ], "managing_compliance_policies_security-compliance": [ + "configuring-compliance-policy-deployment-methods_security-compliance", "Creating_a_Compliance_Policy_security-compliance", "Viewing_a_Compliance_Policy_security-compliance", "Editing_a_Compliance_Policy_security-compliance", @@ -1067,8 +1067,7 @@ "Compliance_Email_Notifications_security-compliance", "Viewing_Compliance_Policy_Statistics_security-compliance", "remediating-compliance-failures_security-compliance", - "Deleting_a_Compliance_Report_security-compliance", - "Deleting_Multiple_Compliance_Reports_security-compliance" + "Deleting_a_Compliance_Report_security-compliance" ] }, "monitoring_satellite_performance": { @@ -1103,7 +1102,7 @@ "providing-feedback-on-red-hat-documentation_planning": [ ], - "satellite-overview": [ + "introduction-to-satellite": [ ], "content-and-patch-management-with-satellite": [ @@ -1178,9 +1177,9 @@ "iss-scenarios_planning", "deploying-satellite-on-aws" ], - "provisioning-requirements": [ - "pxe-booting", - "http-booting" + "provisioning-requirements-in-satellite": [ + "pxe-booting-in-satellite", + "http-booting-in-satellite" ], "technical-users-provided-and-required-by-satellite": [ @@ -1276,7 +1275,7 @@ "virt-who", "XCCDF_profiles" ], - "cli-help_planning": [ + "help-resources-for-using-cli-in-satellite": [ "Services", "Plugins", "Hammer_CLI" @@ -1497,23 +1496,23 @@ "introduction_to_performance_tuning_performance-tuning": [ ], - "performance-tuning-quick-start": [ + "selecting-an-installation-size": [ ], "system_requirements_for_tuning_performance-tuning": [ ], - "determining_hardware_and_operating_system_configuration_performance-tuning": [ + "hardware-and-operating-system-configuration": [ "Enabling_Tuned_Profiles_performance-tuning", "Disable_Transparent_Hugepage_performance-tuning" ], "configuring_project_for_performance_performance-tuning": [ - "Applying_configurations_performance-tuning", - "Puma_Tunings_performance-tuning", + "considerations-for-performance-tuning", + "puma-tunings", "Apache_HTTPD_Performance_Tuning_performance-tuning", - "Dynflow_Tuning_performance-tuning", + "tuning-dynflow", "Pull_based_REX_transport_tuning_performance-tuning", - "PostgreSQL_Tuning_performance-tuning", + "tuning-postgresql", "Redis_Tuning_performance-tuning", "Smart_Proxy_Configuration_Tuning_performance-tuning" ] From cbb0bcb6a9b24911e8a5740a891b64c5c40dd64c Mon Sep 17 00:00:00 2001 From: Adam Ruzicka Date: Mon, 2 Mar 2026 10:14:51 +0100 Subject: [PATCH 2/5] Adjust doc links to TOC changes --- lib/foreman_theme_satellite/documentation.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/foreman_theme_satellite/documentation.rb b/lib/foreman_theme_satellite/documentation.rb index 33b65e26..5fbfe8dd 100644 --- a/lib/foreman_theme_satellite/documentation.rb +++ b/lib/foreman_theme_satellite/documentation.rb @@ -46,8 +46,8 @@ module Documentation 'LDAPAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index#configuring-an-ldap-server-as-an-external-identity-provider-for-project_authentication", 'ExternalAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index", 'Bookmarks' => "administering_red_hat_satellite/index#Searching_and_Bookmarking_admin", - 'Policydeploymentoptions' => "managing_security_compliance/index#compliance-policy-deployment-options_security-compliance", - 'CreatingSCAPcontent' => "managing_security_compliance/index#Configuring_SCAP_Contents_security-compliance", + 'Policydeploymentoptions' => "managing_security_compliance/index#configuring-compliance-policy-deployment-methods_security-compliance", + 'CreatingSCAPcontent' => "managing_security_compliance/index#configuring-scap-contents-for-compliance-policies-in-satellite", # Planning 'SmartProxies' => "overview_concepts_and_deployment_considerations/index#Major-Satellite-Components_planning", @@ -62,8 +62,8 @@ module Documentation # Managing Security Compliance 'Monitoring_Compliance_security-compliance' => "managing_security_compliance/index#Monitoring_Compliance_security-compliance", 'Managing_Compliance_Policies_security-compliance' => "managing_security_compliance/index#Managing_Compliance_Policies_security-compliance", - 'Configuring_SCAP_Contents_security-compliance' => "managing_security_compliance/index#Configuring_SCAP_Contents_security-compliance", - 'tailoring-xccdf-profiles_security-compliance' => "managing_security_compliance/index#tailoring-xccdf-profiles_security-compliance", + 'Configuring_SCAP_Contents_security-compliance' => "managing_security_compliance/index#configuring-scap-contents-for-compliance-policies-in-satellite", + 'tailoring-xccdf-profiles_security-compliance' => "managing_security_compliance/index#customizing-xccdf-profiles-with-tailoring-files", 'deploying-compliance-policies_security-compliance' => "managing_security_compliance/index#deploying-compliance-policies_security-compliance", }.freeze From 7698b2954c10c3c829c1b13eee5d456b4e871e73 Mon Sep 17 00:00:00 2001 From: Adam Ruzicka Date: Thu, 5 Mar 2026 17:56:33 +0100 Subject: [PATCH 3/5] Drop branding for obsolete SCAP links They were removed in https://github.com/theforeman/foreman_openscap/pull/547 --- lib/foreman_theme_satellite/documentation.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/foreman_theme_satellite/documentation.rb b/lib/foreman_theme_satellite/documentation.rb index 5fbfe8dd..5fd6a368 100644 --- a/lib/foreman_theme_satellite/documentation.rb +++ b/lib/foreman_theme_satellite/documentation.rb @@ -46,8 +46,6 @@ module Documentation 'LDAPAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index#configuring-an-ldap-server-as-an-external-identity-provider-for-project_authentication", 'ExternalAuthentication' => "configuring_authentication_for_red_hat_satellite_users/index", 'Bookmarks' => "administering_red_hat_satellite/index#Searching_and_Bookmarking_admin", - 'Policydeploymentoptions' => "managing_security_compliance/index#configuring-compliance-policy-deployment-methods_security-compliance", - 'CreatingSCAPcontent' => "managing_security_compliance/index#configuring-scap-contents-for-compliance-policies-in-satellite", # Planning 'SmartProxies' => "overview_concepts_and_deployment_considerations/index#Major-Satellite-Components_planning", From 5d9109313bba0e27059276945cc668d90df8537d Mon Sep 17 00:00:00 2001 From: Adam Ruzicka Date: Thu, 5 Mar 2026 17:59:31 +0100 Subject: [PATCH 4/5] Adjust puppet doc link to TOC changes --- lib/foreman_theme_satellite/documentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/foreman_theme_satellite/documentation.rb b/lib/foreman_theme_satellite/documentation.rb index 5fd6a368..bcc2dc24 100644 --- a/lib/foreman_theme_satellite/documentation.rb +++ b/lib/foreman_theme_satellite/documentation.rb @@ -29,7 +29,7 @@ module Documentation 'Networking' => "provisioning_hosts/index#adding-a-subnet-to-server-by-using-web-ui", # Puppet Guide - 'FactsandtheENC' => "managing_configurations_by_using_puppet_integration/index#performing-configuration-management_managing-configurations-puppet", + 'FactsandtheENC' => "managing_configurations_by_using_puppet_integration/index#high-level-steps-for-configuration-management-with-puppet", 'using-config-groups' => "managing_configurations_by_using_puppet_integration/index#creating-a-puppet-config-group_managing-configurations-puppet", 'SmartMatchers' => "managing_configurations_by_using_puppet_integration/index#Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet", 'Parameters' => "managing_configurations_by_using_puppet_integration/index#Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet", From 153fc453781f60aa8b2d77478f6a472673253380 Mon Sep 17 00:00:00 2001 From: Adam Ruzicka Date: Thu, 5 Mar 2026 16:34:40 +0100 Subject: [PATCH 5/5] Adjust branding to changes in foreman_puppet https://github.com/theforeman/foreman_puppet/pull/440 --- lib/foreman_theme_satellite/documentation.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/foreman_theme_satellite/documentation.rb b/lib/foreman_theme_satellite/documentation.rb index bcc2dc24..9b1f10bf 100644 --- a/lib/foreman_theme_satellite/documentation.rb +++ b/lib/foreman_theme_satellite/documentation.rb @@ -30,11 +30,7 @@ module Documentation # Puppet Guide 'FactsandtheENC' => "managing_configurations_by_using_puppet_integration/index#high-level-steps-for-configuration-management-with-puppet", - 'using-config-groups' => "managing_configurations_by_using_puppet_integration/index#creating-a-puppet-config-group_managing-configurations-puppet", - 'SmartMatchers' => "managing_configurations_by_using_puppet_integration/index#Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet", 'Parameters' => "managing_configurations_by_using_puppet_integration/index#Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet", - 'Classes' => "managing_configurations_by_using_puppet_integration/index#Importing_Puppet_Classes_and_Environments_managing-configurations-puppet", - 'Environments' => "managing_configurations_by_using_puppet_integration/index#Creating_a_Custom_Puppet_Environment_managing-configurations-puppet", # Administering 'ConfigurationOptions' => "administering_red_hat_satellite/index", @@ -84,6 +80,12 @@ module Documentation 'Managing_Configurations_Ansible' => { 'Importing_Ansible_Roles_and_Variables_ansible' => "managing_configurations_by_using_ansible_integration/index#Importing_Ansible_Roles_and_Variables_ansible", 'Overriding_Ansible_Variables_in_foreman_ansible' => "managing_configurations_by_using_ansible_integration/index#Overriding_Ansible_Variables_in_satellite_ansible", + }, + 'Managing_Configurations_Puppet' => { + 'Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet' => "managing_configurations_by_using_puppet_integration/index#Configuring_Puppet_Smart_Class_Parameters_managing-configurations-puppet", + 'Creating_a_Custom_Puppet_Environment_managing-configurations-puppet' => "managing_configurations_by_using_puppet_integration/index#Creating_a_Custom_Puppet_Environment_managing-configurations-puppet", + 'Importing_Puppet_Classes_and_Environments_managing-configurations-puppet' => "managing_configurations_by_using_puppet_integration/index#Importing_Puppet_Classes_and_Environments_managing-configurations-puppet", + 'creating-a-puppet-config-group_managing-configurations-puppet' => "managing_configurations_by_using_puppet_integration/index#creating-a-puppet-config-group_managing-configurations-puppet", } }.freeze