diff --git a/guides/common/attributes-orcharhino.adoc b/guides/common/attributes-orcharhino.adoc index b840a0d17fe..951623d34eb 100644 --- a/guides/common/attributes-orcharhino.adoc +++ b/guides/common/attributes-orcharhino.adoc @@ -46,6 +46,12 @@ :smartproxy-example-com: orcharhino-proxy.example.com :smartproxy_port: 9090 :fdi-package-name: orcharhino-fdi +// Overwrite to avoid "Insights on Foreman" +:Insights: Insights +:advisorengine: {Insights} advisor in {Project} +:insights-iop-id: insights-in-orcharhino +:insights-iop: {Insights} in {Project} +:vulnerabilityengine: {Insights} vulnerability in {Project} // KB articles :atix-kb-clients: https://atixservice.zendesk.com/hc/de/articles/19430263501468[{Project} Clients gen3] :atix-kb-debian-ubuntu-installation-media: https://atixservice.zendesk.com/hc/de/articles/7044086506908[Using file repositories for installation media for Debian/Ubuntu] diff --git a/guides/common/modules/proc_configuring-project-server-as-insights-client.adoc b/guides/common/modules/proc_configuring-project-server-as-insights-client.adoc index ec977e70081..b7fe22fe558 100644 --- a/guides/common/modules/proc_configuring-project-server-as-insights-client.adoc +++ b/guides/common/modules/proc_configuring-project-server-as-insights-client.adoc @@ -18,7 +18,6 @@ To maintain your {ProjectServer}, and improve your ability to monitor and diagno ---- # {foreman-installer} --register-with-insights ---- -+ . Optional: You can change the default schedule for running `insights-client` by updating the system systemd settings and the `insights-client.timer` file on your {ProjectServer}. .Verification diff --git a/guides/common/modules/proc_configuring-synchronization-of-insights-recommendations-for-hosts.adoc b/guides/common/modules/proc_configuring-synchronization-of-insights-recommendations-for-hosts.adoc index 3edd3a69531..f3f03c368cb 100644 --- a/guides/common/modules/proc_configuring-synchronization-of-insights-recommendations-for-hosts.adoc +++ b/guides/common/modules/proc_configuring-synchronization-of-insights-recommendations-for-hosts.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="configuring_synchronization_of_insights_recommendations_for_hosts_{context}"] +[id="configuring-synchronization-of-{insights-iop-id}-recommendations-for-hosts"] = Configuring synchronization of {Insights} recommendations for hosts [role="_abstract"] diff --git a/guides/common/modules/proc_creating-an-insights-remediation-plan-for-hosts.adoc b/guides/common/modules/proc_creating-an-insights-remediation-plan-for-hosts.adoc index 0d65e257813..46eebb9d823 100644 --- a/guides/common/modules/proc_creating-an-insights-remediation-plan-for-hosts.adoc +++ b/guides/common/modules/proc_creating-an-insights-remediation-plan-for-hosts.adoc @@ -21,4 +21,4 @@ Use the *Filter* field to search for specific keywords. . Select the *Schedule* you require. . Click *Submit*. + -In the Jobs window, you can view the progress of your plan. +In the *Jobs* window, you can view the progress of your plan. diff --git a/guides/common/modules/proc_deploying-insights-by-using-the-ansible-role.adoc b/guides/common/modules/proc_deploying-insights-by-using-the-ansible-role.adoc index 135b848af8f..5d8113a72e1 100644 --- a/guides/common/modules/proc_deploying-insights-by-using-the-ansible-role.adoc +++ b/guides/common/modules/proc_deploying-insights-by-using-the-ansible-role.adoc @@ -8,11 +8,10 @@ The *RedHatInsights.insights-client* Ansible role is used to automate the instal .Procedure . Add the *RedHatInsights.insights-client* role to the hosts. -See {ManagingConfigurationsAnsibleDocURL}Using_Ansible_Roles_to_Automate_Repetitive_Tasks_on_Clients_ansible[Using Ansible Roles to Automate Repetitive Tasks on Clients] in _{ManagingConfigurationsAnsibleDocTitle}_. -+ +For more information, see {ManagingConfigurationsAnsibleDocURL}Using_Ansible_Roles_to_Automate_Repetitive_Tasks_on_Clients_ansible[Using Ansible roles to automate repetitive tasks on clients in _{ManagingConfigurationsAnsibleDocTitle}_]. . To run the *RedHatInsights.insights-client* role on your host, navigate to *Hosts* > *All Hosts* and click the name of the host that you want to use. . On the host details page, expand the *Schedule a job* dropdown menu. . Click *Run Ansible roles*. .Additional resources -* {ManagingConfigurationsAnsibleDocURL}Getting_Started_with_Ansible_in_{project-context}_ansible[Getting Started with Ansible in {Project} in _{ManagingConfigurationsAnsibleDocTitle}_] +* {ManagingConfigurationsAnsibleDocURL}Getting_Started_with_Ansible_in_{project-context}_ansible[Getting started with Ansible in {Project} in _{ManagingConfigurationsAnsibleDocTitle}_] diff --git a/guides/common/modules/proc_enabling-rh-cloud-and-insights-client-reports-on-hosts.adoc b/guides/common/modules/proc_enabling-rh-cloud-and-insights-client-reports-on-hosts.adoc index 1728e8ab75f..272af693424 100644 --- a/guides/common/modules/proc_enabling-rh-cloud-and-insights-client-reports-on-hosts.adoc +++ b/guides/common/modules/proc_enabling-rh-cloud-and-insights-client-reports-on-hosts.adoc @@ -1,12 +1,12 @@ :_mod-docs-content-type: PROCEDURE -[id="enabling-rh-cloud-and-insights-client-reports-on-hosts_{context}"] +[id="enabling-rh-cloud-and-insights-client-reports-on-hosts"] = Enabling RH Cloud and {Insights} client reports on hosts [role="_abstract"] You can enable the {Insights} client on hosts and have {Project} upload hosts inventory to the {Insights} service in the {RHCloud}. -ifdef::katello,foreman-el,foreman-deb[] +ifdef::katello,foreman-el,foreman-deb,orcharhino[] {Insights} is a service by Red Hat for {RHEL} hosts. Ensure to set this parameter for {RHEL} hosts only. If you set the parameter on any non-{RHEL} operating systems, {Project} automatically uploads new reports to the {RHCloud} when enabled in RH Cloud {Project} settings. diff --git a/guides/common/modules/proc_installing-insights-iop-on-a-connected-project-context-server.adoc b/guides/common/modules/proc_installing-insights-iop-on-a-connected-project-context-server.adoc index d8777896b52..57b2b079e14 100644 --- a/guides/common/modules/proc_installing-insights-iop-on-a-connected-project-context-server.adoc +++ b/guides/common/modules/proc_installing-insights-iop-on-a-connected-project-context-server.adoc @@ -3,10 +3,17 @@ [id="installing-{insights-iop-id}-on-a-connected-{project-context}-server"] = Installing {insights-iop} on a connected {ProjectServer} +ifdef::satellite[] You can pull the {insights-iop} from the Red{nbsp}Hat container registry if your {ProjectServer} has access to the registry. +endif::[] +ifndef::satellite[] +You can pull the {insights-iop} from the Quay container registry. +endif::[] .Prerequisites +ifdef::satellite[] * Ensure that the {ProjectServer} has access to the Red{nbsp}Hat container registry. +endif::[] * Ensure that Podman is installed. ifdef::satellite[] For more information, see {RHELDocsBaseURL}9/html/building_running_and_managing_containers/assembly_starting-with-containers_building-running-and-managing-containers#proc_getting-container-tools_assembly_starting-with-containers[Getting container tools] in _{RHEL}{nbsp}9 Building, running, and managing containers_. @@ -16,13 +23,18 @@ For more information, see https://podman.io/docs/installation#installing-on-linu endif::[] .Procedure -. Log in to the Red Hat registry by using Podman: +ifdef::satellite[] +. Log in to the Red{nbsp}Hat registry by using Podman: + [options="nowrap", subs="+quotes,verbatim,attributes"] ---- # podman login --authfile /etc/foreman/registry-auth.json registry.redhat.io ---- . Enable the plugin: +endif::[] +ifndef::satellite[] +* Enable the plugin: +endif::[] + [options="nowrap", subs="+quotes,verbatim,attributes"] ---- diff --git a/guides/common/modules/ref_access-to-information-from-insights-in-project.adoc b/guides/common/modules/ref_access-to-information-from-insights-in-project.adoc index 231a8c26fd1..633c2835aba 100644 --- a/guides/common/modules/ref_access-to-information-from-insights-in-project.adoc +++ b/guides/common/modules/ref_access-to-information-from-insights-in-project.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: REFERENCE -[id="access_to_information_from_insights_in_{Project}_{context}"] +[id="access-to-information-from-{insights-iop-id}-in-{project-context}"] = Access to information from {Insights} in {Project} [role="_abstract"] diff --git a/guides/common/modules/ref_storage-requirements.adoc b/guides/common/modules/ref_storage-requirements.adoc index 117a486dc28..06a31ff975e 100644 --- a/guides/common/modules/ref_storage-requirements.adoc +++ b/guides/common/modules/ref_storage-requirements.adoc @@ -24,7 +24,7 @@ ifdef::katello,satellite,orcharhino[] |/var/lib/pulp |1 MB |300 GB endif::[] -ifdef::satellite[] +ifdef::orcharhino,satellite[] |/var/lib/containers if using {insights-iop} |10 GB |15 GB endif::[] |==== diff --git a/guides/doc-Installing_Server/master.adoc b/guides/doc-Installing_Server/master.adoc index ef4a90e61f6..3c9100e212b 100644 --- a/guides/doc-Installing_Server/master.adoc +++ b/guides/doc-Installing_Server/master.adoc @@ -35,9 +35,13 @@ include::common/modules/con_performing-additional-configuration.adoc[leveloffset ifdef::satellite[] include::common/modules/proc_configuring-project-server-as-insights-client.adoc[leveloffset=+2] +endif::[] +ifdef::orcharhino,satellite[] include::common/assembly_installing-and-configuring-insights-iop.adoc[leveloffset=+2] +endif::[] +ifdef::satellite[] include::common/assembly_importing-the-project-client-name-repository.adoc[leveloffset=+2] include::common/modules/proc_configuring-pull-based-transport-for-remote-execution.adoc[leveloffset=+2]