diff --git a/lib/fluent/plugin/in_kubernetes_metrics.rb b/lib/fluent/plugin/in_kubernetes_metrics.rb
index 69b4cae..cc99e90 100644
--- a/lib/fluent/plugin/in_kubernetes_metrics.rb
+++ b/lib/fluent/plugin/in_kubernetes_metrics.rb
@@ -416,14 +416,14 @@ def emit_cpu_metrics_stats(tag:, metrics:, labels:, time:)
       end
 
       def emit_diskio_metrics_stats(tag:, metrics:, labels:, time:)
-        %w[io_service_bytes io_serviced].each do |metric_name|
+        %w[io_service_bytes io_serviced io_queued sectors io_service_time io_wait_time io_merged io_time ].each do |metric_name|
           if current_io_metric = metrics[metric_name]
             current_io_metric.each do |device|
             if diskio_io_service_bytes_major =  device['major']
-               router.emit generate_tag("#{tag}.diskio".concat(metric_name).concat("major")), time, labels.merge('device' => device['device'], 'value' => diskio_io_service_bytes_major)
+               router.emit generate_tag("#{tag}.diskio".concat(metric_name).concat(".major.")), time, labels.merge('device' => device['device'], 'value' => diskio_io_service_bytes_major)
             end
             if diskio_io_service_bytes_minor =  device['minor']
-               router.emit generate_tag("#{tag}.diskio".concat(metric_name).concat("minor")), time, labels.merge('device' => device['device'], 'value' => diskio_io_service_bytes_minor)
+               router.emit generate_tag("#{tag}.diskio".concat(metric_name).concat(".minor.")), time, labels.merge('device' => device['device'], 'value' => diskio_io_service_bytes_minor)
             end
             device_stats = device['stats']
             device_stats.each do | device_stat |
@@ -487,7 +487,9 @@ def emit_filesystem_metrics_stats(tag:, metrics:, labels:, time:)
           type = file_system['type']
           file_system.each do | file_metric |
             file_key , file_value = file_metric
-            router.emit generate_tag("#{tag}.filesystem.".concat(file_key)), time, labels.merge('device' => device, 'type' => type, 'value' => file_value)
+            if not ['device', 'type'].include? file_key
+              router.emit generate_tag("#{tag}.filesystem.".concat(file_key)), time, labels.merge('device' => device, 'type' => type, 'value' => file_value)
+            end
           end
         end
       end