Skip to content

Collect additional common Infiniband counters #1120

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

Merged
merged 3 commits into from
Oct 30, 2018
Merged

Conversation

pfree
Copy link
Contributor

@pfree pfree commented Oct 20, 2018

No description provided.

@SuperQ
Copy link
Member

SuperQ commented Oct 20, 2018

Thanks!

You also need to update collector/fixtures/e2e-64k-page-output.txt. That should fix the buildkite error.

@SuperQ
Copy link
Member

SuperQ commented Oct 20, 2018

It looks like you've incorrectly merged an upstream commit into your branch.

I would suggest looking at GitHub fork workflow. You want to work on a local branch, rather than the master of your fork. This will avoid these kind of merge errors.

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

Mostly looks good, Please add an [ENHANCEMENT] entry in the CHANGELOG under master / unreleased.

Copy link
Member

@discordianfish discordianfish left a comment

Choose a reason for hiding this comment

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

LGTM

pfree added 3 commits October 30, 2018 16:00
Signed-off-by: Patrick Freeman <[email protected]>
Signed-off-by: Patrick Freeman <[email protected]>
Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

LGTM

@SuperQ SuperQ merged commit bdc0e7e into prometheus:master Oct 30, 2018
iori-yja pushed a commit to iori-yja/node_exporter that referenced this pull request Nov 2, 2018
* Collect additional common Infiniband counters

Signed-off-by: Patrick Freeman <[email protected]>
Signed-off-by: iori-yja <[email protected]>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
* Collect additional common Infiniband counters

Signed-off-by: Patrick Freeman <[email protected]>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
* Collect additional common Infiniband counters

Signed-off-by: Patrick Freeman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants