Procházet zdrojové kódy

removing nts-ke and auth-ntp tracking

Josef Straßl před 1 měsícem
rodič
revize
01715fc6ed
1 změnil soubory, kde provedl 3 přidání a 28 odebrání
  1. 3 28
      chrony-network-stats.sh

+ 3 - 28
chrony-network-stats.sh

@@ -239,9 +239,6 @@ extract_chronyc_values() {
     CMD_RECV=$(get_stat "Command packets received")
     CMD_DROP=$(get_stat "Command packets dropped")
     LOG_DROP=$(get_stat "Client log records dropped")
-    NTS_KE_ACC=$(get_stat "NTS-KE connections accepted")
-    NTS_KE_DROP=$(get_stat "NTS-KE connections dropped")
-    AUTH_PKTS=$(get_stat "Authenticated NTP packets")
     INTERLEAVED=$(get_stat "Interleaved NTP packets")
     TS_HELD=$(get_stat "NTP timestamps held")
 }
@@ -254,8 +251,7 @@ create_rrd_database() {
             DS:delay:GAUGE:600:U:U DS:dispersion:GAUGE:600:U:U DS:stratum:GAUGE:600:0:16 \
 	    DS:systime:GAUGE:600:U:U \
             DS:pkts_recv:COUNTER:600:0:U DS:pkts_drop:COUNTER:600:0:U DS:cmd_recv:COUNTER:600:0:U \
-            DS:cmd_drop:COUNTER:600:0:U DS:log_drop:COUNTER:600:0:U DS:nts_ke_acc:COUNTER:600:0:U \
-            DS:nts_ke_drop:COUNTER:600:0:U DS:auth_pkts:COUNTER:600:0:U DS:interleaved:COUNTER:600:0:U \
+            DS:cmd_drop:COUNTER:600:0:U DS:log_drop:COUNTER:600:0:U DS:interleaved:COUNTER:600:0:U \
             DS:ts_held:GAUGE:600:0:U \
             RRA:AVERAGE:0.5:1:576 RRA:AVERAGE:0.5:6:672 RRA:AVERAGE:0.5:24:732 RRA:AVERAGE:0.5:288:730 \
             RRA:MAX:0.5:1:576 RRA:MAX:0.5:6:672 RRA:MAX:0.5:24:732 RRA:MAX:0.5:288:730 \
@@ -268,7 +264,7 @@ create_rrd_database() {
 
 update_rrd_database() {
     log_message "INFO" "Updating RRD database..."
-    UPDATE_STRING="N:$OFFSET:$FREQ:$RESID_FREQ:$SKEW:$DELAY:$DISPERSION:$STRATUM:$SYSTIME:$PKTS_RECV:$PKTS_DROP:$CMD_RECV:$CMD_DROP:$LOG_DROP:$NTS_KE_ACC:$NTS_KE_DROP:$AUTH_PKTS:$INTERLEAVED:$TS_HELD"
+    UPDATE_STRING="N:$OFFSET:$FREQ:$RESID_FREQ:$SKEW:$DELAY:$DISPERSION:$STRATUM:$SYSTIME:$PKTS_RECV:$PKTS_DROP:$CMD_RECV:$CMD_DROP:$LOG_DROP:$INTERLEAVED:$TS_HELD"
     LC_ALL=C rrdtool update "$RRD_FILE" "$UPDATE_STRING" || {
         log_message "ERROR" "Failed to update RRD database"
         exit 1
@@ -299,17 +295,11 @@ generate_graphs() {
             DEF:cmd_recv_raw='$RRD_FILE':cmd_recv:AVERAGE \
             DEF:cmd_drop_raw='$RRD_FILE':cmd_drop:AVERAGE \
             DEF:log_drop_raw='$RRD_FILE':log_drop:AVERAGE \
-            DEF:nts_ke_acc_raw='$RRD_FILE':nts_ke_acc:AVERAGE \
-            DEF:nts_ke_drop_raw='$RRD_FILE':nts_ke_drop:AVERAGE \
-            DEF:auth_pkts_raw='$RRD_FILE':auth_pkts:AVERAGE \
             CDEF:pkts_recv=pkts_recv_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,pkts_recv_raw,IF \
             CDEF:pkts_drop=pkts_drop_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,pkts_drop_raw,IF \
             CDEF:cmd_recv=cmd_recv_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,cmd_recv_raw,IF \
             CDEF:cmd_drop=cmd_drop_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,cmd_drop_raw,IF \
             CDEF:log_drop=log_drop_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,log_drop_raw,IF \
-            CDEF:nts_ke_acc=nts_ke_acc_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,nts_ke_acc_raw,IF \
-            CDEF:nts_ke_drop=nts_ke_drop_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,nts_ke_drop_raw,IF \
-            CDEF:auth_pkts=auth_pkts_raw,$SERVER_STATS_UPPER_LIMIT,GT,UNKN,auth_pkts_raw,IF \
             'COMMENT: \l' \
             'AREA:pkts_recv#C4FFC4:Packets received            ' \
             'LINE1:pkts_recv#00E000:' \
@@ -336,22 +326,7 @@ generate_graphs() {
             'GPRINT:log_drop:LAST:Cur\: %5.2lf%s' \
             'GPRINT:log_drop:MIN:Min\: %5.2lf%s' \
             'GPRINT:log_drop:AVERAGE:Avg\: %5.2lf%s' \
-            'GPRINT:log_drop:MAX:Max\: %5.2lf%s\l' \
-            'LINE1:nts_ke_acc#8A2BE2:NTS-KE connections accepted ' \
-            'GPRINT:nts_ke_acc:LAST:Cur\: %5.2lf%s' \
-            'GPRINT:nts_ke_acc:MIN:Min\: %5.2lf%s' \
-            'GPRINT:nts_ke_acc:AVERAGE:Avg\: %5.2lf%s' \
-            'GPRINT:nts_ke_acc:MAX:Max\: %5.2lf%s\l' \
-            'LINE1:nts_ke_drop#9370DB:NTS-KE connections dropped  ' \
-            'GPRINT:nts_ke_drop:LAST:Cur\: %5.2lf%s' \
-            'GPRINT:nts_ke_drop:MIN:Min\: %5.2lf%s' \
-            'GPRINT:nts_ke_drop:AVERAGE:Avg\: %5.2lf%s' \
-            'GPRINT:nts_ke_drop:MAX:Max\: %5.2lf%s\l' \
-            'LINE1:auth_pkts#FF0000:Authenticated NTP packets   ' \
-            'GPRINT:auth_pkts:LAST:Cur\: %5.2lf%s' \
-            'GPRINT:auth_pkts:MIN:Min\: %5.2lf%s' \
-            'GPRINT:auth_pkts:AVERAGE:Avg\: %5.2lf%s' \
-            'GPRINT:auth_pkts:MAX:Max\: %5.2lf%s\l'"
+            'GPRINT:log_drop:MAX:Max\: %5.2lf%s\l'"
         ["chrony_tracking"]="--title 'Chrony Dispersion + Stratum - PERIOD_TITLE' --vertical-label 'milliseconds' --alt-autoscale \
             --units-exponent 0 \
             DEF:stratum='$RRD_FILE':stratum:AVERAGE \