Skip to content

OCPBUGS-47485: Only list CLO output urls when they exist #13150

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

OCPBUGS-47485: Only list CLO output urls when they exist #13150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions applications/openshift/logging/audit_log_forwarding_uses_tls/rule.yml
View file
Original file line number Diff line number Diff line change
@@ -32,13 +32,13 @@ ocil_clause: 'Logs are not forwarded outside the cluster using TLS'

ocil: |-
Run the following command:
<pre>{{{ ocil_oc_pipe_jq_filter('clusterlogforwarders', 'try [.items[].spec.outputs[][]|objects|.url] catch []', namespace="openshift-logging") }}}</pre>
<pre>{{{ ocil_oc_pipe_jq_filter('clusterlogforwarders', 'try [.items[].spec.outputs[][]|objects|selece(.url != null).url] catch []', namespace="openshift-logging") }}}</pre>
The output should return a list of URL entries with <pre>https://</pre> or <pre>tls://</pre> transport.
warnings:
- general: |-
{{{ openshift_cluster_setting() | indent(4) }}}
{{{ openshift_filtered_cluster_setting_suppressed({
"/apis/logging.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders/instance": 'try [.spec.outputs[].url] catch []',
"/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders": 'try [.items[].spec.outputs[][]|objects|.url] catch []',
"/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders": 'try [.items[].spec.outputs[][]|objects|select(.url != null).url] catch []',
}) | indent(4) }}}
4 changes: 2 additions & 2 deletions applications/openshift/logging/audit_log_forwarding_uses_tls_observability_api/rule.yml
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ warnings:
- general: |-
{{{ openshift_cluster_setting() | indent(4) }}}
{{{ openshift_filtered_cluster_setting_suppressed({
"/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders": 'try [.items[].spec.outputs[][]|objects|.url] catch []',
"/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders": 'try [.items[].spec.outputs[][]|objects|(select(.url != null).url] catch []',
}) | indent(4) }}}
template:
@@ -50,7 +50,7 @@ template:
# The log forwarder outputs consist of an object and two strings (name and type).
# The url is part of the object and its name will vary depending on its type.
# By using the objects filter we ensure we are getting the object to query for its url.
filepath: "{{{ openshift_filtered_path('/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders', 'try [.items[].spec.outputs[][]|objects|.url] catch []') }}}"
filepath: "{{{ openshift_filtered_path('/apis/observability.openshift.io/v1/namespaces/openshift-logging/clusterlogforwarders', 'try [.items[].spec.outputs[][]|objects|select(.url != null).url] catch []') }}}"
yamlpath: "[:]"
entity_check: "all"
values: