xref fix

_topic_maps/_topic_map.yml

@@ -2818,6 +2818,23 @@ Topics:
       File: logging-5-8-release-notes
     - Name: Logging 5.7
       File: logging-5-7-release-notes
+  - Name: Logging 6.0
+    Dir: logging-6.0
+    Topics:
+      - Name: Release notes
+        File: log6x-release-notes
+      - Name: About logging 6.0
+        File: log6x-about
+      - Name: Upgrading to Logging 6.0
+        File: log6x-upgrading-to-6
+      - Name: Configuring log forwarding
+        File: log6x-clf
+      - Name: Configuring LokiStack storage
+        File: log6x-loki
+      - Name: Visualization for logging
+        File: log6x-visual
+#      - Name: API reference 6.0
+#        File: log6x-api-reference
   - Name: Support
     File: cluster-logging-support
   - Name: Troubleshooting logging

modules/log6x-audit-log-filtering.adoc

@@ -0,0 +1,118 @@
+// Module included in the following assemblies:
+//
+// * observability/logging/logging-6.0/log6x-clf.adoc
+
+:_mod-docs-content-type: CONCEPT
+[id="log6x-audit-filtering_{context}"]
+= Overview of API audit filter
+OpenShift API servers generate audit events for each API call, detailing the request, response, and the identity of the requester, leading to large volumes of data. The API Audit filter uses rules to enable the exclusion of non-essential events and the reduction of event size, facilitating a more manageable audit trail. Rules are checked in order, and checking stops at the first match. The amount of data that is included in an event is determined by the value of the `level` field:
+
+* `None`: The event is dropped.
+* `Metadata`: Audit metadata is included, request and response bodies are removed.
+* `Request`: Audit metadata and the request body are included, the response body is removed.
+* `RequestResponse`: All data is included: metadata, request body and response body. The response body can be very large. For example, `oc get pods -A` generates a response body containing the YAML description of every pod in the cluster.
+
+The `ClusterLogForwarder` custom resource (CR) uses the same format as the standard link:https://kubernetes.io/docs/tasks/debug/debug-cluster/audit/#audit-policy[Kubernetes audit policy], while providing the following additional functions:
+
+Wildcards:: Names of users, groups, namespaces, and resources can have a leading or trailing `\*` asterisk character. For example, the namespace `openshift-\*` matches `openshift-apiserver` or `openshift-authentication`. Resource `\*/status` matches `Pod/status` or `Deployment/status`.
+
+Default Rules:: Events that do not match any rule in the policy are filtered as follows:
+* Read-only system events such as `get`, `list`, and `watch` are dropped.
+* Service account write events that occur within the same namespace as the service account are dropped.
+* All other events are forwarded, subject to any configured rate limits.
+
+To disable these defaults, either end your rules list with a rule that has only a `level` field or add an empty rule.
+
+Omit Response Codes:: A list of integer status codes to omit. You can drop events based on the HTTP status code in the response by using the `OmitResponseCodes` field, which lists HTTP status codes for which no events are created. The default value is `[404, 409, 422, 429]`. If the value is an empty list, `[]`, then no status codes are omitted.
+
+The `ClusterLogForwarder` CR audit policy acts in addition to the {product-title} audit policy. The `ClusterLogForwarder` CR audit filter changes what the log collector forwards and provides the ability to filter by verb, user, group, namespace, or resource. You can create multiple filters to send different summaries of the same audit stream to different places. For example, you can send a detailed stream to the local cluster log store and a less detailed stream to a remote site.
+
+[NOTE]
+====
+You must have a cluster role `collect-audit-logs` to collect the audit logs. The following example provided is intended to illustrate the range of rules possible in an audit policy and is not a recommended configuration.
+====
+
+.Example audit policy
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: <log_forwarder_name>
+  namespace: <log_forwarder_namespace>
+spec:
+  serviceAccount:
+    name: <service_account_name>
+  pipelines:
+    - name: my-pipeline
+      inputRefs: audit # <1>
+      filterRefs: my-policy # <2>
+  filters:
+    - name: my-policy
+      type: kubeAPIAudit
+      kubeAPIAudit:
+        # Don't generate audit events for all requests in RequestReceived stage.
+        omitStages:
+          - "RequestReceived"
+
+        rules:
+          # Log pod changes at RequestResponse level
+          - level: RequestResponse
+            resources:
+            - group: ""
+              resources: ["pods"]
+
+          # Log "pods/log", "pods/status" at Metadata level
+          - level: Metadata
+            resources:
+            - group: ""
+              resources: ["pods/log", "pods/status"]
+
+          # Don't log requests to a configmap called "controller-leader"
+          - level: None
+            resources:
+            - group: ""
+              resources: ["configmaps"]
+              resourceNames: ["controller-leader"]
+
+          # Don't log watch requests by the "system:kube-proxy" on endpoints or services
+          - level: None
+            users: ["system:kube-proxy"]
+            verbs: ["watch"]
+            resources:
+            - group: "" # core API group
+              resources: ["endpoints", "services"]
+
+          # Don't log authenticated requests to certain non-resource URL paths.
+          - level: None
+            userGroups: ["system:authenticated"]
+            nonResourceURLs:
+            - "/api*" # Wildcard matching.
+            - "/version"
+
+          # Log the request body of configmap changes in kube-system.
+          - level: Request
+            resources:
+            - group: "" # core API group
+              resources: ["configmaps"]
+            # This rule only applies to resources in the "kube-system" namespace.
+            # The empty string "" can be used to select non-namespaced resources.
+            namespaces: ["kube-system"]
+
+          # Log configmap and secret changes in all other namespaces at the Metadata level.
+          - level: Metadata
+            resources:
+            - group: "" # core API group
+              resources: ["secrets", "configmaps"]
+
+          # Log all other resources in core and extensions at the Request level.
+          - level: Request
+            resources:
+            - group: "" # core API group
+            - group: "extensions" # Version of group should NOT be included.
+
+          # A catch-all rule to log all other requests at the Metadata level.
+          - level: Metadata
+----
+<1> The log types that are collected. The value for this field can be `audit` for audit logs, `application` for application logs, `infrastructure` for infrastructure logs, or a named input that has been defined for your application.
+<2> The name of your audit policy.

modules/log6x-code-ex.adoc

@@ -0,0 +1,241 @@
+:_mod-docs-content-type: REFERENCE
+[id="log6x-code-ex_{context}"]
+= Logging 6.0 Code Examples
+
+Code examples used in the wider Logging 6.0 documentation are hosted here for single sourcing.
+
+////
+This file is not intended to be included in whole. Includes from this file should be using tagged regions only.
+References:
+* https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/doc_guidelines.adoc#including-by-tags
+* https://docs.asciidoctor.org/asciidoc/latest/directives/include-tagged-regions/
+////
+
+// Content template within commented out block.
+////
+// tag::tagname[]
+[source,yaml]
+----
+Content
+More Content
+----
+// end::tagname[]
+////
+
+
+// tag::filters-unchanged[]
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: my-forwarder
+spec:
+  serviceAccount:
+    name: my-account
+  filters:
+    - name: my-multiline
+      type: detectMultilineException
+    - name: my-parse
+      type: parse
+    - name: my-labels
+      type: openshiftLabels
+      openshiftLabels:
+        foo: bar
+  pipelines:
+    - name: my-pipeline
+      inputRefs:
+        - application
+      outputRefs:
+        - my-output
+      filterRefs:
+        - my-multiline
+        - my-parse
+        - my-labels
+  outputs:
+    - name: my-output
+      type: http
+      http:
+        url: http://my-log-output:80
+----
+// end::filters-unchanged[]
+
+// tag::filters-changed[]
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: my-forwarder
+spec:
+  serviceAccount:
+    name: my-account
+  filters:
+    - name: drop-filter
+      type: drop
+      drop:
+        - test:
+            - field: '.level'
+              matches: 'debug'
+    - name: prune-filter
+      type: prune
+      prune:
+        in:
+          - '.kubernetes.labels.foobar'
+        notIn:
+          - '.message'
+          - '.log_type'
+    - name: audit-filter
+      type: kubeAPIAudit
+      kubeAPIAudit:
+        omitResponseCodes:
+          - 404
+          - 409
+  pipelines:
+    - name: my-pipeline
+      inputRefs:
+        - application
+        - audit
+      outputRefs:
+        - my-output
+      filterRefs:
+        - drop-filter
+        - prune-filter
+        - audit-filter
+  outputs:
+    - name: my-output
+      type: http
+      http:
+        url: http://my-log-output:80
+----
+// end::filters-changed[]
+
+// tag::inputs-app-audit-infra[]
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: my-forwarder
+spec:
+  serviceAccount:
+    name: my-account
+  inputs:
+    - name: app-logs
+      type: application
+      application:
+        includes:
+          - namespace: my-ns1
+            container: my-app1
+        excludes:
+          - namespace: my-ns2
+            container: my-app2
+    - name: audit-logs
+      type: audit
+      audit:
+        ....
+    - name: infra-logs
+      type: infrastructure
+      infrastructure:
+        ....
+  filters:
+    - name: my-parse
+      type: parse
+    - name: my-app-label
+      type: openshiftLabels
+      openshiftLabels:
+        my-log-index: app
+    - name: my-infra-label
+      type: openshiftLabels
+      openshiftLabels:
+        my-log-index: infra
+  outputs:
+    ......
+  pipelines:
+    - name: my-app
+      inputRefs:
+        - application
+      filterRefs:
+        - my-parse
+        - my-app-label
+      outputRefs:
+        - es-output-by-label
+    - name: my-infra
+      inputRefs:
+        - infrastructure
+      filterRefs:
+        - my-parse
+        - my-infra-label
+      outputRefs:
+        - es-output-by-label
+----
+// end::inputs-app-audit-infra[]
+
+// tag::output-cw-token[]
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: my-forwarder
+spec:
+  serviceAccount:
+    name: my-account
+  outputs:
+    - name: my-cw
+      type: cloudwatch
+      cloudwatch:
+        groupName: test-cluster_{.log_type||"unknown"}
+        region: us-east-1
+        authentication:
+          type: iamRole
+          iamRole:
+            roleARN:
+              secretName: role-for-sts
+              key: credentials
+            token:
+              from: serviceAccount
+  pipelines:
+    - name: my-cw-logs
+      inputRefs:
+        - application
+        - infrastructure
+      outputRefs:
+        - my-cw
+----
+// end::output-cw-token[]
+
+// tag::output-cw-static[]
+[source,yaml]
+----
+apiVersion: observability.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: my-forwarder
+spec:
+  serviceAccount:
+    name: my-account
+  outputs:
+    - name: my-cw
+      type: cloudwatch
+      cloudwatch:
+        groupName: test-cluster_{.log_type||"unknown"}
+        region: us-east-1
+        authentication:
+          type: awsAccessKey
+          awsAccessKey:
+            keyId:
+              secretName: cw-secret
+              key: aws_access_key_id
+            keySecret:
+              secretName: cw-secret
+              key: aws_secret_access_key
+  pipelines:
+    - name: my-cw-logs
+      inputRefs:
+        - application
+        - infrastructure
+      outputRefs:
+        - my-cw
+----
+// end::output-cw-static[]