Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: siimon/prom-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v10.2.1
Choose a base ref
...
head repository: siimon/prom-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v10.2.2
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 2, 2017

  1. fixed invalid memory report on linux (#163) 

    * fixed invalid memory report on linux

You have to multiply memory reported by the `/proc/self/status` by 1024, not 1000; because it's in KiB.

Proof:
```$ ps -o vsz -p 15301
   VSZ
 13820
$ grep VmSize /proc/15301/status
VmSize:    13820 kB
$ man ps | grep vsz             
       %z     vsz      VSZ
                             vsz and rss.
       vsize       VSZ       see vsz.  (alias vsz).
       vsz         VSZ       virtual memory size of the process in KiB (1024-byte```

Replace 15301 with the PID of your choice.

* Update CHANGELOG.md
    @yurijmikhalevich @SimenB
    yurijmikhalevich authored and SimenB committed Nov 2, 2017
    Copy the full SHA
    24ef680 View commit details

  2. Update changelog for release

    @SimenB
    SimenB committed Nov 2, 2017
    Copy the full SHA
    39999c9 View commit details

  3. 10.2.2

    @SimenB
    SimenB committed Nov 2, 2017
    Copy the full SHA
    bd55876 View commit details
Showing with 8 additions and 3 deletions.
  1. +6 −1 CHANGELOG.md
  2. +1 −1 lib/metrics/osMemoryHeapLinux.js
  3. +1 −1 package.json
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Changed
### Added

## [10.2.2] - 2017-11-02
### Changed
- Fixed invalid `process_virtual_memory_bytes` reported under linux

## [10.2.1] - 2017-10-27
### Changed
- Only resolve/reject `clusterMetrics` promise if no callback is provided
@@ -88,7 +92,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Creating metrics with one argument per parameter - use object literals instead.


[Unreleased]: https://github.com/siimon/prom-client/compare/v10.2.1...HEAD
[Unreleased]: https://github.com/siimon/prom-client/compare/v10.2.2...HEAD
[10.2.2]: https://github.com/siimon/prom-client/compare/v10.2.1...v10.2.2
[10.2.1]: https://github.com/siimon/prom-client/compare/v10.2.0...v10.2.1
[10.2.0]: https://github.com/siimon/prom-client/compare/v10.1.1...v10.2.0
[10.1.1]: https://github.com/siimon/prom-client/compare/v10.1.0...v10.1.1
2 changes: 1 addition & 1 deletion lib/metrics/osMemoryHeapLinux.js
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ function structureOutput(input) {
// Remove trailing ` kb`
value = value.substr(0, value.length - 3);
// Make it into a number in bytes bytes
value = Number(value) * 1000;
value = Number(value) * 1024;

returnValue[split[0]] = value;
});
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prom-client",
"version": "10.2.1",
"version": "10.2.2",
"description": "Client for prometheus",
"main": "index.js",
"files": [