Skip to content

Conversation

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 21, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 21, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 21, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link

openshift-ci bot commented Apr 21, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 21, 2025
@theashiot
Copy link
Contributor Author

/test all

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 21, 2025

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 22, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview: https://92388--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/logging/logging-6.2/6x-cluster-logging-deploying-6.2.html#installing-the-logging-ui-plug-in_installing-logging-6-2

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

* You have installed the Loki operator.

.Procedure
. Install the {coo-full}. For more information, see xref:../../../observability/cluster_observability_operator/cluster-observability-operator-overview.adoc#cluster-observability-operator-overview[Cluster Observability Operator].
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

.Procedure
. Install the {coo-full}. For more information, see xref:../../../observability/cluster_observability_operator/cluster-observability-operator-overview.adoc#cluster-observability-operator-overview[Cluster Observability Operator].

. Create an instance of the `UIPlugin` resource.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Create an instance of the `UIPlugin` resource.
. Navigate to the `Installed Operators` page. Select the `ClusterObservabilityOperator` under the Provided APIs find the `UIPlugin` resource and click Create Instance.
. Select YAML view, and then use the following template to create a `UIPlugin` CR:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

<1> Set `name` to `logging`.
<2> Set `type` to `Logging`.
<3> `name` must match the name of your LokiStack instance.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Click Create.

Copy link
Contributor

Choose a reason for hiding this comment

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

Add a tip that if LokiStack is installed in a namespace other than openshift-logging they can also set namespace in the lokistack refrence

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

<2> Set `type` to `Logging`.
<3> `name` must match the name of your LokiStack instance.

. Navigate to the Observe → Logs panel where you can run LogQL queries. You can aslo query Logs for individual pods from the pods view *Aggregated Logs* tab.
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you put this under ".Verification"

  1. Wait a few minutes for a pop-up to show on the top right of the screen to refresh
  2. Navigate...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

Choose a reason for hiding this comment

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

For CLI instructions they should be the same but instead of user navigating in the console they only need to create a YAML resource and then apply that resource with oc apply -f similar to who we wrote for the other CLI instructions

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 26, 2025
@theashiot theashiot marked this pull request as ready for review April 28, 2025 10:01
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 28, 2025
@theashiot
Copy link
Contributor Author

Thanks, @JoaoBraveCoding for the review! I've made the required changes and also added steps for CLI.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 28, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

* You have administrator permissions.
* You installed the {oc-first}.
* You installed and configured {loki-op}.
* You have created the `openshift-logging` namespace.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* You have created the `openshift-logging` namespace.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Comment on lines 45 to 46
. Refresh the page when a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can aslo query Logs for individual pods from the pods view *Aggregated Logs* tab.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Refresh the page when a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can aslo query Logs for individual pods from the pods view *Aggregated Logs* tab.
. Refresh the page when a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch, fixed!

====
If you did not install LokiStack in the `openshift-logging` namespace, set the LokiStack namespace under the `lokiStack` configuration.
====

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Comment on lines 53 to 83
* Verify the installation by running the following command:
+
[source,terminal]
----
$ oc get pods -n openshift-logging
----
+
.Example output
[source,terminal]
----
$ oc get pods -n openshift-logging
NAME READY STATUS RESTARTS AGE
cluster-logging-operator-56764d8c76-7m9kg 1/1 Running 0 19m
logging-loki-compactor-0 1/1 Running 0 10m
logging-loki-distributor-657647b49b-2hxwl 1/1 Running 0 10m
logging-loki-distributor-657647b49b-qdnpf 1/1 Running 0 10m
logging-loki-gateway-79c497c9-69mqs 2/2 Running 0 10m
logging-loki-gateway-79c497c9-hd9w5 2/2 Running 0 10m
logging-loki-index-gateway-0 1/1 Running 0 10m
logging-loki-index-gateway-1 1/1 Running 0 10m
logging-loki-ingester-0 1/1 Running 0 10m
logging-loki-ingester-1 1/1 Running 0 9m38s
logging-loki-querier-59c966d69c-ggjlg 1/1 Running 0 10m
logging-loki-querier-59c966d69c-n6c2g 1/1 Running 0 10m
logging-loki-query-frontend-bc86757-8qzwd 1/1 Running 0 10m
logging-loki-query-frontend-bc86757-kswxk 1/1 Running 0 10m
logging-loki-ruler-0 1/1 Running 0 10m
logging-loki-ruler-1 1/1 Running 0 10m

----

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* Verify the installation by running the following command:
+
[source,terminal]
----
$ oc get pods -n openshift-logging
----
+
.Example output
[source,terminal]
----
$ oc get pods -n openshift-logging
NAME READY STATUS RESTARTS AGE
cluster-logging-operator-56764d8c76-7m9kg 1/1 Running 0 19m
logging-loki-compactor-0 1/1 Running 0 10m
logging-loki-distributor-657647b49b-2hxwl 1/1 Running 0 10m
logging-loki-distributor-657647b49b-qdnpf 1/1 Running 0 10m
logging-loki-gateway-79c497c9-69mqs 2/2 Running 0 10m
logging-loki-gateway-79c497c9-hd9w5 2/2 Running 0 10m
logging-loki-index-gateway-0 1/1 Running 0 10m
logging-loki-index-gateway-1 1/1 Running 0 10m
logging-loki-ingester-0 1/1 Running 0 10m
logging-loki-ingester-1 1/1 Running 0 9m38s
logging-loki-querier-59c966d69c-ggjlg 1/1 Running 0 10m
logging-loki-querier-59c966d69c-n6c2g 1/1 Running 0 10m
logging-loki-query-frontend-bc86757-8qzwd 1/1 Running 0 10m
logging-loki-query-frontend-bc86757-kswxk 1/1 Running 0 10m
logging-loki-ruler-0 1/1 Running 0 10m
logging-loki-ruler-1 1/1 Running 0 10m
----
. Access the OpenShift Container Platform web console and refresh the page if a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Install the Logging UI plug-in by using the web console to visualize logs.

.Prerequisites
* You have installed the Loki operator.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* You have installed the Loki operator.
* You have administrator permissions.
* You have access to the OpenShift Container Platform web console.
* You installed and configured {loki-op}.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@theashiot
Copy link
Contributor Author

Thanks, @JoaoBraveCoding for approving the changes!

best,
ashwin

@theashiot
Copy link
Contributor Author

For QE review, @anpingli , @kabirbhartiRH, @QiaolingTang , can someone please review the docs?

thanks,
ashwin

<2> Set `type` to `Logging`.
<3> `name` must match the name of your LokiStack instance.
+
[NOTE]
Copy link

@anpingli anpingli May 12, 2025

Choose a reason for hiding this comment

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

We don't support deploy lokistack in the other namespace expect for openshift-logging . @JoaoBraveCoding Can you confirm if we can enable it now?

https://github.com/rhobs/observability-operator/blob/main/bundle/manifests/observability.openshift.io_uiplugins.yaml#L121

Copy link
Contributor

Choose a reason for hiding this comment

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

I know there was a customer case that required us to add the namespace. But in regards to support I'm not I'll check with @xperimental during the daily today

Copy link
Contributor

Choose a reason for hiding this comment

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

Discussed it with @xperimental and with 6.x there isn't anything blocking users from installing logging on a different namespace

Choose a reason for hiding this comment

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

No idea if there is limitation to deploy the logging in the other namespace. let me confirm this.

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 21, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@theashiot
Copy link
Contributor Author

Thanks, @JoaoBraveCoding, @anpingli for the reveiw!

@theashiot
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label May 21, 2025
@lahinson lahinson removed the peer-review-needed Signifies that the peer review team needs to review this PR label May 21, 2025
@lahinson lahinson added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label May 21, 2025
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

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

Nice work! I made a few suggestions for your consideration.

:_mod-docs-content-type: PROCEDURE

[id="installing-the-logging-ui-plug-in-cli_{context}"]
= Installing the Logging UI plug-in by using the CLI
Copy link
Contributor

Choose a reason for hiding this comment

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

Supplementary Style Guide: https://redhat-documentation.github.io/supplementary-style-guide/#plug-in

Suggested change
= Installing the Logging UI plug-in by using the CLI
= Installing the Logging UI plugin by using the CLI

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

[id="installing-the-logging-ui-plug-in-cli_{context}"]
= Installing the Logging UI plug-in by using the CLI

Install the Logging UI plug-in by using the comman-line interfatce (CLI) to visualize logs.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Install the Logging UI plug-in by using the comman-line interfatce (CLI) to visualize logs.
Install the Logging UI plugin by using the command-line interface (CLI) so that you can visualize logs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

----
<1> Set `name` to `logging`.
<2> Set `type` to `Logging`.
<3> `name` must match the name of your LokiStack instance.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<3> `name` must match the name of your LokiStack instance.
<3> The `name` value must match the name of your LokiStack instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done


.Verification

. Access the OpenShift Container Platform web console and refresh the page if a pop-up message instructs you to do so.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Access the OpenShift Container Platform web console and refresh the page if a pop-up message instructs you to do so.
. Access the {product-title} web console, and refresh the page if a pop-up message instructs you to do so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

.Verification

. Access the OpenShift Container Platform web console and refresh the page if a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab. No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab.
. Navigate to the *Observe → Logs* panel, where you can run LogQL queries. You can also query logs for individual pods from the *Aggregated Logs* tab of a specific pod.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done


