Skip to content

Conversation

machine424
Copy link
Contributor

cc @eromanova97
backporting this to release-4.20 in this repo will take days, I don't think that's worth the effort/time.
But you can have this applied to the 4.20>= docs

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 2, 2025
@openshift-ci-robot
Copy link
Contributor

@machine424: This pull request explicitly references no jira issue.

In response to this:

cc @eromanova97
backporting this to release-4.20 in this repo will take days, I don't think that's worth the effort/time.
But you can have this applied to the 4.20>= docs

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

Copy link
Contributor

openshift-ci bot commented Oct 2, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2025
// The default value is empty, which indicates no limit.
EnforcedBodySizeLimit string `json:"enforcedBodySizeLimit,omitempty"`
// Defines labels to be added to any time series or alerts when
// A map[string]string that defines labels to be added to any time series or alerts when
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: no strong opinion but I was thinking maybe about something like this to somehow keep track of the original short formatting.

// Defines labels to be added to any time series or alerts when communicating with external systems.
// A map[string]string; by default, no labels are added.

wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we agreed on this with @eromanova97
but I have no preference.
I'd keep the systems such as federation, remote storage, and Alertmanager part though

Copy link
Contributor

Choose a reason for hiding this comment

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

No strong opinions either 👍 It can stay as is, but if we want to keep that consistency, then I would apply the second suggestion

Copy link
Contributor

openshift-ci bot commented Oct 13, 2025

@machine424: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn bad376d link false /test okd-scos-e2e-aws-ovn
ci/prow/ginkgo-tests bad376d link false /test ginkgo-tests
ci/prow/versions bad376d link false /test versions

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.

@machine424
Copy link
Contributor Author

/verified by existing tests

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 14, 2025
@openshift-ci-robot
Copy link
Contributor

@machine424: This PR has been marked as verified by existing tests.

In response to this:

/verified by existing tests

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.

| additionalAlertmanagerConfigs | [][AdditionalAlertmanagerConfig](#additionalalertmanagerconfig) | Configures additional Alertmanager instances that receive alerts from the Prometheus component. By default, no additional Alertmanager instances are configured. |
| enforcedBodySizeLimit | string | Enforces a body size limit for Prometheus scraped metrics. If a scraped target's body response is larger than the limit, the scrape will fail. The following values are valid: an empty value to specify no limit, a numeric value in Prometheus size format (such as `64MB`), or the string `automatic`, which indicates that the limit will be automatically calculated based on cluster capacity. The default value is empty, which indicates no limit. |
| externalLabels | ExternalLabels | Defines labels to be added to any time series or alerts when communicating with external systems such as federation, remote storage, and Alertmanager. By default, no labels are added. |
| externalLabels | ExternalLabels | Defines labels to be added to any time series or alerts when communicating with external systems such as federation, remote storage, and Alertmanager. A map[string]string. By default, no labels are added. |
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
| externalLabels | ExternalLabels | Defines labels to be added to any time series or alerts when communicating with external systems such as federation, remote storage, and Alertmanager. A map[string]string. By default, no labels are added. |
| externalLabels | ExternalLabels | Defines labels to be added to any time series or alerts when communicating with external systems such as federation, remote storage, and Alertmanager. The type is map[string]string. By default, no labels are added. |

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc @danielmellado @eromanova97 wdty?
A Pandora box was opened (context #2691 (comment)).

// communicating with external systems such as federation, remote storage,
// and Alertmanager.
// By default, no labels are added.
// A map[string]string. By default, no labels are added.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// A map[string]string. By default, no labels are added.
// A map[string]string; by default, no labels are added.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc @danielmellado @eromanova97 @juzhao wdty?
A Pandora box was opened (context #2691 (comment)).

@machine424
Copy link
Contributor Author

I'll probably just close this PR, and let you @eromanova97 decide and open another one :)

@machine424
Copy link
Contributor Author

or we can agree on the final wording so I don't have to change it three times.

@juzhao
Copy link
Contributor

juzhao commented Oct 14, 2025

or we can agree on the final wording so I don't have to change it three times.

agree, I think we could let @eromanova97 decide on the format

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants