Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .chloggen/redfish-semantic-convention.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
component: receiver/redfish

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: |
`system.host_name` and `base_url` resource attribute has been changed to `host.name` and `url.full` respectively.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [46236]

# (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:

# 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.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
4 changes: 2 additions & 2 deletions receiver/redfishreceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,5 @@ Measures the state of a chassis temperature (-1 unknown, 0 disabled, 1 enabled).
| Name | Description | Values | Enabled |
| ---- | ----------- | ------ | ------- |
| base_url | base url. | Any Str | true |
| system.host_name | System host name. | Any Str | true |
| host.name | System host name. | Any Str | true |
| url.full | Full URL of Redfish API endpoint. | Any Str | true |
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ $defs:
description: ResourceAttributesConfig provides config for redfish resource attributes.
type: object
properties:
base_url:
description: ResourceAttributeConfig provides common config for a base_url resource attribute.
host.name:
description: ResourceAttributeConfig provides common config for a host.name resource attribute.
type: object
properties:
enabled:
Expand All @@ -109,8 +109,8 @@ $defs:
type: array
items:
$ref: go.opentelemetry.io/collector/filter.config
system.host_name:
description: ResourceAttributeConfig provides common config for a system.host_name resource attribute.
url.full:
description: ResourceAttributeConfig provides common config for a url.full resource attribute.
type: object
properties:
enabled:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions receiver/redfishreceiver/internal/metadata/testdata/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ all_set:
temperature.status.state:
enabled: true
resource_attributes:
base_url:
host.name:
enabled: true
system.host_name:
url.full:
enabled: true
none_set:
metrics:
Expand Down Expand Up @@ -57,27 +57,27 @@ none_set:
temperature.status.state:
enabled: false
resource_attributes:
base_url:
host.name:
enabled: false
system.host_name:
url.full:
enabled: false
filter_set_include:
resource_attributes:
base_url:
host.name:
enabled: true
metrics_include:
- regexp: ".*"
system.host_name:
url.full:
enabled: true
metrics_include:
- regexp: ".*"
filter_set_exclude:
resource_attributes:
base_url:
host.name:
enabled: true
metrics_exclude:
- strict: "base_url-val"
system.host_name:
- strict: "host.name-val"
url.full:
enabled: true
metrics_exclude:
- strict: "system.host_name-val"
- strict: "url.full-val"
10 changes: 5 additions & 5 deletions receiver/redfishreceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ status:
active: [steven-freed, khushijain21]

resource_attributes:
base_url:
description: base url.
type: string
enabled: true
system.host_name:
host.name:
description: System host name.
type: string
enabled: true
url.full:
description: Full URL of Redfish API endpoint.
type: string
enabled: true

attributes:
Expand Down
4 changes: 2 additions & 2 deletions receiver/redfishreceiver/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ func (s *redfishScraper) scrape(_ context.Context) (pmetric.Metrics, error) {

// Always present - resource attributes
rb := s.mb.NewResourceBuilder()
rb.SetBaseURL(baseURL)
rb.SetSystemHostName(compSys.HostName)
rb.SetURLFull(baseURL)
rb.SetHostName(compSys.HostName)

s.mb.EmitForResource(metadata.WithResource(rb.Emit()))
}
Expand Down
Loading