Skip to content

Conversation

@JoeAldinger
Copy link
Contributor

@JoeAldinger JoeAldinger commented Aug 8, 2025

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSDOCS-15224

Link to docs preview:

QE review:

  • QE has approved this change.
  • SME has approved this change.

Additional information:

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 8, 2025

@JoeAldinger: This pull request references OSDOCS-15203 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):

Issue:

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 8, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 8, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 8, 2025

@JoeAldinger: This pull request references OSDOCS-15203 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSDOCS-15224

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.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 8, 2025

@openshift-ci
Copy link

openshift-ci bot commented Aug 11, 2025

@JoeAldinger: 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.

@asood-rh
Copy link

/lgtm

As per Joe, it is reorganization PR.

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

openshift-ci-robot commented Aug 13, 2025

@JoeAldinger: This pull request references OSDOCS-15203 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSDOCS-15224

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.

@palonsoro
Copy link
Contributor

/lgtm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 15, 2025

@JoeAldinger: This pull request references OSDOCS-15203 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.21.0" version, but no target version was set.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSDOCS-15224

Link to docs preview:

QE review:

  • QE has approved this change.
  • SME 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.

@JoeAldinger JoeAldinger added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 15, 2025
Copy link
Contributor

@jab-rh jab-rh left a comment

Choose a reason for hiding this comment

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

@JoeAldinger, left a few minor comments, but doesn't prevent getting it merged.

* Pod namespace
* Interface name (such as `eth0`)

These metrics work well until new interfaces are added to the pod, for example via https://github.com/intel/multus-cni[Multus], as it is not clear what the interface names refer to.
Copy link
Contributor

Choose a reason for hiding this comment

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

@JoeAldinger, historically we've needed permission for linking to GitHub as I recall.


:_mod-docs-content-type: CONCEPT
[id="cnf-network-metrics-daemon_{context}"]
= Network Metrics Daemon
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we actually capitalize Daemon for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think in this case it does get capitalize 🤷🏻 https://github.com/openshift/network-metrics-daemon.

@JoeAldinger JoeAldinger merged commit f5e1553 into openshift:main Sep 15, 2025
2 checks passed
@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@JoeAldinger: #97356 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-15203:CQA for associating secondary metrics
Using index info to reconstruct a base tree...
M	modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
A	networking/advanced_networking/associating-secondary-interfaces-metrics-to-network-attachments.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
CONFLICT (content): Merge conflict in modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
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 OSDOCS-15203:CQA for associating secondary metrics

In response to this:

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

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.

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.20

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.19

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.18

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.17

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #99073

In response to this:

/cherrypick enterprise-4.20

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

@JoeAldinger: new pull request created: #99074

In response to this:

/cherrypick enterprise-4.19

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.

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.15

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #99075

In response to this:

/cherrypick enterprise-4.18

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.

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #99076

In response to this:

/cherrypick 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.

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #99077

In response to this:

/cherrypick 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.

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #99078

In response to this:

/cherrypick enterprise-4.15

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

@JoeAldinger: new pull request created: #99079

In response to this:

/cherrypick enterprise-4.14

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

@JoeAldinger: new pull request created: #99080

In response to this:

/cherrypick enterprise-4.13

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

@JoeAldinger: #97356 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-15203:CQA for associating secondary metrics
Using index info to reconstruct a base tree...
M	modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
A	networking/advanced_networking/associating-secondary-interfaces-metrics-to-network-attachments.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
CONFLICT (content): Merge conflict in modules/cnf-associating-secondary-interfaces-metrics-to-network-attachments.adoc
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 OSDOCS-15203:CQA for associating secondary metrics

In response to this:

/cherrypick enterprise-4.12

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.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 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-needed Signifies that the merge review team needs to review this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants