diff --git a/simet-api/Makefile.am b/simet-api/Makefile.am index 4c6f15f7..f883389e 100644 --- a/simet-api/Makefile.am +++ b/simet-api/Makefile.am @@ -86,8 +86,6 @@ endif dist_simetlmapbin_SCRIPTS = lmap-tasks/lmap-wrapper.sh lmap-tasks/simet2-agent-info.sh lmap-tasks/lmap-traceroute-wrapper.sh EXTRA_DIST += lmap-tasks/lmap-wrapper.sh.in lmap-tasks/simet2-agent-info.sh.in lmap-tasks/lmap-traceroute-wrapper.sh.in -dist_simetlmapbin_SCRIPTS += lmap-tasks/simet_fping-to-ixbr.sh -EXTRA_DIST += lmap-tasks/simet_fping-to-ixbr.sh.in if SIMETBOX_BUILD dist_simetlmapbin_SCRIPTS += lmap-tasks/simetbox_fping-to-gateway.sh endif diff --git a/simet-api/conf/lmap-sched-template.simet.json b/simet-api/conf/lmap-sched-template.simet.json index 479d3e99..4dd2b13b 100644 --- a/simet-api/conf/lmap-sched-template.simet.json +++ b/simet-api/conf/lmap-sched-template.simet.json @@ -27,23 +27,6 @@ "destination":["ma-local_periodic_report"]} ] }, - { "name":"ma-local_periodic-ixbr-ping", - "tag":["simet.nic.br_ev-period:@PERIODIC_IXBRP_PERIOD@"], - "start":"ma-local_ev-periodic-ixbr-ping", - "execution-mode":"sequential", - "action":[ - {"name":"simet.nic.br_agent-info","task":"simet.nic.br_agent-info", - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_geolocation","task":"simet.nic.br_geolocation", - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_ixbr-ping_ip4","task":"simet.nic.br_fping-to-ixbr", - "option":[{"id":"ixbrpip4","value":"-4"}], - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_ixbr-ping_ip6","task":"simet.nic.br_fping-to-ixbr", - "option":[{"id":"ixbrpip6","value":"-6"}], - "destination":["ma-local_periodic_report"]} - ] - }, { "name":"ma-local_default-periodic-test-run", "tag":["simet.nic.br_ev-period:@PERIODIC_TEST_PERIOD@"], "start":"ma-local_ev-default-periodic-test-run", @@ -76,12 +59,6 @@ "month":["*"],"day-of-month":["*"],"day-of-week":["*"], "hour":[@PERIODIC_SPOOFER_HOURS@],"minute":[@PERIODIC_SPOOFER_MINUTES@],"second":[0] }}, - { "name":"ma-local_ev-periodic-ixbr-ping", - "random-spread":@PERIODIC_IXBRP_SPREAD@, - "calendar":{ - "month":["*"],"day-of-month":["*"],"day-of-week":["*"], - "hour":[@PERIODIC_IXBRP_HOURS@],"minute":[@PERIODIC_IXBRP_MINUTES@],"second":[0] - }}, { "name":"immediate","immediate":[null] }, { "name":"startup-delayed","random-spread":300,"startup":[null] }, { "name":"every-minute","random-spread":5,"periodic":{"interval":60} }, diff --git a/simet-api/conf/lmap-sched-template.simetbox.json b/simet-api/conf/lmap-sched-template.simetbox.json index 39b507ef..cf1f49d3 100644 --- a/simet-api/conf/lmap-sched-template.simetbox.json +++ b/simet-api/conf/lmap-sched-template.simetbox.json @@ -46,23 +46,6 @@ "destination":["ma-local_periodic_report"]} ] }, - { "name":"ma-local_periodic-ixbr-ping", - "tag":["simet.nic.br_ev-period:@PERIODIC_IXBRP_PERIOD@"], - "start":"ma-local_ev-periodic-ixbr-ping", - "execution-mode":"sequential", - "action":[ - {"name":"simet.nic.br_agent-info","task":"simet.nic.br_agent-info", - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_geolocation","task":"simet.nic.br_geolocation", - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_ixbr-ping_ip4","task":"simet.nic.br_fping-to-ixbr", - "option":[{"id":"ixbrpip4","value":"-4"}], - "destination":["ma-local_periodic_report"]}, - {"name":"simet.nic.br_ixbr-ping_ip6","task":"simet.nic.br_fping-to-ixbr", - "option":[{"id":"ixbrpip6","value":"-6"}], - "destination":["ma-local_periodic_report"]} - ] - }, { "name":"ma-local_periodic-gateway-ping", "tag":["simet.nic.br_ev-period:@PERIODIC_GWP_PERIOD@"], "start":"ma-local_ev-periodic-gateway-ping", @@ -97,12 +80,6 @@ "month":["*"],"day-of-month":["*"],"day-of-week":["*"], "hour":[@PERIODIC_TEST_HOURS@],"minute":[@PERIODIC_TEST_MINUTES@],"second":[0] }}, - { "name":"ma-local_ev-periodic-ixbr-ping", - "random-spread":@PERIODIC_IXBRP_SPREAD@, - "calendar":{ - "month":["*"],"day-of-month":["*"],"day-of-week":["*"], - "hour":[@PERIODIC_IXBRP_HOURS@],"minute":[@PERIODIC_IXBRP_MINUTES@],"second":[0] - }}, { "name":"ma-local_ev-periodic-spoofer", "random-spread":@PERIODIC_SPOOFER_SPREAD@, "calendar":{ diff --git a/simet-api/config.d/simet-ma_base-config.json.in b/simet-api/config.d/simet-ma_base-config.json.in index 0ac5d9e8..4e694480 100644 --- a/simet-api/config.d/simet-ma_base-config.json.in +++ b/simet-api/config.d/simet-ma_base-config.json.in @@ -50,11 +50,6 @@ "simet.nic.br_engine-version:@PACKAGEVERSION@", "simet.nic.br_task-version:@PACKAGEVERSION@" ], "program":"@BINDIR@/simet_spoofer.sh" }, - { "name":"simet.nic.br_fping-to-ixbr", - "tag":["simet.nic.br_engine-name:@SIMET_ENGINE_NAME@", - "simet.nic.br_engine-version:@PACKAGEVERSION@", - "simet.nic.br_task-version:@PACKAGEVERSION@" ], - "program":"@LMAPBINDIR@/simet_fping-to-ixbr.sh" }, { "name":"simet.nic.br_nop", "program":"/bin/true", "tag":["simet.nic.br_engine-name:@SIMET_ENGINE_NAME@", "simet.nic.br_engine-version:@PACKAGEVERSION@", diff --git a/simet-api/lmap-tasks/simet_fping-to-ixbr.sh.in b/simet-api/lmap-tasks/simet_fping-to-ixbr.sh.in deleted file mode 100755 index 1def99e8..00000000 --- a/simet-api/lmap-tasks/simet_fping-to-ixbr.sh.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# SIMET LMAP fping-to-IX.br measurement -# Copyright (c) 2020 NIC.br -# Distributed under the GPLv3+ license with additional terms and permissions - -METRIC=fping-to-IXbr-raw -FPTARGET=ix-all-peers.simet.nic.br -FPING_OPTIONS="-Adam" - -usage() { - printf '%s\n' "usage: $0 -4|-6 [-c ]" - exit 2 -} - -ipf= -count=3 -while [ $# -gt 0 ] ; do - case "$1" in - "-4"|"-6") - ipf="$1" - ;; - "-c") - shift - count="$1" - [ "$count" -ge 1 ] 2>/dev/null \ - && [ "$count" -le 10 ] 2>/dev/null \ - || usage - ;; - *) - usage - ;; - esac - shift -done -[ -z "$ipf" ] && usage - -exec "@BINDIR@/simet_lmap-stdout-wrapper.sh" exec21ok "fping" "-v" "$METRIC" $FPING_OPTIONS "$ipf" -C "$count" $FPTARGET diff --git a/simet-api/registry.d/simet-ma_base-registry.json.in b/simet-api/registry.d/simet-ma_base-registry.json.in index 7fb4a347..e4a35b42 100644 --- a/simet-api/registry.d/simet-ma_base-registry.json.in +++ b/simet-api/registry.d/simet-ma_base-registry.json.in @@ -9,7 +9,6 @@ { "name":"simet.nic.br_twampc","version":"@PACKAGEVERSION@","program":"@BINDIR@/twampc" }, { "name":"simet.nic.br_internet-availability","version":"@PACKAGEVERSION@","program":"@BINDIR@/inetupc" }, { "name":"simet.nic.br_spoofer","version":"@PACKAGEVERSION@","program":"@BINDIR@/simet_spoofer.sh" }, - { "name":"simet.nic.br_fping-to-ixbr","version":"@PACKAGEVERSION@","program":"@LMAPBINDIR@/simet_fping-to-ixbr.sh" }, { "name":"simet.nic.br_report","version":"@PACKAGEVERSION@","program":"@BINDIR@/simet_lmap-send-report.sh" }, { "name":"simet.nic.br_report-queue-flush","version":"@PACKAGEVERSION@","program":"@BINDIR@/simet_report-queue-flush.sh" }, { "name":"simet.nic.br_nop","version":"@PACKAGEVERSION@","program":"/bin/true" },