.Prerequisites
* You have administrator permissions.
* You have access to the OpenShift Container Platform web console.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* You have access to the OpenShift Container Platform web console.
* You have access to the {product-title} web console.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

* You installed and configured {loki-op}.

.Procedure
. Install the {coo-full}. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cluster_observability_operator/installing-cluster-observability-operators[Cluster Observability Operator].
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Install the {coo-full}. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cluster_observability_operator/installing-cluster-observability-operators[Cluster Observability Operator].
. Install the {coo-full}. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cluster_observability_operator/installing-cluster-observability-operators[Installing the Cluster Observability Operator].

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

.Procedure
. Install the {coo-full}. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cluster_observability_operator/installing-cluster-observability-operators[Cluster Observability Operator].

. Navigate to the *Installed Operators* page. Select the *ClusterObservabilityOperator* under *Provided APIs*, find the `UIPlugin` resource and click *Create Instance*.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Navigate to the *Installed Operators* page. Select the *ClusterObservabilityOperator* under *Provided APIs*, find the `UIPlugin` resource and click *Create Instance*.
. Navigate to the *Installed Operators* page. Under *Provided APIs*, select *ClusterObservabilityOperator*. Find the `UIPlugin` resource and click *Create Instance*.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

----
<1> Set `name` to `logging`.
<2> Set `type` to `Logging`.
<3> `name` must match the name of your LokiStack instance.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<3> `name` must match the name of your LokiStack instance.
<3> The `name` value must match the name of your LokiStack instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

.Verification

. Refresh the page when a pop-up message instructs you to do so.
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Navigate to the Observe → Logs panel where you can run LogQL queries. You can also query Logs for individual pods from the pods view *Aggregated Logs* tab.
. Navigate to the *Observe → Logs* panel, where you can run LogQL queries. You can also query logs for individual pods from the *Aggregated Logs* tab of a specific pod.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@lahinson lahinson added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels May 21, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 23, 2025
@openshift-ci
Copy link

openshift-ci bot commented May 23, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented May 23, 2025

@theashiot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 26, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17, 4.17

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 26, 2025

@theashiot: This pull request references OBSDOCS-1749 which is a valid jira issue.

In response to this:

Version(s): 4.18, 4.17, 4.16

Issue: https://issues.redhat.com/browse/OBSDOCS-1749

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@theashiot
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label May 26, 2025
@stevsmit stevsmit added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 lgtm Indicates that a PR is ready to be merged. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. merge-review-needed Signifies that the merge review team needs to review this PR labels May 27, 2025
* You installed and configured {loki-op}.

.Procedure
. Install the {coo-full}. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cluster_observability_operator/installing-cluster-observability-operators[Installing the Cluster Observability Operator].
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be an xref?

@stevsmit stevsmit merged commit 4121d91 into openshift:enterprise-4.18 May 27, 2025
2 checks passed
@stevsmit
Copy link
Member

/cherry-pick enterprise-4.17

@stevsmit
Copy link
Member

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot

@stevsmit: new pull request created: #93780

In response to this:

/cherry-pick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@stevsmit: #92388 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-1749: Add section about uiplugin in installing logging
.git/rebase-apply/patch:28: trailing whitespace.
 
.git/rebase-apply/patch:58: trailing whitespace.
If you did not install LokiStack in the `openshift-logging` namespace, set the LokiStack namespace under the `lokiStack` configuration. 
.git/rebase-apply/patch:90: trailing whitespace.
 
.git/rebase-apply/patch:121: trailing whitespace.
If you did not install LokiStack in the `openshift-logging` namespace, set the LokiStack namespace under the `lokiStack` configuration. 
.git/rebase-apply/patch:128: trailing whitespace.
. Refresh the page when a pop-up message instructs you to do so. 
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	observability/logging/logging-6.1/6x-cluster-logging-deploying-6.1.adoc
A	observability/logging/logging-6.2/6x-cluster-logging-deploying-6.2.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): observability/logging/logging-6.2/6x-cluster-logging-deploying-6.2.adoc deleted in HEAD and modified in OBSDOCS-1749: Add section about uiplugin in installing logging. Version OBSDOCS-1749: Add section about uiplugin in installing logging of observability/logging/logging-6.2/6x-cluster-logging-deploying-6.2.adoc left in tree.
CONFLICT (modify/delete): observability/logging/logging-6.1/6x-cluster-logging-deploying-6.1.adoc deleted in HEAD and modified in OBSDOCS-1749: Add section about uiplugin in installing logging. Version OBSDOCS-1749: Add section about uiplugin in installing logging of observability/logging/logging-6.1/6x-cluster-logging-deploying-6.1.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-1749: Add section about uiplugin in installing logging

In response to this:

/cherry-pick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants