diff --git a/docs/collector.os.md b/docs/collector.os.md index c5b96b1b..c172d2fa 100644 --- a/docs/collector.os.md +++ b/docs/collector.os.md @@ -14,11 +14,11 @@ None ## Metrics -| Name | Description | Type | Labels | -|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|-----------------------------------------------------------------------------------------------------------------| -| `windows_os_hostname` | Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain | gauge | `domain`, `fqdn`, `hostname` | -| `windows_os_info` | Contains full product name & version in labels. Note that the `major_version` for Windows 11 is "10"; a build number greater than 22000 represents Windows 11. | gauge | `product`, `version`, `major_version`, `minor_version`, `build_number`, `revision`, `installation_type` | -| `windows_os_install_time_timestamp` | Unix timestamp of OS installation time | gauge | None | +| Name | Description | Type | Labels | +|----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|-----------------------------------------------------------------------------------------------------------------| +| `windows_os_hostname` | Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain | gauge | `domain`, `fqdn`, `hostname` | +| `windows_os_info` | Contains full product name & version in labels. Note that the `major_version` for Windows 11 is "10"; a build number greater than 22000 represents Windows 11. | gauge | `product`, `version`, `major_version`, `minor_version`, `build_number`, `revision`, `installation_type` | +| `windows_os_install_time_timestamp_seconds` | Unix timestamp of OS installation time | gauge | None | ### Example metric @@ -29,9 +29,9 @@ windows_os_hostname{domain="",fqdn="PC",hostname="PC"} 1 # HELP windows_os_info Contains full product name & version in labels. Note that the "major_version" for Windows 11 is \\"10\\"; a build number greater than 22000 represents Windows 11. # TYPE windows_os_info gauge windows_os_info{build_number="19045",installation_type="Client",major_version="10",minor_version="0",product="Windows 10 Pro",revision="4842",version="10.0.19045"} 1 -# HELP windows_os_install_time_timestamp Unix timestamp of OS installation time -# TYPE windows_os_install_time_timestamp gauge -windows_os_install_time_timestamp 1.6725312e+09 +# HELP windows_os_install_time_timestamp_seconds Unix timestamp of OS installation time +# TYPE windows_os_install_time_timestamp_seconds gauge +windows_os_install_time_timestamp_seconds 1.6725312e+09 ``` ## Useful queries diff --git a/internal/collector/os/os.go b/internal/collector/os/os.go index 08cde8de..da630628 100644 --- a/internal/collector/os/os.go +++ b/internal/collector/os/os.go @@ -122,7 +122,7 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error { ) c.installTime = prometheus.NewDesc( - prometheus.BuildFQName(types.Namespace, Name, "install_time_timestamp"), + prometheus.BuildFQName(types.Namespace, Name, "install_time_timestamp_seconds"), "Unix timestamp of OS installation time", nil, nil, diff --git a/tools/e2e-output.txt b/tools/e2e-output.txt index bce795fa..19f62d6a 100644 --- a/tools/e2e-output.txt +++ b/tools/e2e-output.txt @@ -287,8 +287,8 @@ windows_exporter_collector_timeout{collector="udp"} 0 # TYPE windows_os_hostname gauge # HELP windows_os_info Contains full product name & version in labels. Note that the "major_version" for Windows 11 is \\"10\\"; a build number greater than 22000 represents Windows 11. # TYPE windows_os_info gauge -# HELP windows_os_install_time_timestamp Unix timestamp of OS installation time -# TYPE windows_os_install_time_timestamp gauge +# HELP windows_os_install_time_timestamp_seconds Unix timestamp of OS installation time +# TYPE windows_os_install_time_timestamp_seconds gauge # HELP windows_pagefile_free_bytes Number of bytes that can be mapped into the operating system paging files without causing any other pages to be swapped out # TYPE windows_pagefile_free_bytes gauge # HELP windows_pagefile_limit_bytes Number of bytes that can be stored in the operating system paging files. 0 (zero) indicates that there are no paging files