15 files changed, 61 insertions, 76 deletions

diff --git a/src/sensor/sensors/average-ping-rtt b/src/sensor/sensors/average-ping-rtt
index f929b8cf4..7a4b5ca67 100644
--- a/src/sensor/sensors/average-ping-rtt
+++ b/src/sensor/sensors/average-ping-rtt
@@ -24,9 +24,8 @@ EXT_PROCESS = avgping.sh
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 7200
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 300
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 7200
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/core-peers-connected b/src/sensor/sensors/core-peers-connected
index 2ea388b65..51bf7f7d3 100644
--- a/src/sensor/sensors/core-peers-connected
+++ b/src/sensor/sensors/core-peers-connected
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # peers connected
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/datacache-bytes-stored b/src/sensor/sensors/datacache-bytes-stored
index 3ba7e293d..9601f5280 100644
--- a/src/sensor/sensors/datacache-bytes-stored
+++ b/src/sensor/sensors/datacache-bytes-stored
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # bytes stored
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/dht-peers-connected b/src/sensor/sensors/dht-peers-connected
index 21ba05e7c..6e4d448ae 100644
--- a/src/sensor/sensors/dht-peers-connected
+++ b/src/sensor/sensors/dht-peers-connected
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # peers connected
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/fs-peers-connected b/src/sensor/sensors/fs-peers-connected
index 24f4abb9e..1a3cb127b 100644
--- a/src/sensor/sensors/fs-peers-connected
+++ b/src/sensor/sensors/fs-peers-connected
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # peers connected
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/gnunet-version b/src/sensor/sensors/gnunet-version
index ecb71ac59..271b738d4 100644
--- a/src/sensor/sensors/gnunet-version
+++ b/src/sensor/sensors/gnunet-version
@@ -24,9 +24,8 @@ EXT_ARGS = -v
 
 EXPECTED_DATATYPE = string
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 86400
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/known-peers b/src/sensor/sensors/known-peers
index 2ee85b1d6..fda106330 100644
--- a/src/sensor/sensors/known-peers
+++ b/src/sensor/sensors/known-peers
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # peers known
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/nse b/src/sensor/sensors/nse
index 2ba89b9a0..8cede34cb 100644
--- a/src/sensor/sensors/nse
+++ b/src/sensor/sensors/nse
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # nodes in the network (estimate)
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/peerstore-memory b/src/sensor/sensors/peerstore-memory
index 380fe0cec..0a60866ad 100644
--- a/src/sensor/sensors/peerstore-memory
+++ b/src/sensor/sensors/peerstore-memory
@@ -24,9 +24,8 @@ EXT_PROCESS = peerstore-memory.sh
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
-COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-COLLECTION_INTERVAL = 61
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Reporting:
+#COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-bytes-received b/src/sensor/sensors/transport-bytes-received
index b9005b6f3..d247f6572 100644
--- a/src/sensor/sensors/transport-bytes-received
+++ b/src/sensor/sensors/transport-bytes-received
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # bytes total received
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-http-connections b/src/sensor/sensors/transport-http-connections
index 56971d44c..6d8d7d95a 100644
--- a/src/sensor/sensors/transport-http-connections
+++ b/src/sensor/sensors/transport-http-connections
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # HTTP client connections
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-https-connections b/src/sensor/sensors/transport-https-connections
index 028b52bba..44af29b4b 100644
--- a/src/sensor/sensors/transport-https-connections
+++ b/src/sensor/sensors/transport-https-connections
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # HTTPS client connections
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-peers-connected b/src/sensor/sensors/transport-peers-connected
index d7917b631..fd18919ba 100644
--- a/src/sensor/sensors/transport-peers-connected
+++ b/src/sensor/sensors/transport-peers-connected
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # peers connected
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-tcp-bytes-transmitted b/src/sensor/sensors/transport-tcp-bytes-transmitted
index 22194373d..5452d7ac0 100644
--- a/src/sensor/sensors/transport-tcp-bytes-transmitted
+++ b/src/sensor/sensors/transport-tcp-bytes-transmitted
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # bytes transmitted via TCP
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES
diff --git a/src/sensor/sensors/transport-tcp-sessions-active b/src/sensor/sensors/transport-tcp-sessions-active
index fe8527f91..5dd9c6d35 100644
--- a/src/sensor/sensors/transport-tcp-sessions-active
+++ b/src/sensor/sensors/transport-tcp-sessions-active
@@ -24,9 +24,8 @@ GNUNET_STAT_NAME = # TCP sessions active
 
 EXPECTED_DATATYPE = numeric
 
-# Reporting mechanism
+# Reporting:
 #COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL = 
+# Comment or remove next line to disable reporting sensor values to collection point
+#VALUE_COLLECTION_INTERVAL = 120
+REPORT_ANOMALIES = YES