Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/runtime/nagios/ixp-manager-check-core-bundles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if [ -z "${APIKEY}" ] || [ -z "${ID}" ]; then
usage
fi

STATUS="$( wget -O - -q "${URL}/api/v4/switch/${ID}/core-bundles-status?apikey=${APIKEY}" )"
STATUS="$( wget -O - -q "${URL}/admin/api/v4/switch/${ID}/core-bundles-status?apikey=${APIKEY}" )"

if [ $? -ne 0 ] || [ -z "$STATUS" ]; then
echo Could not query core bundle status via API
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/nagios/ixp-manager-check-switch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if [ -z "${APIKEY}" ] || [ -z "${ID}" ]; then
fi


STATUS="$( wget -O - -q "${URL}/api/v4/switch/${ID}/status?apikey=${APIKEY}" )"
STATUS="$( wget -O - -q "${URL}/admin/api/v4/switch/${ID}/status?apikey=${APIKEY}" )"

if [ $? -ne 0 ] || [ -z "$STATUS" ]; then
echo Could not query switch status via API
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/nagios/nagios-global-vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
## SET THE FOLLOWING VARIABLES APPROPRIATELY

KEY="your-ixp-manager-apikey-here"
URL="https://www.example.com/ixp/api/v4/nagios"
URL="https://www.example.com/ixp/admin/api/v4/nagios"

# where to store the Nagios host/service configuration files:
CONFPATH="/usr/local/etc/nagios/conf.d"
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/nagios/update-nagios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


KEY="your-ixp-manager-apikey-here"
URL="https://ixp.example.com/api/v4/nagios"
URL="https://ixp.example.com/admin/api/v4/nagios"

# where to store the Nagios host/service configuration files:
CONFPATH="/etc/nagios/conf.d"
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/route-servers/nagios-check-last-updated.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// variables - you need to change these!
$key="your-api-key";
$url="https://ixp.example.com/api/v4/router/updated";
$url="https://ixp.example.com/admin/api/v4/router/updated";
$threshold=86400;

// is curl available?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// variables - you need to change these!
$key="your-api-key";
$url="https://ixp.example.com/api/v4/router/locked-longer-than";
$url="https://ixp.example.com/admin/api/v4/router/locked-longer-than";
$threshold=7200;

// is curl available?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ ALLOWED_HANDLES="rs1-ipv4 rs1-ipv6"

# --- the following should be fine on a typical Debian / Ubuntu system:

URL_LOCK="${URLROOT}/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/api/v4/router/gen-config"
URL_RELEASE="${URLROOT}/api/v4/router/release-update-lock"
URL_DONE="${URLROOT}/api/v4/router/updated"
URL_LOCK="${URLROOT}/admin/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/admin/api/v4/router/gen-config"
URL_RELEASE="${URLROOT}/admin/api/v4/router/release-update-lock"
URL_DONE="${URLROOT}/admin/api/v4/router/updated"

BIRDBIN="/usr/sbin/bird"
ETCPATH="/usr/local/etc/bird"
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/smokeping/update-smokeping.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# See: https://docs.ixpmanager.org/latest/grapher/smokeping/

KEY="my-ixp-manager-api-key"
URL="https://ixp.example.com/api/v4/grapher/config?backend=smokeping"
URL="https://ixp.example.com/admin/api/v4/grapher/config?backend=smokeping"
ETCPATH="/etc/smokeping"
SMOKEPING="/usr/bin/smokeping"
SMOKEPING_RELOAD="/etc/rc.d/smokeping reload"
Expand Down
2 changes: 1 addition & 1 deletion tools/runtime/tacacs/update-tacacs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
DEST="/usr/local/etc/tac_plus.conf"

KEY="your-ixp-manager-api-key"
URL="https://ixp.example.com/api/v4/user/formatted"
URL="https://ixp.example.com/admin/api/v4/user/formatted"
USERS="alice,joe,mike,mary"

# paths to utilities / init.d scripts
Expand Down
8 changes: 4 additions & 4 deletions tools/vagrant/scripts/ixpm-reconfigure-routers-bird2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ ALLOWED_HANDLES="as112-vix1-ipv4 as112-vix1-ipv6 as112-vix2-ipv4 as112-vix2-ipv6

# --- the following should be fine on a typical Debian / Ubuntu system:

URL_LOCK="${URLROOT}/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/api/v4/router/gen-config"
URL_RELEASE="${URLROOT}/api/v4/router/release-update-lock"
URL_DONE="${URLROOT}/api/v4/router/updated"
URL_LOCK="${URLROOT}/admin/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/admin/api/v4/router/gen-config"
URL_RELEASE="${URLROOT}/admin/api/v4/router/release-update-lock"
URL_DONE="${URLROOT}/admin/api/v4/router/updated"

BIRDBIN="/usr/sbin/bird"
ETCPATH="/usr/local/etc/bird"
Expand Down
6 changes: 3 additions & 3 deletions tools/vagrant/scripts/rc-reconfigure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ BIRDBIN="/usr/sbin/bird"

# --- the following should be fine on a typical Debian / Ubuntu system:

URL_LOCK="${URLROOT}/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/api/v4/router/gen-config"
URL_DONE="${URLROOT}/api/v4/router/updated"
URL_LOCK="${URLROOT}/admin/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/admin/api/v4/router/gen-config"
URL_DONE="${URLROOT}/admin/api/v4/router/updated"

ETCPATH="/usr/local/etc/bird"
RUNPATH="/var/run/bird"
Expand Down
6 changes: 3 additions & 3 deletions tools/vagrant/scripts/rs-api-reconfigure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ BIRDBIN="/usr/sbin/bird"

# --- the following should be fine on a typical Debian / Ubuntu system:

URL_LOCK="${URLROOT}/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/api/v4/router/gen-config"
URL_DONE="${URLROOT}/api/v4/router/updated"
URL_LOCK="${URLROOT}/admin/api/v4/router/get-update-lock"
URL_CONF="${URLROOT}/admin/api/v4/router/gen-config"
URL_DONE="${URLROOT}/admin/api/v4/router/updated"

ETCPATH="/usr/local/etc/bird"
RUNPATH="/var/run/bird"
Expand Down
Loading