feat: fill rest gaps

conf/rest/9.10.0/aggr.yaml

@@ -0,0 +1,57 @@
+
+name:               Aggregate
+query:              api/storage/aggregates
+object:             aggr
+
+counters:
+  - ^name  => aggr
+  - ^^uuid  => uuid
+  - ^home_node.name  => node
+  - ^state  => state
+  - ^block_storage.primary.disk_type => type
+  - ^block_storage.primary.raid_type => raid_type
+  - block_storage.primary.raid_size => raid_size
+  - space.cloud_storage.used => space_capacity_tier_used
+  - space.block_storage.data_compacted_count => space_data_compacted_count
+  - space.block_storage.data_compaction_space_saved => space_data_compaction_saved
+  - space.block_storage.data_compaction_space_saved_percent  => space_data_compaction_saved_percent
+  - block_storage.hybrid_cache.size  => hybrid_cache_size_total
+  - space.block_storage.inactive_user_data => space_performance_tier_inactive_user_data
+  - space.block_storage.inactive_user_data_percent => space_performance_tier_inactive_user_data_percent
+  - space.block_storage.physical_used => space_physical_used
+  - space.block_storage.physical_used_percent  => space_used_percent
+  - space.block_storage.volume_deduplication_shared_count => space_sis_shared_count
+  - space.block_storage.volume_deduplication_space_saved => space_sis_saved
+  - space.block_storage.volume_deduplication_space_saved_percent => space_sis_saved_percent
+  - space.block_storage.available => space_available
+  - space.block_storage.size => space_total
+  - space.block_storage.used => space_used
+  - snapshot.files_total => snapshot_files_total
+  - snapshot.files_used => snapshot_files_used
+  - snapshot.max_files_available => snapshot_maxfiles_available
+  - snapshot.max_files_used => snapshot_maxfiles_used
+  - space.snapshot.available => snapshot_size_available
+  - space.snapshot.used => snapshot_size_used
+  - space.snapshot.used_percent => snapshot_used_percent
+  - space.snapshot.reserve_percent => snapshot_reserve_percent
+  - space.snapshot.total => snapshot_size_total
+  - volume_count => volume_count_flexvol
+  - block_storage.primary.disk_count => primary_disk_count
+  - block_storage.hybrid_cache.disk_count => hybrid_disk_count
+  - block_storage.plexes.# => raid_plex_count
+
+plugins:
+  - LabelAgent:
+      value_to_num:
+        - new_status state online online `0`
+      compute_metric:
+        - snapshot_maxfiles_possible ADD snapshot.max_files_available snapshot.max_files_used
+        - raid_disk_count ADD block_storage.primary.disk_count block_storage.hybrid_cache.disk_count
+
+export_options:
+  instance_keys:
+    - aggr
+    - node
+  instance_labels:
+    - type
+    - state

conf/rest/9.13.0/aggr.yaml

@@ -4,30 +4,28 @@ query:              api/storage/aggregates
 object:             aggr
 
 counters:
-  - ^name  => aggr
   - ^^uuid  => uuid
+  - ^name  => aggr
   - ^home_node.name  => node
-  #- ^aggr-get-iter.aggr-attributes.aggr-raid-attributes.aggregate-type  => raid_type  #mapping missing
-  - block_storage.primary.raid_size => raid_size
   - ^state  => state
-  #- aggr-get-iter.aggr-attributes.aggr-inode-attributes.percent-inode-used-capacity => percent_inode_used_capacity #mapping missing
+  - ^block_storage.primary.disk_type => type
+  - ^block_storage.primary.raid_type => raid_type
+  - block_storage.primary.raid_size => raid_size
   - space.cloud_storage.used => space_capacity_tier_used
   - space.block_storage.data_compacted_count => space_data_compacted_count
   - space.block_storage.data_compaction_space_saved => space_data_compaction_saved
   - space.block_storage.data_compaction_space_saved_percent  => space_data_compaction_saved_percent
   - block_storage.hybrid_cache.size  => hybrid_cache_size_total
-  - snapshot.percent_used_capacity => space_used_percent #mapping seems wrong in doc
   - space.block_storage.inactive_user_data => space_performance_tier_inactive_user_data
   - space.block_storage.inactive_user_data_percent => space_performance_tier_inactive_user_data_percent
   - space.block_storage.physical_used => space_physical_used
