diff --git a/ignite/metadata.csv b/ignite/metadata.csv
index d6ea4e591f159..1a249251f3422 100644
--- a/ignite/metadata.csv
+++ b/ignite/metadata.csv
@@ -2,8 +2,8 @@ metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation
 ignite.threads.active,gauge,10,thread,,Approximate number of threads that are actively executing tasks.,0,ignite,
 ignite.threads.pool_size,gauge,10,thread,,Current number of threads in the pool.,0,ignite,
 ignite.threads.largest_size,gauge,10,thread,,Largest number of threads that have ever simultaneously been in the pool.,0,ignite,
-ignite.threads.tasks,gauge,10,task,,Approximate total number of tasks that have been scheduled for execution.,0,ignite,
-ignite.threads.completed_tasks,gauge,10,task,,Approximate total number of tasks that have completed execution.,0,ignite,
+ignite.threads.tasks,count,10,task,,Approximate total number of tasks that have been scheduled for execution.,0,ignite,
+ignite.threads.completed_tasks,count,10,task,,Approximate total number of tasks that have completed execution.,0,ignite,
 ignite.threads.queue_size,gauge,10,thread,,Current number of threads in the pool,0,ignite,
 ignite.threads.core_pool_size,gauge,10,thread,,The core number of threads.,0,ignite,
 ignite.threads.maximum_pool_size,gauge,10,thread,,The maximum allowed number of threads.,0,ignite,
@@ -11,7 +11,7 @@ ignite.allocation_rate,gauge,10,page,second,Allocation rate (pages per second) a
 ignite.initial_memory_size,gauge,10,byte,,Initial memory region size defined by its data region.,0,ignite,
 ignite.max_memory_size,gauge,10,byte,,Maximum memory region size defined by its data region.,0,ignite,
 ignite.offheap_size,gauge,10,byte,,Offheap size in bytes.,0,ignite,
-ignite.total_allocated_pages,gauge,10,page,,Total number of allocated pages.,0,ignite,
+ignite.total_allocated_pages,count,10,page,,Total number of allocated pages.,0,ignite,
 ignite.eviction_rate,gauge,10,page,second,Eviction rate (pages per second).,0,ignite,
 ignite.large_entries_pages_percentage,gauge,10,percent,,Percentage of pages that are fully occupied by large entries that go beyond page size.,0,ignite,
 ignite.pages_fill_factor,gauge,10,percent,,The percentage of the used space.,0,ignite,
@@ -19,22 +19,22 @@ ignite.dirty_pages,gauge,10,page,,Number of pages in memory not yet synchronized
 ignite.pages_replace_rate,gauge,10,page,second,Rate at which pages in memory are replaced with pages from persistent storage (pages per second).,0,ignite,
 ignite.physical_memory_pages,gauge,10,page,,Number of pages residing in physical RAM.,0,ignite,
 ignite.pages_replace_age,gauge,10,page,,Average age at which pages in memory are replaced with pages from persistent storage (milliseconds).,0,ignite,
-ignite.pages_read,gauge,10,page,,Number of pages read from last restart.,0,ignite,
-ignite.pages_written,gauge,10,page,,Number of pages written from last restart.,0,ignite,
-ignite.pages_replaced,gauge,10,page,,Number of pages replaced from last restart.,0,ignite,
+ignite.pages_read,count,10,page,,Number of pages read from last restart.,0,ignite,
+ignite.pages_written,count,10,page,,Number of pages written from last restart.,0,ignite,
+ignite.pages_replaced,count,10,page,,Number of pages replaced from last restart.,0,ignite,
 ignite.offheap_used_size,gauge,10,byte,,Total used offheap size in bytes.,0,ignite,
-ignite.total_allocated_size,gauge,10,byte,,Total size of memory allocated in bytes.,0,ignite,
+ignite.total_allocated_size,count,10,byte,,Total size of memory allocated in bytes.,0,ignite,
 ignite.used_checkpoint_buffer_pages,gauge,10,page,,Used checkpoint buffer size in pages.,0,ignite,
 ignite.used_checkpoint_buffer_size,gauge,10,byte,,Used checkpoint buffer size in bytes.,0,ignite,
 ignite.check_point_buffer_size,gauge,10,byte,,Total size in bytes for checkpoint buffer.,0,ignite,
