Skip to content

Commit

Permalink
Added missing conditions to properties that were added at some point
Browse files Browse the repository at this point in the history
Details:

* Added missing fetch-conditions to all remaining properties of resource metric
  groups that were added at some point in the HMC/SE, but so far were assumed
  to always be present.

* Docs: Added missing metrics to the metrics table in the Usage section:
  - zhmc_partition_storage_group_uris

Signed-off-by: Andreas Maier <maiera@de.ibm.com>
  • Loading branch information
andy-maier committed Feb 24, 2024
1 parent 9e3e12a commit d012140
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
7 changes: 7 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ Released: not yet
'partition-attached-network-interface' due to error in rendering the Jinja2
expression for a label value. (issue #450)

* Added missing fetch-conditions to all remaining properties of resource metric
groups that were added at some point in the HMC/SE, but so far were assumed
to always be present.

* Docs: Added missing metrics to the metrics table in the Usage section:
zhmc_partition_storage_group_uris

**Enhancements:**

**Cleanup:**
Expand Down
9 changes: 5 additions & 4 deletions docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -524,14 +524,14 @@ zhmc_partition_crypto_adapter_usage_ratio D G Usage ratio
zhmc_partition_network_adapter_usage_ratio D G Usage ratio of all network adapters of the partition
zhmc_partition_storage_adapter_usage_ratio D G Usage ratio of all storage adapters of the partition
zhmc_partition_zvm_paging_rate_pages_per_second C G z/VM paging rate in pages/sec
zhmc_partition_processor_mode_int C+D G Allocation mode for processors as an integer (0=shared, 1=dedicated)
zhmc_partition_processor_mode_int C+D G Allocation mode for processors as an integer (0=shared, 1=dedicated); since HMC 2.15
zhmc_partition_threads_per_processor_ratio D G Number of threads per processor used by OS
zhmc_partition_defined_capacity_msu_per_hour C G Defined capacity expressed in terms of MSU per hour
zhmc_partition_workload_manager_is_enabled C G Boolean indicating whether z/OS WLM is allowed to change processing weight related properties (0=false, 1=true)
zhmc_partition_cp_processor_count C+D G Number of CP processors allocated to the active partition
zhmc_partition_cp_processor_count C+D G Number of CP processors allocated to the active partition; since HMC 2.15
zhmc_partition_cp_processor_count_is_capped C+D G Boolean indicating whether absolute capping is enabled for CP processors (0=false, 1=true)
zhmc_partition_cp_processor_count_cap C+D G Maximum number of CP processors that can be used if absolute capping is enabled, else 0
zhmc_partition_cp_reserved_processor_count C G Number of CP processors reserved for the active partition
zhmc_partition_cp_reserved_processor_count C G Number of CP processors reserved for the active partition; since HMC 2.15
zhmc_partition_cp_initial_processing_weight C+D G Initial CP processing weight for the active partition in shared mode
zhmc_partition_cp_minimum_processing_weight C+D G Minimum CP processing weight for the active partition in shared mode
zhmc_partition_cp_maximum_processing_weight C+D G Maximum CP processing weight for the active partition in shared mode
Expand Down Expand Up @@ -601,7 +601,8 @@ zhmc_partition_current_vfm_memory_gib C G Current amou
zhmc_partition_status_int D G Partition status as integer (0=active, 1=degraded, 10=paused, 11=stopped, 12=starting, 13=stopping, 20=reservation-error, 21=terminated, 22=communications-not-active, 23=status-check, 99=unsupported value)
zhmc_partition_lpar_status_int C G LPAR status as integer (0=operating, 1=not-operating, 2=not-activated, 10=exceptions, 99=unsupported value)
zhmc_partition_has_unacceptable_status C+D G Boolean indicating whether the partition has an unacceptable status
zhmc_partition_storage_groups D G Storage groups attached to the partition, as a comma-separated list
zhmc_partition_storage_group_uris D G URIs of storage groups attached to the partition, as a comma-separated list; since HMC 2.15
zhmc_partition_storage_groups D G Storage groups attached to the partition, as a comma-separated list; since HMC 2.15
zhmc_storagegroup_type_int D G Storage group type as integer (0=fcp, 1=fc, 2=nvme, 99=unsupported value)
zhmc_storagegroup_fulfillment_state_int D G Storage group fulfillment state as integer (0=complete, 1=pending, 2=pending-with-mismatches, 3=checking-migration, 4=incomplete, 99=unsupported value)
zhmc_storagegroup_shared D G Boolean indicating whether the storage group is shared (0=false, 1=true)
Expand Down
5 changes: 5 additions & 0 deletions examples/metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,18 @@ metrics:
- name: valuetype
value: "'bool'"
- property_name: processor-usage
if: "'processor-usage' in resource_obj.properties" # Added in HMC 2.15.0
exporter_name: processor_mode_int
exporter_desc: Allocation mode for processors to the active partition as an integer (0=shared, 1=dedicated)
valuemap:
shared: 0
dedicated: 1
- property_name: number-general-purpose-processors
if: "'number-general-purpose-processors' in resource_obj.properties" # Added in HMC 2.15.0
exporter_name: cp_processor_count
exporter_desc: Number of CP processors currently allocated to the active partition
- property_name: number-reserved-general-purpose-processors
if: "'number-reserved-general-purpose-processors' in resource_obj.properties" # Added in HMC 2.15.0
exporter_name: cp_reserved_processor_count
exporter_desc: Number of CP processors reserved for the active partition (this is the maximum when increasing the number)
- property_name: initial-processing-weight
Expand Down Expand Up @@ -1043,12 +1046,14 @@ metrics:
- name: valuetype
value: "'bool'"
- properties_expression: "0"
if: "'storage-group-uris' in resource_obj.properties" # Added in HMC 2.15.0
exporter_name: storage_group_uris
exporter_desc: "URIs of storage groups attached to the partition, as a comma-separated list"
labels:
- name: value
value: "resource_obj.properties['storage-group-uris'] | join(',')"
- properties_expression: "0"
if: "'storage-group-uris' in resource_obj.properties" # Added in HMC 2.15.0
exporter_name: storage_groups
exporter_desc: "Storage groups attached to the partition, as a comma-separated list"
labels:
Expand Down

0 comments on commit d012140

Please sign in to comment.