-  - space.block_storage.physical_used_percent => space_physical_used_percent
+  - space.block_storage.physical_used_percent  => space_used_percent
   - space.block_storage.volume_deduplication_shared_count => space_sis_shared_count
   - space.block_storage.volume_deduplication_space_saved => space_sis_saved
   - space.block_storage.volume_deduplication_space_saved_percent => space_sis_saved_percent
   - space.block_storage.available => space_available
   - space.block_storage.size => space_total
   - space.block_storage.used => space_used
-  #- aggr-get-iter.aggr-attributes.aggr-space-attributes.total-reserved-space => space_reserved #Missing mapping
   - snapshot.files_total => snapshot_files_total
   - snapshot.files_used => snapshot_files_used
   - snapshot.max_files_available => snapshot_maxfiles_available
@@ -41,7 +39,6 @@ counters:
   - inode_attributes.max_files_available => inode_maxfiles_available
   - inode_attributes.max_files_possible => inode_maxfiles_possible
   - inode_attributes.max_files_used => inode_maxfiles_used
-  #- aggr-get-iter.aggr-attributes.aggr-snapshot-attributes.percent-inode-used-capacity => snapshot_inode_used_percent #missing mapping
   - space.snapshot.available => snapshot_size_available
   - space.snapshot.used => snapshot_size_used
   - space.snapshot.used_percent => snapshot_used_percent
@@ -52,7 +49,6 @@ counters:
   - block_storage.hybrid_cache.disk_count => hybrid_disk_count
   - block_storage.plexes.# => raid_plex_count
   - hidden_fields:
-      - space.block_storage
       - inode_attributes
 
 plugins:

conf/rest/9.13.0/disk.yaml

@@ -6,23 +6,23 @@ object:           disk
 counters:
   - ^^uid
   - ^name                     => disk
-  - bytes_per_sector          => bytes_per_sector
-  - sector_count              => sectors
+  - ^state
+  - ^node.uuid
+  - ^node.name                => node
+  - ^home_node.name           => owner_node
   - ^type
   - ^container_type
   - ^model
   - ^serial_number
   - ^shelf.uid                => shelf
   - ^bay                      => shelf_bay
+  - bytes_per_sector          => bytes_per_sector
+  - sector_count              => sectors
   - stats.average_latency     => stats_average_latency
   - stats.throughput          => stats_io_kbps
   - stats.power_on_hours      => uptime
   - outage.reason             => outage
   - usable_size
-  - ^state
-  - ^node.uuid
-  - ^node.name                => node
-  - ^home_node.name           => owner_node
 
 endpoints:
   - query: api/private/cli/disk
@@ -32,6 +32,7 @@ endpoints:
       - sectors_written => stats_sectors_written
 
 plugins:
+  - Disk
   - LabelAgent:
       value_to_num:
         - new_status outage - - `0` #ok_value is empty value, '-' would be converted to blank while processing.

conf/rest/9.13.0/lun.yaml

@@ -4,15 +4,15 @@ query:                      api/storage/luns
 object:                     lun
 
 counters:
+  - ^^uuid
   - ^location.node.name => node
   - ^name => path
   - ^location.qtree.name => qtree
-  - space.size => size
-  - space.used => size_used
   - ^status.state => state
-  - ^^uuid
   - ^location.volume.name => volume
   - ^svm.name => svm
+  - space.size => size
+  - space.used => size_used
 
 plugins:
   - LabelAgent:

conf/rest/9.13.0/node.yaml

@@ -4,22 +4,22 @@ query:                      api/cluster/nodes
 object:                     node
 
 counters:
-  - metric.processor_utilization => cpu_busytime   #hidden field
-  - controller.failed_fan.count => failed_fan
+  - ^^name => node
   - ^controller.failed_fan.message.message => failed_fan
-  - controller.failed_power_supply.count => failed_power
   - ^controller.failed_power_supply.message.message => failed_power_message
   - ^controller.over_temperature => over_temperature
   - ^state => healthy
   #- ^system-node-get-iter.maximum-aggregate-size => max_aggr_size  #missing mapping
   #- ^system-node-get-iter.maximum-number-of-volumes => max_vol_num #missing mapping
   #- ^system-node-get-iter.maximum-volume-size => max_vol_size #missing mapping
-  - ^^name => node
   - ^location
   - ^model
   - ^serial_number => serial
-  - ^uptime
   - ^version.full => version
+  - uptime
+  - controller.failed_power_supply.count => failed_power
+  - metric.processor_utilization => cpu_busytime   #hidden field
+  - controller.failed_fan.count => failed_fan
   - hidden_fields:
       - metric.processor_utilization
 

conf/rest/9.13.0/port.yaml

@@ -15,8 +15,6 @@ counters:
     - ^vlan.base_port.node.name => vlan_node
     - ^vlan.base_port.name => vlan_port
 
