Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ For more information, see the following resources:
.Procedure
* Increase the logging levels to `DEBUG`:
+
ifndef::containerized[]
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} \
Expand All @@ -49,6 +50,36 @@ For more information, see the following resources:
--iop-core-engine-log-level-insights-messaging DEBUG \
--iop-core-engine-log-level-root DEBUG
----
endif::[]
ifdef::containerized[]
.. Create a `config.yml` file that includes the following logging levels together with the required IOP core engine configuration:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would either say "IoP" or use the attribute https://github.com/theforeman/foreman-documentation/blob/master/guides/common/attributes-base.adoc#L174

same applies to line 76.

+
[source,yaml,options="nowrap",subs="+quotes,attributes"]
----
loggers:
insights.core.dr:
level: "DEBUG"
insights_messaging:
level: "DEBUG"
insights_kafka_service:
level: "DEBUG"
"":
level: "DEBUG"
----
.. Replace the `iop-core-engine-config-yml` Podman secret:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't love this as a procedure that we are telling users to do. @vkrizan Do you think we should add this as a logging option in foremanctl ?

+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# podman secret rm iop-core-engine-config-yml
# podman secret create iop-core-engine-config-yml config.yml
----
.. Restart the IOP core engine service:
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# systemctl restart iop-core-engine
----
endif::[]

