diff --git a/conf/keyperf/9.15.0/lun.yaml b/conf/keyperf/9.15.0/lun.yaml
new file mode 100644
index 000000000..a2b8ddb4c
--- /dev/null
+++ b/conf/keyperf/9.15.0/lun.yaml
@@ -0,0 +1,39 @@
+name:                     Lun
+query:                    api/storage/luns
+object:                   lun
+
+counters:
+  - ^^uuid                                => uuid
+  - ^location.volume.name                 => volume
+  - ^name                                 => path
+  - ^statistics.status                    => status
+  - ^svm.name                             => svm
+  - statistics.iops_raw.other             => other_ops
+  - statistics.iops_raw.read              => read_ops
+  - statistics.iops_raw.total             => total_ops
+  - statistics.iops_raw.write             => write_ops
+  - statistics.latency_raw.other          => other_latency
+  - statistics.latency_raw.read           => avg_read_latency
+  - statistics.latency_raw.total          => total_latency
+  - statistics.latency_raw.write          => avg_write_latency
+  - statistics.throughput_raw.other       => other_data
+  - statistics.throughput_raw.read        => read_data
+  - statistics.throughput_raw.total       => total_data
+  - statistics.throughput_raw.write       => write_data
+  - statistics.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics
+  - filter:
+      - statistics.timestamp=!"-"
+
+plugins:
+  LabelAgent:
+    split_regex:
+      - path `^/[^/]+/([^/]+)(?:/.*?|)/([^/]+)$` volume,lun
+      - path `^([^/]+)$` lun
+
+export_options:
+  instance_keys:
+    - lun
+    - svm
+    - volume
\ No newline at end of file
diff --git a/conf/keyperf/9.15.0/namespace.yaml b/conf/keyperf/9.15.0/namespace.yaml
new file mode 100644
index 000000000..02b176123
--- /dev/null
+++ b/conf/keyperf/9.15.0/namespace.yaml
@@ -0,0 +1,37 @@
+name:                     Namespace
+query:                    api/storage/namespaces
+object:                   namespace
+
+counters:
+  - ^^uuid                                => uuid
+  - ^name                                 => path
+  - ^statistics.status                    => status
+  - ^svm.name                             => svm
+  - statistics.iops_raw.other             => other_ops
+  - statistics.iops_raw.read              => read_ops
+  - statistics.iops_raw.total             => total_ops
+  - statistics.iops_raw.write             => write_ops
+  - statistics.latency_raw.other          => avg_other_latency
+  - statistics.latency_raw.read           => avg_read_latency
+  - statistics.latency_raw.total          => avg_total_latency
+  - statistics.latency_raw.write          => avg_write_latency
+  - statistics.throughput_raw.read        => read_data
+  - statistics.throughput_raw.total       => total_data
+  - statistics.throughput_raw.write       => write_data
+  - statistics.timestamp(timestamp)       => timestamp
+  - hidden_fields:
+      - statistics
+  - filter:
+      - statistics.timestamp=!"-"
+
+plugins:
+  LabelAgent:
+    split:
+      - path `/` ,,volume,namespace
+
+export_options:
+  instance_keys:
+    - namespace
+    - path
+    - svm
+    - volume
\ No newline at end of file
diff --git a/conf/keyperf/default.yaml b/conf/keyperf/default.yaml
index 75145fa96..0d970530c 100644
--- a/conf/keyperf/default.yaml
+++ b/conf/keyperf/default.yaml
@@ -11,6 +11,8 @@ objects:
   Cluster:                     cluster.yaml
   FlexCache:                   flexcache.yaml
   LIF:                         lif.yaml
+  Lun:                         lun.yaml
+  Namespace:                   namespace.yaml
   NFSv3:                       nfsv3.yaml
   NFSv41:                      nfsv4_1.yaml
   NFSv4:                       nfsv4.yaml