Skip to content

Update procfs vendor - #1248

Merged
SuperQ merged 1 commit into
prometheus:masterfrom
mknapphrt:procfs
Feb 4, 2019
Merged

Update procfs vendor#1248
SuperQ merged 1 commit into
prometheus:masterfrom
mknapphrt:procfs

Conversation

@mknapphrt

Copy link
Copy Markdown
Contributor

I'm updating the vendor code so I can address the changes I proposed in #994. I did it separately because it also introduced an issue with cpu_linux that needed to be addressed and I thought it might be best not to have all of it in 1 commit.

I'm not entirely sure if this is right, I ran:
go get github.com/prometheus/procfs
GO111MODULE=on go mod tidy
GO111MODULE=on go mod vendor

and it pulled in go-kstat stuff too, is there a reason this wasn't included before?

Signed-off-by: Mark Knapp mknapp@hudson-trading.com

@mknapphrt

Copy link
Copy Markdown
Contributor Author

So it actually required significantly more changes that I realized at first. This should hopefully pass the tests now. The name of the commit is only half relevant now :/

@SuperQ

SuperQ commented Feb 2, 2019

Copy link
Copy Markdown
Member

Thanks, this was on my todo list!

@SuperQ
SuperQ self-requested a review February 3, 2019 11:01
@SuperQ

SuperQ commented Feb 3, 2019

Copy link
Copy Markdown
Member

Looks good. We should add a CHANGELOG entry for this.

### **Breaking changes**

The cpufreq metrics now separate the `cpufreq` and `scaling` data based on what the driver provides. #1248

...
* [CHANGE] Add separate cpufreq and scaling metrics #1248

Signed-off-by: Mark Knapp <mknapp@hudson-trading.com>
@mknapphrt

Copy link
Copy Markdown
Contributor Author

Sounds good, is the go-kstat stuff ok?

@SuperQ

SuperQ commented Feb 4, 2019

Copy link
Copy Markdown
Member

Yes, the go-kstat fix is fine. Not sure why the vendor check didn't fail when that PR was submitted.

@SuperQ SuperQ left a comment

Copy link
Copy Markdown
Member

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 7fbdd0a into prometheus:master Feb 4, 2019
@mknapphrt
mknapphrt deleted the procfs branch February 4, 2019 20:52
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
Signed-off-by: Mark Knapp <mknapp@hudson-trading.com>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
Signed-off-by: Mark Knapp <mknapp@hudson-trading.com>
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.

2 participants