.Verification
* Check the logging levels of {insights-iop}:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,6 @@ done
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --enable-iop
ifndef::containerized[# {foreman-installer} --enable-iop]
ifdef::containerized[# {foremanctl} deploy --add-feature iop]
----
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ endif::[]
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --enable-iop
ifndef::containerized[# {foreman-installer} --enable-iop]
ifdef::containerized[# {foremanctl} deploy --add-feature iop]
----
. If you want to use the {vulnerabilityengine} and your {ProjectServer} connects to `\https://security.access.redhat.com` through an HTTP proxy, configure the `iop-cvemap-download` service to use the same HTTP proxy:
.. Edit the `iop-cvemap-download` service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ For more information, see https://access.redhat.com/solutions/7055981[How to swi

.Procedure
. Download and mount the {Project} ISO image:
For more information, see xref:installing-from-the-offline-repositories_{context}[].
// For more information, see xref:installing-from-the-offline-repositories_{context}[].
. Set up the local repositories for disconnected environments.
For more information, see xref:installing-from-the-offline-repositories_{context}[].
// For more information, see xref:installing-from-the-offline-repositories_{context}[].
. Set up containers on your {ProjectServer}:
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
Expand All @@ -36,7 +36,8 @@ For more information, see xref:installing-from-the-offline-repositories_{context
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --enable-iop
ifndef::containerized[# {foreman-installer} --enable-iop]
ifdef::containerized[# {foremanctl} deploy --add-feature iop]
----
. Download and populate the Common Vulnerabilities and Exposures (CVE) mapping file:
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ This command creates the `/etc/foreman/registry-auth.json` file.
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --iop-ensure present
ifndef::containerized[# {foreman-installer} --iop-ensure present]
ifdef::containerized[# {foremanctl} deploy --add-feature iop]
----
** If {insights-iop} was not previously enabled:
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --enable-iop
ifndef::containerized[# {foreman-installer} --enable-iop]
ifdef::containerized[# {foremanctl} deploy --add-feature iop]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

if it's the same like line 24, then maybe a different structure is better because users do not need to know if they used IoP before.

----
. On your hosts, re-register the Insights client:
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Migrate from {insights-iop} to hosted {Insights} when you want cloud-based analy
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
----
# {foreman-installer} --iop-ensure absent
ifndef::containerized[# {foreman-installer} --iop-ensure absent]
ifdef::containerized[# {foremanctl} deploy --remove-feature iop]
----
. Reconfigure the cloud connector on {ProjectServer}.
For more information, see xref:configuring-{project-context}-server-for-cloud-connection[].
Expand Down
3 changes: 2 additions & 1 deletion guides/common/modules/proc_updating-server.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ endif::[]

ifdef::satellite[]
If you use the {insights-iop}, the following process updates {insights-iop} to the latest version.
The `{foreman-maintain}` tool pulls the new container images of the {insights-iop} automatically.
ifndef::containerized[The `{foreman-maintain}` tool pulls the new container images of the {insights-iop} automatically.]
ifdef::containerized[Running `{foremanctl} deploy` updates the container images of the {insights-iop} automatically if the feature is enabled.]
endif::[]

.Prerequisites
Expand Down
6 changes: 6 additions & 0 deletions guides/doc-Administering_Project/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,11 @@ ifdef::katello,orcharhino,satellite[]
include::common/assembly_renaming-server-or-smart-proxy.adoc[leveloffset=+1]
endif::[]

endif::[]
// Temporarily enabled for containerized
include::common/assembly_configuring-project-for-insights-analytics.adoc[leveloffset=+1]

ifndef::containerized[]
include::common/assembly_reducing-storage-use-on-project-server.adoc[leveloffset=+1]

endif::[]
Expand All @@ -108,12 +111,15 @@ include::common/assembly_working-efficiently-with-web-ui.adoc[leveloffset=+1]
[appendix]
include::common/modules/ref_starting-and-stopping-project-services.adoc[leveloffset=+1]

endif::[]
// Temporarily enabled for containerized
[appendix]
include::common/assembly_logging-and-reporting-problems.adoc[leveloffset=+1]

[appendix]
include::common/assembly_increasing-logging-levels-of-project-components.adoc[leveloffset=+1]

ifndef::containerized[]
[appendix]
include::common/modules/proc_anonymizing-audit-records.adoc[leveloffset=+1]

Expand Down
3 changes: 1 addition & 2 deletions guides/doc-Installing_Server/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ ifdef::satellite[]
include::common/modules/proc_configuring-project-server-as-insights-client.adoc[leveloffset=+2]
endif::[]

ifndef::containerized[]
// Temporarily enabled for containerized
ifdef::orcharhino,satellite[]
include::common/assembly_installing-and-configuring-insights-iop.adoc[leveloffset=+2]
endif::[]
endif::[]

ifdef::satellite[]
include::common/assembly_importing-the-project-client-name-repository.adoc[leveloffset=+2]
Expand Down
24 changes: 8 additions & 16 deletions guides/doc-Installing_Server_Disconnected/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ include::common/header.adoc[]

= {InstallingServerDisconnectedDocTitle}

ifdef::containerized[]
ifdef::katello[]
include::common/modules/ref_guide-not-ready.adoc[leveloffset=+1]
endif::[]
endif::[]

ifndef::containerized[]

ifndef::orcharhino,satellite[]
{Team} does not support installing {Project} in a disconnected environment.
endif::[]
Expand All @@ -26,13 +18,14 @@ endif::[]
ifdef::satellite[]
include::common/modules/proc_providing-feedback-on-red-hat-documentation.adoc[leveloffset=+1]

ifndef::containerized[]

include::common/assembly_planning-project-server-installation.adoc[leveloffset=+1]

include::common/assembly_preparing-your-environment-for-project-server-installation.adoc[leveloffset=+1]

include::common/assembly_installing-satellite-server-disconnected.adoc[leveloffset=+1]

ifdef::katello,orcharhino,satellite[]
endif::[]

ifdef::containerized[]
include::common/modules/proc_tuning-performance-with-predefined-profiles.adoc[leveloffset=+1]
Expand All @@ -42,14 +35,14 @@ ifndef::containerized[]
include::common/assembly_tuning-with-predefined-profiles.adoc[leveloffset=+1]
endif::[]

endif::[]

ifndef::containerized[]

// Temporarily enabled for containerized
ifdef::containerized[]
include::common/modules/con_performing-additional-configuration.adoc[leveloffset=+1]

include::common/assembly_installing-and-configuring-insights-iop.adoc[leveloffset=+2]
endif::[]

ifndef::containerized[]
include::common/modules/proc_configuring-server-to-consume-content-from-a-custom-cdn-by-using-web-ui.adoc[leveloffset=+2]

include::common/modules/proc_configuring-server-to-consume-content-from-a-custom-cdn-by-using-cli.adoc[leveloffset=+2]
Expand All @@ -75,9 +68,8 @@ include::common/modules/proc_reverting-server-to-download-content-from-red-hat-c
[appendix]
include::common/modules/proc_reverting-server-to-download-content-from-red-hat-cdn-by-using-cli.adoc[leveloffset=+1]
endif::[]
endif::[]
endif::satellite[]

ifndef::orcharhino,satellite[]
include::common/ribbons.adoc[]
endif::[]
endif::[]
3 changes: 2 additions & 1 deletion guides/doc-Updating_Project/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ include::common/modules/ref_guide-not-ready.adoc[leveloffset=+1]
endif::[]
endif::[]

ifndef::containerized[]
// Temporarily enabled for containerized

ifdef::satellite[]
include::common/modules/proc_providing-feedback-on-red-hat-documentation.adoc[leveloffset=+1]

include::common/assembly_updating-satellite.adoc[leveloffset=+1]
endif::[]

ifndef::containerized[]
ifndef::satellite[]
include::common/assembly_updating-foreman.adoc[leveloffset=+1]
endif::[]
Expand Down
Loading