-ignite.total_started_threads,gauge,10,thread,,The total number of threads started.,0,ignite,
+ignite.total_started_threads,count,10,thread,,The total number of threads started.,0,ignite,
 ignite.heap_memory_initialized,gauge,10,byte,,The initial size of memory in bytes; -1 if undefined.,0,ignite,
 ignite.heap_memory_maximum,gauge,10,byte,,The maximum amount of memory in bytes; -1 if undefined.,0,ignite,
-ignite.received_bytes,gauge,10,byte,,Received bytes count.,0,ignite,
+ignite.received_bytes,count,10,byte,,Received bytes count.,0,ignite,
 ignite.oubound_messages_queue_size,gauge,10,message,,Outbound messages queue size.,0,ignite,
-ignite.sent_messages,gauge,10,message,,Sent messages count.,0,ignite,
-ignite.sent_bytes,gauge,10,byte,,Sent bytes count.,0,ignite,
-ignite.received_messages,gauge,10,message,,Received messages count.,0,ignite,
+ignite.sent_messages,count,10,message,,Sent messages count.,0,ignite,
+ignite.sent_bytes,count,10,byte,,Sent bytes count.,0,ignite,
+ignite.received_messages,count,10,message,,Received messages count.,0,ignite,
 ignite.total_cpus,gauge,10,core,,The number of CPUs available to the Java Virtual Machine.,0,ignite,
 ignite.non_heap_memory_initialized,gauge,10,byte,,The initial size of non-heap memory in bytes; -1 if undefined.,0,ignite,
 ignite.non_heap_memory_used,gauge,10,byte,,Current non-heap memory size that is used by Java VM.,0,ignite,
@@ -55,20 +55,20 @@ ignite.jobs.waiting.average,gauge,10,job,,Average number of waiting jobs this no
 ignite.jobs.rejected.maximum,gauge,10,job,,Maximum number of jobs rejected at once during a single collision resolution operation.,0,ignite,
 ignite.jobs.rejected.current,gauge,10,job,,Number of jobs rejected after more recent collision resolution operation.,0,ignite,
 ignite.jobs.rejected.average,gauge,10,job,,Average number of jobs this node rejects during collision resolution operations.,0,ignite,
-ignite.jobs.rejected.total,gauge,10,job,,Total number of jobs this node rejects during collision resolution operations since node startup.,0,ignite,
+ignite.jobs.rejected.total,count,10,job,,Total number of jobs this node rejects during collision resolution operations since node startup.,0,ignite,
 ignite.jobs.cancelled.maximum,gauge,10,job,,Maximum number of cancelled jobs this node ever had running concurrently.,0,ignite,
 ignite.jobs.cancelled.current,gauge,10,job,,Number of cancelled jobs that are still running.,0,ignite,
 ignite.jobs.cancelled.average,gauge,10,job,,Average number of cancelled jobs this node ever had running concurrently.,0,ignite,
-ignite.jobs.cancelled.total,gauge,10,job,,Total number of cancelled jobs since node startup.,0,ignite,
-ignite.jobs.executed.total,gauge,10,job,,Total number of jobs handled by the node.,0,ignite,
-ignite.jobs.execution_time.total,gauge,10,second,,Total time all finished jobs takes to execute on the node.,0,ignite,
+ignite.jobs.cancelled.total,count,10,job,,Total number of cancelled jobs since node startup.,0,ignite,
+ignite.jobs.executed.total,count,10,job,,Total number of jobs handled by the node.,0,ignite,
+ignite.jobs.execution_time.total,count,10,second,,Total time all finished jobs takes to execute on the node.,0,ignite,
 ignite.jobs.wait_time.maximum,gauge,10,second,,Maximum time a job ever spent waiting in a queue to be executed.,-1,ignite,
 ignite.jobs.wait_time.current,gauge,10,second,,Current wait time of oldest job.,-1,ignite,
 ignite.jobs.wait_time.average,gauge,10,second,,Average time jobs spend waiting in the queue to be executed.,-1,ignite,
 ignite.jobs.execute_time.maximum,gauge,10,second,,Time it took to execute the longest job on the node.,0,ignite,
 ignite.jobs.execute_time.current,gauge,10,second,,Longest time a current job has been executing for.,0,ignite,
 ignite.jobs.execute_time.average,gauge,10,second,,Average time a job takes to execute on the node.,0,ignite,
-ignite.total_executed_tasks,gauge,10,task,,Total number of tasks handled by the node.,0,ignite,
+ignite.total_executed_tasks,count,10,task,,Total number of tasks handled by the node.,0,ignite,
 ignite.total_busy_time,gauge,10,second,,Total time this node spent executing jobs.,0,ignite,
 ignite.total_idle_time,gauge,10,second,,Total time this node spent idling (not executing any jobs).,0,ignite,
 ignite.current_idle_time,gauge,10,second,,Time this node spend idling since executing last job.,0,ignite,
@@ -84,9 +84,9 @@ ignite.active_baseline_nodes,gauge,10,node,,Active baseline nodes count.,0,ignit
 ignite.total_server_nodes,gauge,10,node,,Server nodes count.,0,ignite,
 ignite.total_client_nodes,gauge,10,node,,Client nodes count.,0,ignite,
 ignite.jobs.maximum_failover,gauge,10,attempt,,Maximum number of attempts to execute a failed job on another node.,0,ignite,
-ignite.jobs.total_failover,gauge,10,job,,Total number of jobs that were failed over.,0,ignite,
-ignite.transaction.committed,gauge,10,transaction,,The number of transactions which were committed.,0,ignite,
-ignite.transaction.rolledback,gauge,10,transaction,,The number of transactions which were rollback.,0,ignite,
+ignite.jobs.total_failover,count,10,job,,Total number of jobs that were failed over.,0,ignite,
+ignite.transaction.committed,count,10,transaction,,The number of transactions which were committed.,0,ignite,
+ignite.transaction.rolledback,count,10,transaction,,The number of transactions which were rollback.,0,ignite,
 ignite.transaction.holding_lock,gauge,10,transaction,,The number of active transactions holding at least one key lock.,0,ignite,
 ignite.transaction.locked_keys,gauge,10,key,,The number of keys locked on the node.,0,ignite,
 ignite.transaction.owner,gauge,10,transaction,,The number of active transactions for which this node is the initiator.,0,ignite,
@@ -107,15 +107,15 @@ ignite.checkpoint.last_copied_on_write_pages,gauge,10,page,,Number of pages copi
 ignite.checkpoint.last_duration,gauge,10,second,,Duration of the last checkpoint in milliseconds.,0,ignite,
 ignite.checkpoint.total_time,gauge,10,second,,Total checkpoint time from last restart.,0,ignite,
 ignite.discovery.message_worker_queue_size,gauge,10,,,Message worker queue current size.,0,ignite,
-ignite.discovery.nodes_joined,gauge,10,node,,Nodes joined count.,0,ignite,
-ignite.discovery.nodes_left,gauge,10,node,,Nodes left count.,0,ignite,
-ignite.discovery.nodes_failed,gauge,10,node,,Nodes failed count.,0,ignite,
+ignite.discovery.nodes_joined,count,10,node,,Nodes joined count.,0,ignite,
+ignite.discovery.nodes_left,count,10,node,,Nodes left count.,0,ignite,
+ignite.discovery.nodes_failed,count,10,node,,Nodes failed count.,0,ignite,
 ignite.discovery.pending_messages_registered,gauge,10,message,,Pending messages registered.,0,ignite,
 ignite.discovery.pending_messages_discarded,gauge,10,message,,Pending messages discarded.,0,ignite,
 ignite.discovery.average_message_processing_time,gauge,10,second,,Avg message processing time.,0,ignite,
 ignite.discovery.max_message_processing_time,gauge,10,second,,Max message processing time.,0,ignite,
-ignite.discovery.total_received_messages,gauge,10,message,,Total received messages count.,0,ignite,
-ignite.discovery.total_processed_messages,gauge,10,message,,Total processed messages count.,0,ignite,
+ignite.discovery.total_received_messages,count,10,message,,Total received messages count.,0,ignite,
+ignite.discovery.total_processed_messages,count,10,message,,Total processed messages count.,0,ignite,
 ignite.cache.cluster_moving_partitions,gauge,10,,,Count of partitions for this cache group in the entire cluster with state MOVING.,0,ignite,
 ignite.cache.minimum_partition_copies,gauge,10,,,Minimum number of partition copies for all partitions of this cache group.,0,ignite,
 ignite.cache.maximum_partition_copies,gauge,10,,,Maximum number of partition copies for all partitions of this cache group.,0,ignite,
@@ -127,29 +127,29 @@ ignite.cache.cluster_owning_partitions,gauge,10,,,Count of partitions for this c
 ignite.cache.backups,gauge,10,,,Count of backups configured for cache group.,0,ignite,
 ignite.cache.partitions,gauge,10,,,Count of partitions for cache group.,0,ignite,
 ignite.cache.size,gauge,10,,,Number of non-null values in the cache as a long value.,0,ignite,
-ignite.cache.gets,gauge,10,request,,The total number of gets to the cache.,0,ignite,
-ignite.cache.removals,gauge,10,,,The total number of removals from the cache.,0,ignite,
-ignite.cache.puts,gauge,10,request,,The total number of puts to the cache.,0,ignite,
-ignite.cache.hits,gauge,10,request,,The number of get requests that were satisfied by the cache.,0,ignite,
-ignite.cache.misses,gauge,10,request,,A miss is a get request that is not satisfied.,0,ignite,
+ignite.cache.gets,count,10,request,,The total number of gets to the cache.,0,ignite,
+ignite.cache.removals,count,10,,,The total number of removals from the cache.,0,ignite,
+ignite.cache.puts,count,10,request,,The total number of puts to the cache.,0,ignite,
+ignite.cache.hits,count,10,request,,The number of get requests that were satisfied by the cache.,0,ignite,
+ignite.cache.misses,count,10,request,,A miss is a get request that is not satisfied.,0,ignite,
 ignite.cache.offheap_allocated_size,gauge,10,byte,,Memory size allocated in off-heap.,0,ignite,
 ignite.cache.hit_percentage,gauge,10,percent,,Percentage of successful hits.,0,ignite,
 ignite.cache.miss_percentage,gauge,10,percent,,Percentage of accesses that failed to find anything.,0,ignite,
-ignite.cache.evictions,gauge,10,eviction,,Number of eviction entries.,0,ignite,
+ignite.cache.evictions,count,10,eviction,,Number of eviction entries.,0,ignite,
 ignite.cache.average_get_time,gauge,10,second,,Average time to execute get.,-1,ignite,
 ignite.cache.average_put_time,gauge,10,second,,Average time to execute put.,-1,ignite,
 ignite.cache.average_remove_time,gauge,10,second,,Average time to execute remove.,1,ignite,
 ignite.cache.average_commit_time,gauge,10,second,,Average time to commit transaction.,-1,ignite,
 ignite.cache.average_rollback_time,gauge,10,second,,Average time to rollback transaction.,1,ignite,
-ignite.cache.commits,gauge,10,,,Number of transaction commits.,0,ignite,
-ignite.cache.rollbacks,gauge,10,,,Number of transaction rollback.,0,ignite,
-ignite.cache.offheap_gets,gauge,10,,,Number of gets from off-heap memory.,0,ignite,
-ignite.cache.offheap_puts,gauge,10,,,Number of puts to off-heap memory.,0,ignite,
-ignite.cache.offheap_removals,gauge,10,,,Number of removed entries from off-heap memory.,0,ignite,
-ignite.cache.offheap_evictions,gauge,10,eviction,,Number of evictions from off-heap memory.,0,ignite,
-ignite.cache.offheap_hits,gauge,10,hit,,Number of hits on off-heap memory.,0,ignite,
+ignite.cache.commits,count,10,,,Number of transaction commits.,0,ignite,
+ignite.cache.rollbacks,count,10,,,Number of transaction rollback.,0,ignite,
+ignite.cache.offheap_gets,count,10,,,Number of gets from off-heap memory.,0,ignite,
+ignite.cache.offheap_puts,count,10,,,Number of puts to off-heap memory.,0,ignite,
+ignite.cache.offheap_removals,count,10,,,Number of removed entries from off-heap memory.,0,ignite,
+ignite.cache.offheap_evictions,count,10,eviction,,Number of evictions from off-heap memory.,0,ignite,
+ignite.cache.offheap_hits,count,10,hit,,Number of hits on off-heap memory.,0,ignite,
 ignite.cache.offheap_hit_percentage,gauge,10,percent,,Percentage of hits on off-heap memory.,0,ignite,
-ignite.cache.offheap_misses,gauge,10,miss,,Number of misses on off-heap memory.,0,ignite,
+ignite.cache.offheap_misses,count,10,miss,,Number of misses on off-heap memory.,0,ignite,
 ignite.cache.offheap_miss_percentage,gauge,10,percent,,Percentage of misses on off-heap memory.,0,ignite,
 ignite.cache.heap_entries,gauge,10,entry,,Number of entries in heap memory.,0,ignite,
 ignite.cache.offheap_entries,gauge,10,entry,,Number of entries stored in off-heap memory.,0,ignite,
@@ -171,17 +171,17 @@ ignite.cache.dht_start_version_counts_size,gauge,10,transaction,,Transaction DHT
 ignite.cache.dht_committed_versions_size,gauge,10,transaction,,Transaction DHT committed ID map size.,0,ignite,
 ignite.cache.dht_rolledback_versions_size,gauge,10,transaction,,Transaction DHT rolled back ID map size.,0,ignite,
 ignite.cache.write_behind_store_batch_size,gauge,10,,,Maximum size of batch for similar operations.,0,ignite,
-ignite.cache.write_behind_overflow_total,gauge,10,event,,Count of cache overflow events since write-behind cache has started.,0,ignite,
+ignite.cache.write_behind_overflow_total,count,10,event,,Count of cache overflow events since write-behind cache has started.,0,ignite,
 ignite.cache.write_behind_overflow,gauge,10,event,,Count of write buffer overflow events in progress at the moment.,0,ignite,
 ignite.cache.write_behind_retries,gauge,10,,,Count of cache entries that are currently in retry state.,0,ignite,
 ignite.cache.write_behind_buffer_size,gauge,10,,,Count of cache entries that are waiting to be flushed.,0,ignite,
-ignite.cache.entry_processor.puts,gauge,10,,,"The total number of cache invocations, caused update.",0,ignite,
-ignite.cache.entry_processor.removals,gauge,10,,,"The total number of cache invocations, caused removals.",0,ignite,
-ignite.cache.entry_processor.read_only_invocations,gauge,10,,,"The total number of cache invocations, caused no updates.",0,ignite,
-ignite.cache.entry_processor.invocations,gauge,10,,,The total number of cache invocations.,0,ignite,
-ignite.cache.entry_processor.hits,gauge,10,,,"The total number of invocations on keys, which exist in cache.",1,ignite,
+ignite.cache.entry_processor.puts,count,10,,,"The total number of cache invocations, caused update.",0,ignite,
+ignite.cache.entry_processor.removals,count,10,,,"The total number of cache invocations, caused removals.",0,ignite,
+ignite.cache.entry_processor.read_only_invocations,count,10,,,"The total number of cache invocations, caused no updates.",0,ignite,
+ignite.cache.entry_processor.invocations,count,10,,,The total number of cache invocations.,0,ignite,
+ignite.cache.entry_processor.hits,count,10,,,"The total number of invocations on keys, which exist in cache.",1,ignite,
 ignite.cache.entry_processor.hit_percentage,gauge,10,percent,,"The percentage of invocations on keys, which exist in cache.",1,ignite,
-ignite.cache.entry_processor.misses,gauge,10,,,"The total number of invocations on keys, which don't exist in cache.",-1,ignite,
+ignite.cache.entry_processor.misses,count,10,,,"The total number of invocations on keys, which don't exist in cache.",-1,ignite,
 ignite.cache.entry_processor.miss_percentage,gauge,10,percent,,"The percentage of invocations on keys, which don't exist in cache.",-1,ignite,
 ignite.cache.entry_processor.average_invocation_time,gauge,10,second,,The mean time to execute cache invokes.,-1,ignite,
 ignite.cache.entry_processor.minimum_invocation_time,gauge,10,second,,"So far, the minimum time to execute cache invokes.",-1,ignite,