add nodemapper prom service collection for geomapping peers

docker-compose.yaml

@@ -20,8 +20,8 @@ services:
       - --storage.tsdb.retention.time=360d
     container_name: wownerod_prometheus
     restart: unless-stopped
-    ports:
+    # ports:
-      - 127.0.0.1:9090:9090
+    #   - 127.0.0.1:9090:9090
     volumes:
       - prometheus:/prometheus
       - ./files/prometheus/config.yaml:/etc/prometheus/config.yaml:ro
@@ -32,9 +32,9 @@ services:
       - -config=/etc/grafana/grafana.ini
     container_name: wownerod_grafana
     restart: unless-stopped
-    image: grafana/grafana:8.5.4
+    image: grafana/grafana:10.1.4
     ports:
-      - 127.0.0.1:3000:3000
+      - 127.0.0.1:${GRAF_PORT:-3000}:3000
     volumes:
       - grafana:/var/lib/grafana
       - ./files/grafana/grafana.ini:/etc/grafana/grafana.ini:ro
@@ -59,20 +59,31 @@ services:
       - --monero-addr=http://wownerod:34570
     container_name: wownerod_exporter
     restart: unless-stopped
-    ports:
+    # ports:
-      - 127.0.0.1:9000:9000
+    #   - 127.0.0.1:9000:9000
     build:
       context: dockerfiles
-      dockerfile: wownerod_exporter
+      dockerfile: exporter
     <<: *log-config
+  nodemapper:
+    container_name: wownerod_nodemapper
+    restart: unless-stopped
+    build:
+      context: dockerfiles
+      dockerfile: nodemapper
+    environment:
+      NODE_HOST: wownerod
+      NODE_PORT: 34570
+    # ports:
+    #   - 127.0.0.1:${MAPPER_PORT:-5000}:5000
   wownerod:
     container_name: wownerod_daemon
     build:
       context: dockerfiles
-      dockerfile: wownerod_nocompile
+      dockerfile: wownerod
     restart: unless-stopped
     volumes:
-      - ./data:/data
+      - ${DATA_PATH:-./data}:/data
     command:
       wownerod --data-dir=/data --rpc-bind-ip=0.0.0.0 --rpc-restricted-bind-ip=0.0.0.0 --confirm-external-bind --non-interactive --public-node --rpc-restricted-bind-port=34568 --rpc-bind-port=34570 --log-level=0 --enforce-dns-checkpointing --add-priority-node 143.198.195.132:34567 --add-priority-node 134.122.53.193:34567 --add-priority-node 204.48.28.218:34567
     ports:

dockerfiles/nodemapper

@@ -0,0 +1,13 @@
+FROM ubuntu:20.04
+
+WORKDIR /srv/nodemapper
+
+RUN apt update && apt install wget python3 python3-venv -y
+RUN python3 -m venv .venv
+RUN .venv/bin/pip install flask==3.0.0
+RUN .venv/bin/pip install geoip2==4.7.0
+RUN wget https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-City.mmdb -qO ./geoip.mmdb
+
+COPY nodemapper.py app.py
+
+ENTRYPOINT [ ".venv/bin/flask", "--app", "app", "run", "--host", "0.0.0.0" ]

dockerfiles/nodemapper.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+"""
+This is a lightweight web service which will retrieve a peer list 
+from a Monero node, determine GeoIP information, and return 
+a list of metrics in a Prometheus compatible structure.
+Use it to start plotting maps of active node connections.
+"""
+
+import socket, struct
+from os import environ as env
+
+import requests
+import geoip2.database
+from flask import Flask, make_response
+
+
+app = Flask(__name__)
+
+
+NODE_HOST = env.get('NODE_HOST', 'wownerod')
+NODE_PORT = env.get('NODE_PORT', 34570)
+
+
+def ipfi(i: int) -> str:
+    """Takes an unsigned integer and converts it to an IP address. """
+    ip = socket.inet_ntoa(struct.pack('!L', i))
+    return ip
+
+def get_geoip(ip):
+    """Takes an IP address and determines GeoIP data"""
+    with geoip2.database.Reader("./geoip.mmdb") as reader:
+        return reader.city(ip)
+
+
+@app.route("/metrics")
+def nodes():
+    """Return all nodes"""
+    peers = list()
+    peer_list = requests.get(f'http://{NODE_HOST}:{NODE_PORT}/get_peer_list').json()
+    def add_peer(host, status):
+        geo = get_geoip(host)
+        geostr = 'geoip{{latitude="{lat}", longitude="{lon}", country_code="{country_code}", country_name="{country_name}", status="{status}"}} 1'
+        if geostr not in peers:
+            peers.append(geostr.format(
+                lat=geo.location.latitude,
+                lon=geo.location.longitude,
+                country_code=geo.continent.code,
+                country_name=geo.continent.names['en'],
+                status=status
+            ))
+    for peer in peer_list['gray_list']:
+        if peer.get('host'):
+            add_peer(peer['host'], 'gray')
+    for peer in peer_list['white_list']:
+        if peer.get('host'):
+            add_peer(peer['host'], 'white')
+    data = '\n'.join(peers)
+    response = make_response(data, 200)
+    response.mimetype = "text/plain"
+    return response
+

