From 76d64dcc0d5fad7dad9e5e1067b086b67b69145d Mon Sep 17 00:00:00 2001 From: BominRahmani Date: Mon, 8 Jul 2024 23:49:31 -0400 Subject: [PATCH] fixed versioning --- .chloggen/add-vcenter-resource-pool-metrics.yaml | 5 ++++- receiver/vcenterreceiver/README.md | 2 +- receiver/vcenterreceiver/documentation.md | 4 ++-- receiver/vcenterreceiver/metadata.yaml | 4 ++-- receiver/vcenterreceiver/metrics.go | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.chloggen/add-vcenter-resource-pool-metrics.yaml b/.chloggen/add-vcenter-resource-pool-metrics.yaml index 8e25426b45be..d3978f377a01 100644 --- a/.chloggen/add-vcenter-resource-pool-metrics.yaml +++ b/.chloggen/add-vcenter-resource-pool-metrics.yaml @@ -15,7 +15,10 @@ issues: [33607] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. # Use pipe (|) for multiline entries. -subtext: +subtext: | + Added "vcenter.resource_pool.memory.swapped", "vcenter.resource_pool.memory.ballooned", and "vcenter.resource_pool.memory.granted" + metrics. Also added an additional attribute, "memory_usage_type" for "vcenter.resource_pool.memory.usage" metric, which is + currently under a feature gate. # If your change doesn't affect end users or the exported elements of any package, # you should instead start your pull request title with [chore] or use the "Skip Changelog" label. diff --git a/receiver/vcenterreceiver/README.md b/receiver/vcenterreceiver/README.md index 7aae85833fca..1357f74f3d3d 100644 --- a/receiver/vcenterreceiver/README.md +++ b/receiver/vcenterreceiver/README.md @@ -63,4 +63,4 @@ the `vcenter.resource_pool.memory.usage` metric. This feature gate will eventually be enabled by default, and eventually the old implementation will be removed. It aims to give users time to migrate to the new implementation. The target release for this featuregate to be enabled by default -is 106.0.0. +is v0.106.0. diff --git a/receiver/vcenterreceiver/documentation.md b/receiver/vcenterreceiver/documentation.md index 1e147d8d0c5b..dbf3cf232794 100644 --- a/receiver/vcenterreceiver/documentation.md +++ b/receiver/vcenterreceiver/documentation.md @@ -287,7 +287,7 @@ The usage of the memory by the resource pool. | Name | Description | Values | | ---- | ----------- | ------ | -| type | type of memory usage. | Str: ``guest``, ``host``, ``overhead`` | +| type | The type of memory usage. | Str: ``guest``, ``host``, ``overhead`` | ### vcenter.vm.cpu.usage @@ -552,7 +552,7 @@ The amount of memory that is granted to VMs from shared and non-shared host memo | Name | Description | Values | | ---- | ----------- | ------ | -| type | type of memory granted. | Str: ``private``, ``shared`` | +| type | The type of memory granted. | Str: ``private``, ``shared`` | ### vcenter.resource_pool.memory.swapped diff --git a/receiver/vcenterreceiver/metadata.yaml b/receiver/vcenterreceiver/metadata.yaml index d484cde9f80b..ab6e51f9a30c 100644 --- a/receiver/vcenterreceiver/metadata.yaml +++ b/receiver/vcenterreceiver/metadata.yaml @@ -75,7 +75,7 @@ attributes: - physical memory_usage_type: name_override: type - description: type of memory usage. + description: The type of memory usage. type: string enum: - guest @@ -83,7 +83,7 @@ attributes: - overhead memory_granted_type: name_override: type - description: type of memory granted. + description: The type of memory granted. type: string enum: - private diff --git a/receiver/vcenterreceiver/metrics.go b/receiver/vcenterreceiver/metrics.go index cb6940773cfd..f6299617181f 100644 --- a/receiver/vcenterreceiver/metrics.go +++ b/receiver/vcenterreceiver/metrics.go @@ -15,9 +15,9 @@ import ( var enableResourcePoolMemoryUsageAttr = featuregate.GlobalRegistry().MustRegister( "receiver.vcenter.resourcePoolMemoryUsageAttribute", featuregate.StageAlpha, - featuregate.WithRegisterFromVersion("v104.0.0"), + featuregate.WithRegisterFromVersion("v0.104.0"), featuregate.WithRegisterDescription("Enables the memory usage type attribute for the vcenter.resource_pool.memory.usage metric"), - featuregate.WithRegisterToVersion("v106.0.0")) + featuregate.WithRegisterToVersion("v0.106.0")) // recordDatastoreStats records stat metrics for a vSphere Datastore func (v *vcenterMetricScraper) recordDatastoreStats(