luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #4128 from hashicorp/b-uptime 

Fix client uptime metric missing client prefix
This commit is contained in:
Alex Dadgar 2018-04-10 14:13:59 -07:00 committed by GitHub
parent c88fef4c4b 6bfd222f27
commit deadb10dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGELOG.md
View File

@ -3,6 +3,12 @@
__BACKWARDS INCOMPATIBILITIES:__
* cli: node drain now blocks until the drain completes and all allocations on
the draining node have stopped. Use -detach for the old behavior.
* client: Periods (`.`) are no longer replaced with underscores (`_`) in
environment variables as many applications rely on periods in environment
variable names. [[GH-3760](https://github.com/hashicorp/nomad/issues/3760)]
* client/metrics: The key emitted for tracking a client's uptime has changed
from "uptime" to "client.uptime". Users monitoring this metric will have to
switch to the new key name [[GH-4128](https://github.com/hashicorp/nomad/issues/4128)]
* discovery: Prevent absolute URLs in check paths. The documentation indicated
that absolute URLs are not allowed, but it was not enforced. Absolute URLs
in HTTP check paths will now fail to validate. [[GH-3685](https://github.com/hashicorp/nomad/issues/3685)]
@ -10,13 +16,15 @@ __BACKWARDS INCOMPATIBILITIES:__
[migrate stanza](https://www.nomadproject.io/docs/job-specification/migrate.html)
allows jobs to specify how quickly task groups can be drained. A `-force`
option can be used to emulate the old drain behavior.
* jobspec: The default values for restart policy have changed. Restart policy mode defaults to "fail" and the
attempts/time interval values have been changed to enable faster server side rescheduling. See
[restart stanza](https://www.nomadproject.io/docs/job-specification/restart.html) for more information.
* jobspec: Removed compatibility code that migrated pre Nomad 0.6.0 Update stanza syntax. All job spec files should be using update stanza fields introduced in 0.7.0 [[GH-3979](https://github.com/hashicorp/nomad/pull/3979/files)]
* client: Periods (`.`) are no longer replaced with underscores (`_`) in
environment variables as many applications rely on periods in environment
variable names. [[GH-3760](https://github.com/hashicorp/nomad/issues/3760)]
* jobspec: The default values for restart policy have changed. Restart policy
mode defaults to "fail" and the attempts/time interval values have been
changed to enable faster server side rescheduling. See [restart
stanza](https://www.nomadproject.io/docs/job-specification/restart.html) for
more information.
* jobspec: Removed compatibility code that migrated pre Nomad 0.6.0 Update
stanza syntax. All job spec files should be using update stanza fields
introduced in 0.7.0
[[GH-3979](https://github.com/hashicorp/nomad/pull/3979/files)]
IMPROVEMENTS:
* core: Servers can now service client HTTP endpoints [[GH-3892](https://github.com/hashicorp/nomad/issues/3892)]

4
client/client.go
View File

@ -2334,10 +2334,10 @@ func (c *Client) setGaugeForAllocationStats(nodeID string) {
// No labels are required so we emit with only a key/value syntax
func (c *Client) setGaugeForUptime(hStats *stats.HostStats) {
if !c.config.DisableTaggedMetrics {
metrics.SetGaugeWithLabels([]string{"uptime"}, float32(hStats.Uptime), c.baseLabels)
metrics.SetGaugeWithLabels([]string{"client", "uptime"}, float32(hStats.Uptime), c.baseLabels)
}
if c.config.BackwardsCompatibleMetrics {
metrics.SetGauge([]string{"uptime"}, float32(hStats.Uptime))
metrics.SetGauge([]string{"client", "uptime"}, float32(hStats.Uptime))
}
}