X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Ftypes.db;h=3dcb5e7a4cffc21108b568342fe45e28ef355f9d;hp=ed27b7854fb568a3a347fc2f9330dd23e6cc766b;hb=76a7816d2c066f2feff5c77e7da58df4dbc982c2;hpb=5cf0dd212fd19be57c49fb3f4c073c5706a0fde0

diff --git a/src/types.db b/src/types.db
index ed27b785..3dcb5e7a 100644
--- a/src/types.db
+++ b/src/types.db
@@ -56,12 +56,13 @@ email_check		value:GAUGE:0:U
 email_count		value:GAUGE:0:U
 email_size		value:GAUGE:0:U
 entropy			value:GAUGE:0:4294967295
+evaluations	value:COUNTER:0:U
 fanspeed		value:GAUGE:0:U
 file_size		value:GAUGE:0:U
 files			value:GAUGE:0:U
 fork_rate		value:DERIVE:0:U
-frequency		value:GAUGE:0:U
 frequency_offset	value:GAUGE:-1000000:1000000
+frequency		value:GAUGE:0:U
 fscache_stat		value:DERIVE:0:U
 gauge			value:GAUGE:U:U
 hash_collisions		value:DERIVE:0:U
@@ -109,6 +110,15 @@ node_stat		value:DERIVE:0:U
 node_tx_rate		value:GAUGE:0:127
 operations		value:DERIVE:0:U
 percent			value:GAUGE:0:100.1
+pf_bytes_in	value:COUNTER:0:U
+pf_bytes_out	value:COUNTER:0:U
+pf_counters	value:COUNTER:0:U
+pf_limits	value:COUNTER:0:U
+pf_packets_in	value:COUNTER:0:U
+pf_packets_out	value:COUNTER:0:U
+pf_source	value:COUNTER:0:U
+pf_states	value:GAUGE:0:U
+pf_state	value:COUNTER:0:U
 pg_blks			value:DERIVE:0:U
 pg_db_size		value:GAUGE:0:U
 pg_n_tup_c		value:DERIVE:0:U
@@ -117,8 +127,8 @@ pg_numbackends		value:GAUGE:0:U
 pg_scan			value:DERIVE:0:U
 pg_xact			value:DERIVE:0:U
 ping_droprate		value:GAUGE:0:100
-ping			value:GAUGE:0:65535
 ping_stddev		value:GAUGE:0:65535
+ping			value:GAUGE:0:65535
 players			value:GAUGE:0:1000000
 power			value:GAUGE:0:U
 protocol_counter	value:DERIVE:0:U
@@ -147,6 +157,8 @@ signal_quality		value:GAUGE:0:U
 snr			value:GAUGE:0:U
 spam_check		value:GAUGE:0:U
 spam_score		value:GAUGE:U:U
+states_cur	value:GAUGE:0:U
+states_tot	value:COUNTER:0:U
 swap_io			value:DERIVE:0:U
 swap			value:GAUGE:0:1099511627776
 tcp_connections		value:GAUGE:0:4294967295
@@ -189,3 +201,4 @@ arc_ratio		value:GAUGE:0:U
 arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
 mysql_qcache		hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
 mysql_threads		running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
+>>>>>>> master