-collect_only_labels: true
-
 endpoints:
   - query: api/private/cli/network/port
     counters:

conf/rest/9.13.0/qtree.yaml

@@ -19,6 +19,7 @@ endpoints:
       - ^^volume => volume
       - ^^qtree => qtree
       - ^status => status
+      - ^oplock_mode => oplocks
 
 
 export_options:
@@ -30,3 +31,4 @@ export_options:
     - export_policy
     - security_style
     - status
+    - oplocks

conf/rest/9.13.0/shelf.yaml

@@ -4,19 +4,23 @@ query:              api/storage/shelves
 object:             shelf
 
 counters:
-  - ^^uid => shelf_uid
+  #- ^^uid => shelf_uid
+  - ^^serial_number => serial_number
   - ^module_type => module_type
-  - ^serial_number => serial_number
   - ^name => shelf
   - ^model => model
   - ^state => state
   - ^manufacturer.name => vendor_name
   - disk_count => disk_count
-  #- ^state => op_status
+
+endpoints:
+  - query: api/private/cli/storage/shelf
+    counters:
+      - ^^serial_number => serial_number
+      - ^op_status  => op_status
 
 plugins:
   LabelAgent:
-    # metric label zapi_value rest_value `default_value`
     value_to_num:
       - new_status state online ok `0`
 

conf/rest/9.13.0/snapmirror.yaml

@@ -4,20 +4,20 @@ query:                        api/snapmirror/relationships
 object:                       snapmirror
 
 counters:
+  - ^^uuid => relationship_id
   - ^destination.path  => destination_volume
   - ^destination.svm.name => destination_vserver
   - ^healthy
-  - lag_time
-  - transfer.total_duration => last_transfer_duration
-  - transfer.end_time => last_transfer_end_timestamp
-  - transfer.bytes_transferred  => last_transfer_size
   - ^transfer.bytes_transferred  => last_transfer_size
-  - ^^uuid => relationship_id
   - ^transfer.state => relationship_status
   - ^source.path => source_volume
   - ^source.svm.name => source_vserver
   #- ^source-node #missing mapping  ==> Needs plugin development
   - ^unhealthy_reason.#.message => unhealthy_reason
+  - lag_time
+  - transfer.total_duration => last_transfer_duration
+  - transfer.end_time => last_transfer_end_timestamp
+  - transfer.bytes_transferred  => last_transfer_size
 
 
 endpoints:
@@ -29,7 +29,10 @@ endpoints:
       - ^last_transfer_type => last_transfer_type
       - ^relationship_group_type  => group_type
       - ^schedule => schedule
+      - ^policy_type => policy_type
+      - ^destination_path => destination_location
       - total_transfer_time_secs => total_transfer_time_secs
+      - total_transfer_bytes => total_transfer_bytes
       - newest_snapshot_timestamp => newest_snapshot_timestamp
       - resync_successful_count => resync_successful_count
       - update_successful_count => update_successful_count
@@ -59,3 +62,5 @@ export_options:
     - destination_node_limit
     - source_node_limit
     - group_type
+    - policy_type
+    - destination_location

conf/rest/9.13.0/volume.yaml

@@ -3,13 +3,16 @@ query:                    api/storage/volumes
 object:                   volume
 
 counters:
-  - autosize.maximum => autosize_maximum_size
-  - autosize.grow_threshold => autosize_grow_threshold_percent
   - ^^uuid => instance_uuid
   - ^name                       => volume
   - ^svm.name        => svm
   - ^aggregates.#.name  => aggr #zapi maps to field containing-aggregate-name while rest mapping is an array?
   - ^style             => style
+  - ^type             => type
+  - ^snapshot_policy.name  => snapshot_policy
+  - ^state   => state
+  - autosize.maximum => autosize_maximum_size
+  - autosize.grow_threshold => autosize_grow_threshold_percent
   - space.expected_available => space_expected_available
   - space.filesystem_size                       => filesystem_size
   - space.logical_space.available  => space_logical_available  #not found in infinity cluster
@@ -30,8 +33,6 @@ counters:
   - space.snapshot.reserve_size               => snapshot_reserve_size
   - space.snapshot.reserve_percent         => snapshot_reserve_percent
   - space.snapshot.space_used_percent    => snapshot_reserve_used_percent
-  - ^snapshot_policy.name  => snapshot_policy
-  - ^state   => state
   - hidden_fields:
     - space
     - autosize
@@ -74,5 +75,6 @@ export_options:
     - state
     - is_sis_volume
     - snapshot_policy
+    - type