-
Notifications
You must be signed in to change notification settings - Fork 1.8k
(ON HOLD) [OBSDOCS-1471] Logging 5.8 docs missing from 4.17 #97452
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -155,10 +155,11 @@ spec: | |
| nodeCount: 3 | ||
| resources: | ||
| limits: | ||
| memory: 32Gi | ||
| cpu: 200m | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the changes in this file need technical review |
||
| memory: 16Gi | ||
| requests: | ||
| cpu: 3 | ||
| memory: 32Gi | ||
| cpu: 200m | ||
| memory: 16Gi | ||
| storage: | ||
| storageClassName: "gp2" | ||
| size: "200G" | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ include::snippets/audit-logs-default.adoc[] | |
|
|
||
| .Procedure | ||
|
|
||
| To use the Log Forward API to forward audit logs to the internal Elasticsearch instance: | ||
| To use the Log Forwarding API to forward audit logs to the internal Elasticsearch instance: | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. According to https://access.redhat.com/support/policy/updates/openshift_operators. Elasticsearch-opertaor in 4.16,4.17 is for trace only. I think we needn't remove all section as elasticsearch as interal store. |
||
|
|
||
| . Create or edit a YAML file that defines the `ClusterLogForwarder` CR object: | ||
| + | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,8 +19,6 @@ $ oc -n openshift-logging edit ClusterLogging instance | |
| + | ||
| [source,yaml] | ||
| ---- | ||
| $ oc edit ClusterLogging instance | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is about elasticsearch, it can be removed. |
||
|
|
||
| apiVersion: "logging.openshift.io/v1" | ||
| kind: "ClusterLogging" | ||
| metadata: | ||
|
|
@@ -35,4 +33,3 @@ spec: | |
| replicas: 1 <1> | ||
| ---- | ||
| <1> Specify the number of Kibana nodes. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ To perform a rolling cluster restart: | |
|
|
||
| . Change to the `openshift-logging` project: | ||
| + | ||
| [source,terminal] | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is about elasticsearch, it can be removed. |
||
| ---- | ||
| $ oc project openshift-logging | ||
| ---- | ||
|
|
@@ -46,24 +47,28 @@ $ oc exec <any_es_pod_in_the_cluster> -c elasticsearch -- es_util --query="_flus | |
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec -c elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_util --query="_flush/synced" -XPOST | ||
| ---- | ||
| + | ||
| .Example output | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| {"_shards":{"total":4,"successful":4,"failed":0},".security":{"total":2,"successful":2,"failed":0},".kibana_1":{"total":2,"successful":2,"failed":0}} | ||
| ---- | ||
|
|
||
| . Prevent shard balancing when purposely bringing down nodes using the {product-title} es_util tool: | ||
| . Prevent shard balancing when purposely bringing down nodes using the {product-title} | ||
| link:https://github.com/openshift/origin-aggregated-logging/tree/master/elasticsearch#es_util[*es_util*] tool: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec <any_es_pod_in_the_cluster> -c elasticsearch -- es_util --query="_cluster/settings" -XPUT -d '{ "persistent": { "cluster.routing.allocation.enable" : "primaries" } }' | ||
| ---- | ||
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_util --query="_cluster/settings" -XPUT -d '{ "persistent": { "cluster.routing.allocation.enable" : "primaries" } }' | ||
| ---- | ||
|
|
@@ -79,25 +84,27 @@ $ oc exec elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_uti | |
| .. By default, the {product-title} Elasticsearch cluster blocks rollouts to their nodes. Use the following command to allow rollouts | ||
| and allow the pod to pick up the changes: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc rollout resume deployment/<deployment-name> | ||
| ---- | ||
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc rollout resume deployment/elasticsearch-cdm-0-1 | ||
| ---- | ||
| + | ||
| .Example output | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| deployment.extensions/elasticsearch-cdm-0-1 resumed | ||
| ---- | ||
| + | ||
| A new pod is deployed. After the pod has a ready container, you can | ||
| move on to the next deployment. | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc get pods -l component=elasticsearch- | ||
| ---- | ||
|
|
@@ -113,24 +120,26 @@ elasticsearch-cdm-5ceex6ts-3-585968dc68-k7kjr 2/2 Running 0 22h | |
|
|
||
| .. After the deployments are complete, reset the pod to disallow rollouts: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc rollout pause deployment/<deployment-name> | ||
| ---- | ||
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc rollout pause deployment/elasticsearch-cdm-0-1 | ||
| ---- | ||
| + | ||
| .Example output | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| deployment.extensions/elasticsearch-cdm-0-1 paused | ||
| ---- | ||
| + | ||
| .. Check that the Elasticsearch cluster is in a `green` or `yellow` state: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec <any_es_pod_in_the_cluster> -c elasticsearch -- es_util --query=_cluster/health?pretty=true | ||
| ---- | ||
|
|
@@ -142,10 +151,13 @@ If you performed a rollout on the Elasticsearch pod you used in the previous com | |
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_util --query=_cluster/health?pretty=true | ||
| ---- | ||
| + | ||
| .Example output | ||
| [source,json] | ||
| ---- | ||
| { | ||
| "cluster_name" : "elasticsearch", | ||
|
|
@@ -171,12 +183,14 @@ $ oc exec elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_uti | |
|
|
||
| . After all the deployments for the cluster have been rolled out, re-enable shard balancing: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec <any_es_pod_in_the_cluster> -c elasticsearch -- es_util --query="_cluster/settings" -XPUT -d '{ "persistent": { "cluster.routing.allocation.enable" : "all" } }' | ||
| ---- | ||
| + | ||
| For example: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc exec elasticsearch-cdm-5ceex6ts-1-dcd6c4c7c-jpw6 -c elasticsearch -- es_util --query="_cluster/settings" -XPUT -d '{ "persistent": { "cluster.routing.allocation.enable" : "all" } }' | ||
| ---- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,3 @@ | ||
| // Module included in the following assemblies: | ||
| // | ||
| // * observability/logging/cluster-logging-support.adoc | ||
|
|
||
| :_mod-docs-content-type: PROCEDURE | ||
| [id="cluster-logging-must-gather-collecting_{context}"] | ||
| = Collecting {logging} data | ||
|
|
@@ -16,18 +12,19 @@ To collect {logging} information with `must-gather`: | |
|
|
||
| . Run the `oc adm must-gather` command against the {logging} image: | ||
| + | ||
| ifndef::openshift-origin[] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The changes in this file require a technical review |
||
| If you are using OKD: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc adm must-gather --image=$(oc -n openshift-logging get deployment.apps/cluster-logging-operator -o jsonpath='{.spec.template.spec.containers[?(@.name == "cluster-logging-operator")].image}') | ||
| $ oc adm must-gather --image=quay.io/openshift/origin-cluster-logging-operator | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason we change the image to quay.io/openshift/origin-cluster-logging-operator? |
||
| ---- | ||
| endif::openshift-origin[] | ||
| ifdef::openshift-origin[] | ||
| + | ||
| Otherwise: | ||
| + | ||
| [source,terminal] | ||
| ---- | ||
| $ oc adm must-gather --image=quay.io/openshift/origin-cluster-logging-operator | ||
| $ oc adm must-gather --image=$(oc -n openshift-logging get deployment.apps/cluster-logging-operator -o jsonpath='{.spec.template.spec.containers[?(@.name == "cluster-logging-operator")].image}') | ||
| ---- | ||
| endif::openshift-origin[] | ||
| + | ||
| The `must-gather` tool creates a new directory that starts with `must-gather.local` within the current directory. For example: | ||
| `must-gather.local.4157245944708210408`. | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possibly missing the following:
- Name: Troubleshooting logging alerts
File: troubleshooting-logging-alerts
- Name: Viewing the status of the Elasticsearch log store
File: cluster-logging-log-store-status
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we create a separate panel for 5.8? And put all items(5.8 release note and etc) related to 5.8 under that link ?
Logging 6.2
Logging 6.1
Logging 6.0
Logging 5.8