dockerfiles/wownerod_compile_advanced

@@ -1,209 +0,0 @@
-ARG DEBIAN_VERSION="${DEBIAN_VERSION:-stable-slim}"
-FROM debian:${DEBIAN_VERSION} as wow-dependencies
-
-WORKDIR /data
-
-#Cmake
-ARG CMAKE_VERSION=3.14.6
-ARG CMAKE_VERSION_DOT=v3.14
-ARG CMAKE_HASH=4e8ea11cabe459308671b476469eace1622e770317a15951d7b55a82ccaaccb9
-## Boost
-ARG BOOST_VERSION=1_70_0
-ARG BOOST_VERSION_DOT=1.70.0
-ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
-
-ENV CFLAGS='-fPIC -O2 -g'
-ENV CXXFLAGS='-fPIC -O2 -g'
-ENV LDFLAGS='-static-libstdc++'
-
-ENV BASE_DIR /usr/local
-
-RUN apt-get update -qq && apt-get --no-install-recommends -yqq install \
-        ca-certificates \
-        g++ \
-        make \
-        pkg-config \
-        git \
-        curl \
-        libtool-bin \
-        autoconf \
-        automake \
-        bzip2 \
-        xsltproc \
-        gperf \
-        unzip > /dev/null \
-    && cd /data || exit 1 \
-    && echo "\e[32mbuilding: Cmake\e[39m" \
-    && set -ex \
-    && curl -s -O https://cmake.org/files/${CMAKE_VERSION_DOT}/cmake-${CMAKE_VERSION}.tar.gz > /dev/null \
-    && echo "${CMAKE_HASH}  cmake-${CMAKE_VERSION}.tar.gz" | sha256sum -c \
-    && tar -xzf cmake-${CMAKE_VERSION}.tar.gz > /dev/null \
-    && cd cmake-${CMAKE_VERSION} || exit 1 \
-    && ./configure --prefix=$BASE_DIR > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/cmake-${CMAKE_VERSION} \
-    && rm -rf /data/cmake-${CMAKE_VERSION}.tar.gz \
-    && echo "\e[32mbuilding: Boost\e[39m" \
-    && set -ex \
-    && curl -s -L -o  boost_${BOOST_VERSION}.tar.bz2 https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 > /dev/null \
-    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
-    && tar -xvf boost_${BOOST_VERSION}.tar.bz2 > /dev/null \
-    && cd boost_${BOOST_VERSION} || exit 1 \
-    && ./bootstrap.sh > /dev/null \
-    && ./b2 -a install --prefix=$BASE_DIR --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale threading=multi threadapi=pthread cflags="$CFLAGS" cxxflags="$CXXFLAGS" stage > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/boost_${BOOST_VERSION} \
-    && rm -rf /data/boost_${BOOST_VERSION}.tar.bz2
-
-WORKDIR /data
-ENV BASE_DIR /usr/local
-
-# OpenSSL
-ARG OPENSSL_VERSION=1.1.1
-ARG OPENSSL_FIX=g
-ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
-# ZMQ
-ARG ZMQ_VERSION=v4.3.2
-ARG ZMQ_HASH=a84ffa12b2eb3569ced199660bac5ad128bff1f0
-# zmq.hpp
-ARG CPPZMQ_VERSION=v4.4.1
-ARG CPPZMQ_HASH=f5b36e563598d48fcc0d82e589d3596afef945ae
-# Readline
-ARG READLINE_VERSION=8.0
-ARG READLINE_HASH=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
-# Sodium
-ARG SODIUM_VERSION=1.0.18
-ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
-
-ENV CFLAGS='-fPIC -O2 -g'
-ENV CXXFLAGS='-fPIC -O2 -g'
-ENV LDFLAGS='-static-libstdc++'
-
-RUN echo "\e[32mbuilding: Openssl\e[39m" \
-    && set -ex \
-    && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}${OPENSSL_FIX}.tar.gz > /dev/null \
-    # && curl -s -O https://www.openssl.org/source/old/${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}${OPENSSL_FIX}.tar.gz > /dev/null \
-    && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}${OPENSSL_FIX}.tar.gz" | sha256sum -c \
-    && tar -xzf openssl-${OPENSSL_VERSION}${OPENSSL_FIX}.tar.gz > /dev/null \
-    && cd openssl-${OPENSSL_VERSION}${OPENSSL_FIX} || exit 1 \
-    && ./Configure --prefix=$BASE_DIR linux-x86_64 no-shared --static "$CFLAGS" > /dev/null \
-    && make build_generated > /dev/null \
-    && make libcrypto.a > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/openssl-${OPENSSL_VERSION}${OPENSSL_FIX} \
-    && rm -rf /data/openssl-${OPENSSL_VERSION}${OPENSSL_FIX}.tar.gz \
-    && echo "\e[32mbuilding: ZMQ\e[39m" \
-    && set -ex \
-    && git clone --branch ${ZMQ_VERSION} --single-branch --depth 1 https://github.com/zeromq/libzmq.git > /dev/null \
-    && cd libzmq || exit 1 \
-    && test `git rev-parse HEAD` = ${ZMQ_HASH} || exit 1 \
-    && ./autogen.sh > /dev/null \
-    && ./configure --prefix=$BASE_DIR --enable-libunwind=no --enable-static --disable-shared > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && ldconfig > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/libzmq \
-    && echo "\e[32mbuilding: zmq.hpp\e[39m" \
-    && set -ex \
-    && git clone --branch ${CPPZMQ_VERSION} --single-branch --depth 1 https://github.com/zeromq/cppzmq.git > /dev/null \
-    && cd cppzmq || exit 1 \
-    && test `git rev-parse HEAD` = ${CPPZMQ_HASH} || exit 1 \
-    && mv *.hpp $BASE_DIR/include \
-    && cd /data || exit 1 \
-    && rm -rf /data/cppzmq \
-    && echo "\e[32mbuilding: Readline\e[39m" \
-    && set -ex \
-    && curl -s -O https://ftp.gnu.org/gnu/readline/readline-${READLINE_VERSION}.tar.gz > /dev/null \
-    && echo "${READLINE_HASH}  readline-${READLINE_VERSION}.tar.gz" | sha256sum -c \
-    && tar -xzf readline-${READLINE_VERSION}.tar.gz > /dev/null \
-    && cd readline-${READLINE_VERSION} || exit 1 \
-    && ./configure --prefix=$BASE_DIR > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/readline-${READLINE_VERSION} \
-    && rm -rf readline-${READLINE_VERSION}.tar.gz \
-    && echo "\e[32mbuilding: Sodium\e[39m" \
-    && set -ex \
-    && git clone --branch ${SODIUM_VERSION} --single-branch --depth 1 https://github.com/jedisct1/libsodium.git > /dev/null \
-    && cd libsodium || exit 1 \
-    && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
-    && ./autogen.sh \
-    && ./configure --prefix=$BASE_DIR > /dev/null \
-    && make > /dev/null \
-    && make check > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/libsodium
-
-WORKDIR /data
-ENV BASE_DIR /usr/local
-
-# Udev
-ARG UDEV_VERSION=v3.2.8
-ARG UDEV_HASH=d69f3f28348123ab7fa0ebac63ec2fd16800c5e0
-# Libusb
-ARG USB_VERSION=v1.0.22
-ARG USB_HASH=0034b2afdcdb1614e78edaa2a9e22d5936aeae5d
-# Hidapi
-ARG HIDAPI_VERSION=hidapi-0.8.0-rc1
-ARG HIDAPI_HASH=40cf516139b5b61e30d9403a48db23d8f915f52c
-# Protobuf
-ARG PROTOBUF_VERSION=v3.7.1
-ARG PROTOBUF_HASH=6973c3a5041636c1d8dc5f7f6c8c1f3c15bc63d6
-
-ENV CFLAGS='-fPIC -O2 -g'
-ENV CXXFLAGS='-fPIC -O2 -g'
-ENV LDFLAGS='-static-libstdc++'
-
-RUN echo "\e[32mbuilding: Udev\e[39m" \
-    && set -ex \
-    && git clone --branch ${UDEV_VERSION} --single-branch --depth 1 https://github.com/gentoo/eudev > /dev/null \
-    && cd eudev || exit 1 \
-    && test `git rev-parse HEAD` = ${UDEV_HASH} || exit 1 \
-    && ./autogen.sh \
-    && ./configure --prefix=$BASE_DIR --disable-gudev --disable-introspection --disable-hwdb --disable-manpages --disable-shared > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/eudev \
-    && echo "\e[32mbuilding: Libusb\e[39m" \
-    && set -ex \
-    && git clone --branch ${USB_VERSION} --single-branch --depth 1 https://github.com/libusb/libusb.git > /dev/null \
-    && cd libusb || exit 1 \
-    && test `git rev-parse HEAD` = ${USB_HASH} || exit 1 \
-    && ./autogen.sh > /dev/null \
-    && ./configure --prefix=$BASE_DIR --disable-shared > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/libusb \
-    && echo "\e[32mbuilding: Hidapi\e[39m" \
-    && set -ex \
-    && git clone --branch ${HIDAPI_VERSION} --single-branch --depth 1 https://github.com/signal11/hidapi > /dev/null \
-    && cd hidapi || exit 1 \
-    && test `git rev-parse HEAD` = ${HIDAPI_HASH} || exit 1 \
-    && ./bootstrap \
-    && ./configure --prefix=$BASE_DIR --enable-static --disable-shared > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && cd /data || exit 1 \
-    && rm -rf /data/hidapi \
-    && echo "\e[32mbuilding: Protobuf\e[39m" \
-    && set -ex \
-    && git clone --branch ${PROTOBUF_VERSION}  --single-branch --depth 1 https://github.com/protocolbuffers/protobuf > /dev/null \
-    && cd protobuf || exit 1 \
-    && test `git rev-parse HEAD` = ${PROTOBUF_HASH} || exit 1 \
-    && git submodule update --init --recursive > /dev/null \
-    && ./autogen.sh > /dev/null \
-    && ./configure --prefix=$BASE_DIR --enable-static --disable-shared > /dev/null \
-    && make > /dev/null \
-    && make install > /dev/null \
-    && ldconfig \
-    && cd /data || exit 1 \
-    && rm -rf /data/protobuf \
-    && echo "\e[32mdone building this mofo!\e[39m"

dockerfiles/wownerod_compile_simple

@@ -1,39 +0,0 @@
-FROM ubuntu:22.04 as builder
-
-ENV DEBIAN_FRONTEND noninteractive
-
-WORKDIR /opt/wownero
-
-RUN apt-get update && apt-get install -y \
-    build-essential cmake pkg-config libboost-all-dev \
-    libssl-dev libzmq3-dev libunbound-dev libsodium-dev libpgm-dev git
-
-RUN git clone https://git.wownero.com/wownero/wownero --depth=1 --branch=v0.11.0.3 .
-
-RUN make -j4
-
-RUN cp /opt/wownero/build/Linux/_no_branch_/release/bin/* /bin/
-
-FROM ubuntu:22.04 as main
-
-WORKDIR /data
-
-# Copy static executables and libs from initial container
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.74.0 /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.74.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.5
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libsodium.so.23 /usr/lib/x86_64-linux-gnu/libsodium.so.23
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libunbound.so.8 /usr/lib/x86_64-linux-gnu/libunbound.so.8
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libicui18n.so.70 /usr/lib/x86_64-linux-gnu/libicui18n.so.70
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libicuuc.so.70 /usr/lib/x86_64-linux-gnu/libicuuc.so.70
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/libbsd.so.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libpgm-5.3.so.0 /usr/lib/x86_64-linux-gnu/libpgm-5.3.so.0
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libnorm.so.1 /usr/lib/x86_64-linux-gnu/libnorm.so.1
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libevent-2.1.so.7 /usr/lib/x86_64-linux-gnu/libevent-2.1.so.7
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libicudata.so.70 /usr/lib/x86_64-linux-gnu/libicudata.so.70
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libmd.so.0 /usr/lib/x86_64-linux-gnu/libmd.so.0
-COPY --from=builder /opt/wownero/build/Linux/_no_branch_/release/bin/wownero* /bin/

files/prometheus/config.yaml

@@ -1,9 +1,11 @@
 global:
-  scrape_interval: 10s
+  evaluation_interval: 10m
-  evaluation_interval: 10s
-  external_labels:
-    monitor: wownerod-exporter
 scrape_configs:
   - job_name: "wownerod"
+    scrape_interval: 30s
     static_configs:
       - targets: ["exporter:9000"]
+  - job_name: "nodemapper"
+    scrape_interval: 2m
+    static_configs:
+      - targets: ["nodemapper:5000"]